diff --git a/tests/PhpSpreadsheetTests/A1LocaleGeneratorTest.php b/tests/PhpSpreadsheetTests/A1LocaleGeneratorTest.php index 64da06639..243705c36 100644 --- a/tests/PhpSpreadsheetTests/A1LocaleGeneratorTest.php +++ b/tests/PhpSpreadsheetTests/A1LocaleGeneratorTest.php @@ -1,5 +1,7 @@ returnDateType); } - private function expectationIsTemplate(string $expectedResult): bool + private function expectationIsTemplate(mixed $expectedResult): bool { return is_string($expectedResult) && substr($expectedResult, 0, 2) === 'Y-'; } diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php index 657984335..83587a45e 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php @@ -1,5 +1,7 @@ Apellido y Nombre - + Obra Social Corresponde Reducción? - + - + 12345678901 EMILIANO ZAPATA SALAZAR - + 101208 Yes - + - + 23456789012 FRANCISCO PANCHO VILLA - + 101208 No - + diff --git a/tests/PhpSpreadsheetTests/Reader/Html/Issue2810Test.php b/tests/PhpSpreadsheetTests/Reader/Html/Issue2810Test.php index 5e6e73869..b2ade3d5f 100644 --- a/tests/PhpSpreadsheetTests/Reader/Html/Issue2810Test.php +++ b/tests/PhpSpreadsheetTests/Reader/Html/Issue2810Test.php @@ -1,5 +1,7 @@ rangeToArray($cellRange)); + self::assertSame($expected, $worksheet->rangeToArray((string) $cellRange)); } public static function rangeToArrayProvider(): array diff --git a/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php index 383f83aba..ffbdf453c 100644 --- a/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php @@ -1,5 +1,7 @@ ', false, false], diff --git a/tests/data/Calculation/Calculation.php b/tests/data/Calculation/Calculation.php index e49bed9fe..27cafc90b 100644 --- a/tests/data/Calculation/Calculation.php +++ b/tests/data/Calculation/Calculation.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Logical/ANDLiteral.php b/tests/data/Calculation/Logical/ANDLiteral.php index 0dff483bb..0747f8a4a 100644 --- a/tests/data/Calculation/Logical/ANDLiteral.php +++ b/tests/data/Calculation/Logical/ANDLiteral.php @@ -1,5 +1,7 @@ [true, 'true, true'], 'boolean and string-true' => [true, 'true, "true"'], diff --git a/tests/data/Calculation/Logical/IF.php b/tests/data/Calculation/Logical/IF.php index 3bf7d90f2..1f69d1099 100644 --- a/tests/data/Calculation/Logical/IF.php +++ b/tests/data/Calculation/Logical/IF.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Logical/IFERROR.php b/tests/data/Calculation/Logical/IFERROR.php index a379a5fbf..ebc6b4060 100644 --- a/tests/data/Calculation/Logical/IFERROR.php +++ b/tests/data/Calculation/Logical/IFERROR.php @@ -1,5 +1,7 @@ [ 0, diff --git a/tests/data/Calculation/Logical/IFNA.php b/tests/data/Calculation/Logical/IFNA.php index d7fb7193f..4216212a0 100644 --- a/tests/data/Calculation/Logical/IFNA.php +++ b/tests/data/Calculation/Logical/IFNA.php @@ -1,5 +1,7 @@ ['exception'], [ diff --git a/tests/data/Calculation/Logical/NOT.php b/tests/data/Calculation/Logical/NOT.php index 9936c2681..37b94968d 100644 --- a/tests/data/Calculation/Logical/NOT.php +++ b/tests/data/Calculation/Logical/NOT.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Logical/OR.php b/tests/data/Calculation/Logical/OR.php index c5317b3bc..53aab1970 100644 --- a/tests/data/Calculation/Logical/OR.php +++ b/tests/data/Calculation/Logical/OR.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Logical/ORLiteral.php b/tests/data/Calculation/Logical/ORLiteral.php index 17f498822..d8331d60e 100644 --- a/tests/data/Calculation/Logical/ORLiteral.php +++ b/tests/data/Calculation/Logical/ORLiteral.php @@ -1,5 +1,7 @@ [true, 'true, true'], 'boolean or string-true' => [true, 'true, "true"'], diff --git a/tests/data/Calculation/Logical/SWITCH.php b/tests/data/Calculation/Logical/SWITCH.php index 689d1d8fa..724aa09db 100644 --- a/tests/data/Calculation/Logical/SWITCH.php +++ b/tests/data/Calculation/Logical/SWITCH.php @@ -1,5 +1,7 @@ [ 'C', diff --git a/tests/data/Calculation/Logical/XOR.php b/tests/data/Calculation/Logical/XOR.php index 57a170a48..52895d44b 100644 --- a/tests/data/Calculation/Logical/XOR.php +++ b/tests/data/Calculation/Logical/XOR.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Logical/XORLiteral.php b/tests/data/Calculation/Logical/XORLiteral.php index a0c0be707..086fb7e83 100644 --- a/tests/data/Calculation/Logical/XORLiteral.php +++ b/tests/data/Calculation/Logical/XORLiteral.php @@ -1,5 +1,7 @@ [false, 'true, true'], 'boolean xor string-true' => [false, 'true, "true"'], diff --git a/tests/data/Calculation/LookupRef/ADDRESS.php b/tests/data/Calculation/LookupRef/ADDRESS.php index 14a3cf7db..aaaada75a 100644 --- a/tests/data/Calculation/LookupRef/ADDRESS.php +++ b/tests/data/Calculation/LookupRef/ADDRESS.php @@ -1,5 +1,7 @@ [1, 'namedrangex'], 'global $f$2:$h$2' => [3, 'namedrangey'], diff --git a/tests/data/Calculation/LookupRef/COLUMNonSpreadsheet.php b/tests/data/Calculation/LookupRef/COLUMNonSpreadsheet.php index cc93653e8..16a43707c 100644 --- a/tests/data/Calculation/LookupRef/COLUMNonSpreadsheet.php +++ b/tests/data/Calculation/LookupRef/COLUMNonSpreadsheet.php @@ -1,5 +1,7 @@ [2, 'omitted'], 'global name $E$2:$E$6' => [5, 'namedrangex'], diff --git a/tests/data/Calculation/LookupRef/FORMULATEXT.php b/tests/data/Calculation/LookupRef/FORMULATEXT.php index 46639c28c..e5debe475 100644 --- a/tests/data/Calculation/LookupRef/FORMULATEXT.php +++ b/tests/data/Calculation/LookupRef/FORMULATEXT.php @@ -1,5 +1,7 @@ ['R' => 1]], // Expected diff --git a/tests/data/Calculation/LookupRef/INDEXonSpreadsheet.php b/tests/data/Calculation/LookupRef/INDEXonSpreadsheet.php index eff13722f..76f6ddd46 100644 --- a/tests/data/Calculation/LookupRef/INDEXonSpreadsheet.php +++ b/tests/data/Calculation/LookupRef/INDEXonSpreadsheet.php @@ -1,5 +1,7 @@ [ 1, // Expected diff --git a/tests/data/Calculation/LookupRef/INDIRECT.php b/tests/data/Calculation/LookupRef/INDIRECT.php index 7dc2515a3..77554ec85 100644 --- a/tests/data/Calculation/LookupRef/INDIRECT.php +++ b/tests/data/Calculation/LookupRef/INDIRECT.php @@ -1,5 +1,7 @@ [600, '$A$1:$A$3'], 'cell range on different sheet' => [30, 'OtherSheet!A1:A2'], diff --git a/tests/data/Calculation/LookupRef/LOOKUP.php b/tests/data/Calculation/LookupRef/LOOKUP.php index 9c7d96eb0..84e3e2785 100644 --- a/tests/data/Calculation/LookupRef/LOOKUP.php +++ b/tests/data/Calculation/LookupRef/LOOKUP.php @@ -1,5 +1,7 @@ [ 2, // Expected diff --git a/tests/data/Calculation/LookupRef/OFFSET.php b/tests/data/Calculation/LookupRef/OFFSET.php index 9c2f52c1d..53706dd1f 100644 --- a/tests/data/Calculation/LookupRef/OFFSET.php +++ b/tests/data/Calculation/LookupRef/OFFSET.php @@ -1,5 +1,7 @@ [5, 'namedrangex'], 'global $F$2:$H$2' => [1, 'namedrangey'], diff --git a/tests/data/Calculation/LookupRef/ROWonSpreadsheet.php b/tests/data/Calculation/LookupRef/ROWonSpreadsheet.php index f2395e6b7..0250934df 100644 --- a/tests/data/Calculation/LookupRef/ROWonSpreadsheet.php +++ b/tests/data/Calculation/LookupRef/ROWonSpreadsheet.php @@ -1,5 +1,7 @@ [3, 'omitted'], 'global name $E$2:$E$6' => [2, 'namedrangex'], diff --git a/tests/data/Calculation/LookupRef/TRANSPOSE.php b/tests/data/Calculation/LookupRef/TRANSPOSE.php index a5ca45f48..1f75ff125 100644 --- a/tests/data/Calculation/LookupRef/TRANSPOSE.php +++ b/tests/data/Calculation/LookupRef/TRANSPOSE.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Statistical/BETADIST.php b/tests/data/Calculation/Statistical/BETADIST.php index ef89575fd..92b61fc5a 100644 --- a/tests/data/Calculation/Statistical/BETADIST.php +++ b/tests/data/Calculation/Statistical/BETADIST.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Statistical/COVAR.php b/tests/data/Calculation/Statistical/COVAR.php index d32cc8b3c..f02bbad8e 100644 --- a/tests/data/Calculation/Statistical/COVAR.php +++ b/tests/data/Calculation/Statistical/COVAR.php @@ -1,5 +1,7 @@ [ 3, diff --git a/tests/data/Calculation/Statistical/FDIST.php b/tests/data/Calculation/Statistical/FDIST.php index 39be714d9..7ef64c6cb 100644 --- a/tests/data/Calculation/Statistical/FDIST.php +++ b/tests/data/Calculation/Statistical/FDIST.php @@ -1,5 +1,7 @@ [ 3, diff --git a/tests/data/Calculation/Statistical/HARMEAN.php b/tests/data/Calculation/Statistical/HARMEAN.php index 1c34ff332..e8db95a6f 100644 --- a/tests/data/Calculation/Statistical/HARMEAN.php +++ b/tests/data/Calculation/Statistical/HARMEAN.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Statistical/MEDIAN.php b/tests/data/Calculation/Statistical/MEDIAN.php index bde86d480..3eca4feb8 100644 --- a/tests/data/Calculation/Statistical/MEDIAN.php +++ b/tests/data/Calculation/Statistical/MEDIAN.php @@ -1,5 +1,7 @@ [ 'exception', diff --git a/tests/data/Calculation/Statistical/MODE.php b/tests/data/Calculation/Statistical/MODE.php index 7d27b33e5..a2d6eb971 100644 --- a/tests/data/Calculation/Statistical/MODE.php +++ b/tests/data/Calculation/Statistical/MODE.php @@ -1,5 +1,7 @@ [ 5, diff --git a/tests/data/Calculation/Statistical/PERCENTILE.php b/tests/data/Calculation/Statistical/PERCENTILE.php index 890399c53..4cf5173b6 100644 --- a/tests/data/Calculation/Statistical/PERCENTILE.php +++ b/tests/data/Calculation/Statistical/PERCENTILE.php @@ -1,5 +1,7 @@ ["\x00", '=CHAR(0)'], 'OO treats CODE(bool) as 0/1' => ['48', '=CODE(FALSE)'], diff --git a/tests/data/Calculation/TextData/PROPER.php b/tests/data/Calculation/TextData/PROPER.php index e9a5d4ceb..6798151c0 100644 --- a/tests/data/Calculation/TextData/PROPER.php +++ b/tests/data/Calculation/TextData/PROPER.php @@ -1,5 +1,7 @@ ['exception'], 'one argument' => ['exception', 'ABC'], diff --git a/tests/data/Calculation/TextData/RIGHT.php b/tests/data/Calculation/TextData/RIGHT.php index 77ea64bf7..922a3591e 100644 --- a/tests/data/Calculation/TextData/RIGHT.php +++ b/tests/data/Calculation/TextData/RIGHT.php @@ -1,5 +1,7 @@ ['=D3+F7+G4+C6+5', '=R3C4+R7C6+R4C7+R6C3+5'], 'Basic subtraction' => ['=D3-F7-G4-C6-5', '=R3C4-R7C6-R4C7-R6C3-5'], diff --git a/tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php b/tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php index d6df418cd..84e11af3b 100644 --- a/tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php +++ b/tests/data/Cell/ConvertFormulaToA1FromR1C1Relative.php @@ -1,5 +1,7 @@ ['=D3+F7+G4+C6+5', '=R[-2]C[-1]+R[2]C[1]+R[-1]C[2]+R[1]C[-2]+5', 5, 5], 'Basic subtraction' => ['=D3-F7-G4-C6-5', '=R[-2]C[-1]-R[2]C[1]-R[-1]C[2]-R[1]C[-2]-5', 5, 5], diff --git a/tests/data/Cell/ConvertFormulaToA1FromSpreadsheetXml.php b/tests/data/Cell/ConvertFormulaToA1FromSpreadsheetXml.php index d350c07b3..915d1a468 100644 --- a/tests/data/Cell/ConvertFormulaToA1FromSpreadsheetXml.php +++ b/tests/data/Cell/ConvertFormulaToA1FromSpreadsheetXml.php @@ -1,5 +1,7 @@ ['=D3+F7+G4+C6+5', 'of:=[.D3]+[.F7]+[.G4]+[.C6]+5'], 'Basic subtraction' => ['=D3-F7-G4-C6-5', 'of:=[.D3]-[.F7]-[.G4]-[.C6]-5'], diff --git a/tests/data/Cell/DefaultValueBinder.php b/tests/data/Cell/DefaultValueBinder.php index f5dafc7bc..b9f3d51e1 100644 --- a/tests/data/Cell/DefaultValueBinder.php +++ b/tests/data/Cell/DefaultValueBinder.php @@ -1,5 +1,7 @@ [ diff --git a/tests/data/CellMergeRangesInCollection.php b/tests/data/CellMergeRangesInCollection.php index 0a7723ee0..3be59edc3 100644 --- a/tests/data/CellMergeRangesInCollection.php +++ b/tests/data/CellMergeRangesInCollection.php @@ -1,5 +1,7 @@ [ [ diff --git a/tests/data/CellRangeDimension.php b/tests/data/CellRangeDimension.php index a3e15531c..ca289179b 100644 --- a/tests/data/CellRangeDimension.php +++ b/tests/data/CellRangeDimension.php @@ -1,5 +1,7 @@ 19-Dec-1960 05:00:00 UTC diff --git a/tests/data/Shared/Date/ExcelToTimestamp1904.php b/tests/data/Shared/Date/ExcelToTimestamp1904.php index 82fcde1cf..12a3999a9 100644 --- a/tests/data/Shared/Date/ExcelToTimestamp1904.php +++ b/tests/data/Shared/Date/ExcelToTimestamp1904.php @@ -1,5 +1,7 @@ [0.8, 0.813512072856517], diff --git a/tests/data/Shared/Trend/LinearBestFit.php b/tests/data/Shared/Trend/LinearBestFit.php index b1be2f9a5..046fdb6ee 100644 --- a/tests/data/Shared/Trend/LinearBestFit.php +++ b/tests/data/Shared/Trend/LinearBestFit.php @@ -1,5 +1,7 @@ [-1.1, -1.1064189189190], diff --git a/tests/data/Style/Color/ColorChangeBrightness.php b/tests/data/Style/Color/ColorChangeBrightness.php index 1c552e157..6d9f03836 100644 --- a/tests/data/Style/Color/ColorChangeBrightness.php +++ b/tests/data/Style/Color/ColorChangeBrightness.php @@ -1,5 +1,7 @@