From f6f1ef2893b610b7ff512f2d3eafa6b8632c8259 Mon Sep 17 00:00:00 2001 From: Cody Snider Date: Thu, 30 May 2019 13:32:33 -0400 Subject: [PATCH 1/8] remove uneccessary C# files --- docs/assets/ClassDiagrams/Architecture.cd | 51 ------- docs/assets/ClassDiagrams/Architecture.png | Bin 16945 -> 0 bytes .../assets/ClassDiagrams/ClassDiagrams.csproj | 64 --------- .../ClassDiagrams/ClassDiagrams.csproj.user | 5 - docs/assets/ClassDiagrams/ClassDiagrams.sln | 20 --- docs/assets/ClassDiagrams/Classes/IReader.cs | 15 -- docs/assets/ClassDiagrams/Classes/IWriter.cs | 15 -- docs/assets/ClassDiagrams/Classes/PHPExcel.cs | 40 ------ .../Classes/PHPExcel_IOFactory.cs | 41 ------ .../Classes/PHPExcel_Reader_Excel2007.cs | 25 ---- .../Classes/PHPExcel_Reader_Excel5.cs | 63 -------- .../Classes/PHPExcel_Reader_Serialized.cs | 44 ------ .../Classes/PHPExcel_Writer_Excel2007.cs | 25 ---- .../Classes/PHPExcel_Writer_Serialized.cs | 82 ----------- .../assets/ClassDiagrams/Classes/Worksheet.cs | 14 -- .../ClassDiagrams/Exports/Architecture.png | Bin 15122 -> 0 bytes .../ClassDiagrams/Exports/ReaderWriter.png | Bin 46094 -> 0 bytes docs/assets/ClassDiagrams/ReaderWriter.cd | 135 ------------------ docs/assets/ClassDiagrams/ReaderWriter.png | Bin 57944 -> 0 bytes 19 files changed, 639 deletions(-) delete mode 100644 docs/assets/ClassDiagrams/Architecture.cd delete mode 100644 docs/assets/ClassDiagrams/Architecture.png delete mode 100644 docs/assets/ClassDiagrams/ClassDiagrams.csproj delete mode 100644 docs/assets/ClassDiagrams/ClassDiagrams.csproj.user delete mode 100644 docs/assets/ClassDiagrams/ClassDiagrams.sln delete mode 100644 docs/assets/ClassDiagrams/Classes/IReader.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/IWriter.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/PHPExcel.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/PHPExcel_IOFactory.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel2007.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel5.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Serialized.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Excel2007.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Serialized.cs delete mode 100644 docs/assets/ClassDiagrams/Classes/Worksheet.cs delete mode 100644 docs/assets/ClassDiagrams/Exports/Architecture.png delete mode 100644 docs/assets/ClassDiagrams/Exports/ReaderWriter.png delete mode 100644 docs/assets/ClassDiagrams/ReaderWriter.cd delete mode 100644 docs/assets/ClassDiagrams/ReaderWriter.png diff --git a/docs/assets/ClassDiagrams/Architecture.cd b/docs/assets/ClassDiagrams/Architecture.cd deleted file mode 100644 index f36715fc..00000000 --- a/docs/assets/ClassDiagrams/Architecture.cd +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - Classes\PHPExcel.cs - AAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA= - - - - - - - - - Classes\Worksheet.cs - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - - - - - - Classes\IReader.cs - AAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAA= - - - - - - - - - - - - - - Classes\IWriter.cs - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - - - - - - - - - - - \ No newline at end of file diff --git a/docs/assets/ClassDiagrams/Architecture.png b/docs/assets/ClassDiagrams/Architecture.png deleted file mode 100644 index 3fc7655a969bf9b6d247ce06034e3604d1b73672..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16945 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 - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {CC8CD7D2-8EFF-48E5-A17A-C1C482744D31} - Exe - Properties - ClassDiagrams - ClassDiagrams - - - 2.0 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/assets/ClassDiagrams/ClassDiagrams.csproj.user b/docs/assets/ClassDiagrams/ClassDiagrams.csproj.user deleted file mode 100644 index 5c2d6e6a..00000000 --- a/docs/assets/ClassDiagrams/ClassDiagrams.csproj.user +++ /dev/null @@ -1,5 +0,0 @@ - - - ShowAllFiles - - \ No newline at end of file diff --git a/docs/assets/ClassDiagrams/ClassDiagrams.sln b/docs/assets/ClassDiagrams/ClassDiagrams.sln deleted file mode 100644 index b565408f..00000000 --- a/docs/assets/ClassDiagrams/ClassDiagrams.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagrams", "ClassDiagrams.csproj", "{CC8CD7D2-8EFF-48E5-A17A-C1C482744D31}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CC8CD7D2-8EFF-48E5-A17A-C1C482744D31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC8CD7D2-8EFF-48E5-A17A-C1C482744D31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC8CD7D2-8EFF-48E5-A17A-C1C482744D31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC8CD7D2-8EFF-48E5-A17A-C1C482744D31}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/docs/assets/ClassDiagrams/Classes/IReader.cs b/docs/assets/ClassDiagrams/Classes/IReader.cs deleted file mode 100644 index 33cb05a8..00000000 --- a/docs/assets/ClassDiagrams/Classes/IReader.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public interface PHPExcel_Reader_IReader - { - PHPExcel reads - { - get; - set; - } - } -} diff --git a/docs/assets/ClassDiagrams/Classes/IWriter.cs b/docs/assets/ClassDiagrams/Classes/IWriter.cs deleted file mode 100644 index 6783f3a6..00000000 --- a/docs/assets/ClassDiagrams/Classes/IWriter.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public interface PHPExcel_Writer_IWriter - { - PHPExcel writes - { - get; - set; - } - } -} diff --git a/docs/assets/ClassDiagrams/Classes/PHPExcel.cs b/docs/assets/ClassDiagrams/Classes/PHPExcel.cs deleted file mode 100644 index 825139b9..00000000 --- a/docs/assets/ClassDiagrams/Classes/PHPExcel.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class PHPExcel - { - /// - public Worksheet Worksheets - { - get - { - throw new System.NotImplementedException(); - } - set - { - } - } - } - - public class PHPExcel_Writer_PDF : PHPExcel_Writer_IWriter - { - #region PHPExcel_Writer_IWriter Members - - public PHPExcel writes - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } -} diff --git a/docs/assets/ClassDiagrams/Classes/PHPExcel_IOFactory.cs b/docs/assets/ClassDiagrams/Classes/PHPExcel_IOFactory.cs deleted file mode 100644 index 695a455a..00000000 --- a/docs/assets/ClassDiagrams/Classes/PHPExcel_IOFactory.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class PHPExcel_IOFactory - { - public PHPExcel_Reader_IReader createsReader - { - get - { - throw new System.NotImplementedException(); - } - set - { - } - } - - public PHPExcel_Writer_IWriter createsWriter - { - get - { - throw new System.NotImplementedException(); - } - set - { - } - } - - public PHPExcel_Writer_IWriter createWriter() - { - throw new System.NotImplementedException(); - } - - public PHPExcel_Reader_IReader createReader() - { - throw new System.NotImplementedException(); - } - } -} diff --git a/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel2007.cs b/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel2007.cs deleted file mode 100644 index fc38fac3..00000000 --- a/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel2007.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class PHPExcel_Reader_Excel2007 : PHPExcel_Reader_IReader - { - #region IReader Members - - public PHPExcel reads - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } -} diff --git a/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel5.cs b/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel5.cs deleted file mode 100644 index 673df56c..00000000 --- a/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Excel5.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class PHPExcel_Reader_Excel5 : PHPExcel_Reader_IReader - { - #region PHPExcel_Writer_IReader Members - - public PHPExcel reads - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class PHPExcel_Reader_Excel2003XML : PHPExcel_Reader_IReader - { - #region PHPExcel_Writer_IReader Members - - public PHPExcel reads - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class PHPExcel_Reader_SYLK : PHPExcel_Reader_IReader - { - #region PHPExcel_Writer_IReader Members - - public PHPExcel reads - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } -} diff --git a/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Serialized.cs b/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Serialized.cs deleted file mode 100644 index 3718dd21..00000000 --- a/docs/assets/ClassDiagrams/Classes/PHPExcel_Reader_Serialized.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class PHPExcel_Reader_Serialized : PHPExcel_Reader_IReader - { - #region IReader Members - - public PHPExcel reads - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class PHPExcel_Reader_CSV : PHPExcel_Reader_IReader - { - #region IReader Members - - public PHPExcel reads - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } -} diff --git a/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Excel2007.cs b/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Excel2007.cs deleted file mode 100644 index 5f4b5658..00000000 --- a/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Excel2007.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class PHPExcel_Writer_Excel2007 : PHPExcel_Writer_IWriter - { - #region IWriter Members - - public PHPExcel writes - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } -} diff --git a/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Serialized.cs b/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Serialized.cs deleted file mode 100644 index 58f4bbe7..00000000 --- a/docs/assets/ClassDiagrams/Classes/PHPExcel_Writer_Serialized.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class PHPExcel_Writer_Serialized : PHPExcel_Writer_IWriter - { - #region IWriter Members - - public PHPExcel writes - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class PHPExcel_Writer_CSV : PHPExcel_Writer_IWriter - { - #region IWriter Members - - public PHPExcel writes - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class PHPExcel_Writer_Excel5 : PHPExcel_Writer_IWriter - { - #region IWriter Members - - public PHPExcel writes - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } - - public class PHPExcel_Writer_HTML : PHPExcel_Writer_IWriter - { - #region IWriter Members - - public PHPExcel writes - { - get - { - throw new Exception("The method or operation is not implemented."); - } - set - { - throw new Exception("The method or operation is not implemented."); - } - } - - #endregion - } -} diff --git a/docs/assets/ClassDiagrams/Classes/Worksheet.cs b/docs/assets/ClassDiagrams/Classes/Worksheet.cs deleted file mode 100644 index aa977b86..00000000 --- a/docs/assets/ClassDiagrams/Classes/Worksheet.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ClassDiagrams -{ - public class Worksheet - { - } - - public class CopyOfWorksheet - { - } -} diff --git a/docs/assets/ClassDiagrams/Exports/Architecture.png b/docs/assets/ClassDiagrams/Exports/Architecture.png deleted file mode 100644 index 132481803068ee3a7ab4cab7adbab55be49a72b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15122 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 diff --git a/docs/assets/ClassDiagrams/Exports/ReaderWriter.png b/docs/assets/ClassDiagrams/Exports/ReaderWriter.png deleted file mode 100644 index b915faa7c6cadb16cc0167757a279246e55d8c42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46094 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 - Classes\PHPExcel_Reader_Excel2007.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Classes\PHPExcel_Writer_Excel2007.cs - - - - - - - AAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAA= - Classes\PHPExcel_Reader_Serialized.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Classes\PHPExcel_Writer_Serialized.cs - - - - - - - AAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAA= - Classes\PHPExcel_Reader_Serialized.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Classes\PHPExcel_Writer_Serialized.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Classes\PHPExcel_Writer_Serialized.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Classes\PHPExcel_Writer_Serialized.cs - - - - - - - AAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAA= - Classes\PHPExcel_Reader_Excel5.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Classes\PHPExcel.cs - - - - - - - - - - - - - - - - - AIAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAABAAAAAAA= - Classes\PHPExcel_IOFactory.cs - - - - - - - - - - AAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAA= - Classes\PHPExcel_Reader_Excel5.cs - - - - - - - AAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAA= - Classes\PHPExcel_Reader_Excel5.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - Classes\IWriter.cs - - - - - - AAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAA= - Classes\IReader.cs - - - - \ No newline at end of file diff --git a/docs/assets/ClassDiagrams/ReaderWriter.png b/docs/assets/ClassDiagrams/ReaderWriter.png deleted file mode 100644 index d76c98d988c7be068ee181b133284f3f46afa8a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57944 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
    `h& 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 From 98a1f0a8cf9f9ca5e32840718df6bfc1555463fa Mon Sep 17 00:00:00 2001 From: Dominik Businger Date: Wed, 13 Mar 2019 11:32:22 +0100 Subject: [PATCH 2/8] Fix for worksheet lookup for worksheets with spaces in the title Sheet titles containing " " or "!" will be quoted in formulas. This commit fixes the lookup of sheets with this kind of title by trimming the quotes during the lookup. Without this any defined range referencing a sheet with " " or "!" in the title name will be lost when reading the workbook from file. Fixes #928 Closes 930 --- CHANGELOG.md | 1 + src/PhpSpreadsheet/Spreadsheet.php | 2 +- .../Worksheet/WorksheetTest.php | 1 + tests/data/Calculation/Functions/ISFORMULA.php | 10 ++++++++++ tests/data/Calculation/LookupRef/FORMULATEXT.php | 15 +++++++++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96574fe7..20819876 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). - Fix number format masks containing named colours that were being misinterpreted as date formats; and add support for masks that fully replace the value with a full text string [Issue #1009](https://github.com/PHPOffice/PhpSpreadsheet/issues/1009) - Stricter-typed comparison testing in COUNTIF() and COUNTIFS() evaluation [Issue #1046](https://github.com/PHPOffice/PhpSpreadsheet/issues/1046) - COUPNUM should not return zero when settlement is in the last period - [Issue #1020](https://github.com/PHPOffice/PhpSpreadsheet/issues/1020) and [PR #1021](https://github.com/PHPOffice/PhpSpreadsheet/pull/1021) +- Fix handling of named ranges referencing sheets with spaces or "!" in their title ## [1.8.2] - 2019-07-08 diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index 8eadcbe8..04a9f1df 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -721,7 +721,7 @@ class Spreadsheet { $worksheetCount = count($this->workSheetCollection); for ($i = 0; $i < $worksheetCount; ++$i) { - if ($this->workSheetCollection[$i]->getTitle() === $pName) { + if ($this->workSheetCollection[$i]->getTitle() === trim($pName, "'")) { return $this->workSheetCollection[$i]; } } diff --git a/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php b/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php index 46df9405..ce2df837 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php @@ -137,6 +137,7 @@ class WorksheetTest extends TestCase ['B2', '', '', 'B2'], ['testTitle!B2', 'testTitle', 'B2', 'B2'], ['test!Title!B2', 'test!Title', 'B2', 'B2'], + ['test Title!B2', 'test Title', 'B2', 'B2'], ]; } diff --git a/tests/data/Calculation/Functions/ISFORMULA.php b/tests/data/Calculation/Functions/ISFORMULA.php index 9e0d0d0b..60d9c07f 100644 --- a/tests/data/Calculation/Functions/ISFORMULA.php +++ b/tests/data/Calculation/Functions/ISFORMULA.php @@ -81,4 +81,14 @@ return [ '\'Worksheet1\'!A16', '123', ], + [ + true, + 'A17', + '=\'Work sheet1\'!A1', + ], + [ + true, + 'A18', + '=\'Work!sheet1\'!A1', + ], ]; diff --git a/tests/data/Calculation/LookupRef/FORMULATEXT.php b/tests/data/Calculation/LookupRef/FORMULATEXT.php index 30b2d6eb..48d528bf 100644 --- a/tests/data/Calculation/LookupRef/FORMULATEXT.php +++ b/tests/data/Calculation/LookupRef/FORMULATEXT.php @@ -21,11 +21,26 @@ return [ 'A4', '=\'Worksheet1\'!A1', ], + [ + '=\'Works heet1\'!A1', + 'A4', + '=\'Works heet1\'!A1', + ], [ '="HELLO WORLD"', '\'Worksheet1\'!A5', '="HELLO WORLD"', ], + [ + '="HELLO WORLD"', + '\'Work sheet1\'!A5', + '="HELLO WORLD"', + ], + [ + '="HELLO WORLD"', + '\'Work!sheet1\'!A5', + '="HELLO WORLD"', + ], [ '#N/A', '\'Worksheet1\'!A6', From 8a1cb048301c9175a9e2cb332938f92894431815 Mon Sep 17 00:00:00 2001 From: Andrey Bolonin Date: Thu, 25 Jul 2019 08:17:55 +0300 Subject: [PATCH 3/8] Test PHP 7.4snapshot For now allow failure for PHP 7.4 because it's not released yet --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7c55d592..3fb2dce1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,13 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4snapshot matrix: fast_finish: true allow_failures: - php: 5.6 + - php: 7.4snapshot cache: directories: From dbc8777c4332c23a8bb8155cd551ff09cfd30549 Mon Sep 17 00:00:00 2001 From: JeongHean Kim Date: Thu, 25 Jul 2019 15:00:23 +0900 Subject: [PATCH 4/8] Fix failed stat when using setEmbedImagesin HTML writer Fixes #1084 Closes #1085 --- src/PhpSpreadsheet/Writer/Html.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php index 8cd026d3..6ab08a96 100644 --- a/src/PhpSpreadsheet/Writer/Html.php +++ b/src/PhpSpreadsheet/Writer/Html.php @@ -643,7 +643,10 @@ class Html extends BaseWriter } else { $imageDetails = getimagesize($filename); if ($fp = fopen($filename, 'rb', 0)) { - $picture = fread($fp, filesize($filename)); + $picture = ''; + while (!feof($fp)) { + $picture .= fread($fp, 1024); + } fclose($fp); // base64 encode the binary data, then break it // into chunks according to RFC 2045 semantics From 454d942c13e1b326b92d72d974b9a904d54b13d7 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Wed, 24 Jul 2019 23:12:45 -0700 Subject: [PATCH 5/8] Drop PHP 5.6 and 7.0 This is according to our formal, published, policy to only support eol PHP after 6 months. See https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support --- .travis.yml | 3 --- composer.json | 6 +++--- composer.lock | 6 +++--- docs/index.md | 9 +++------ samples/index.php | 2 +- src/PhpSpreadsheet/Settings.php | 2 -- tests/PhpSpreadsheetTests/Cell/CoordinateTest.php | 4 ---- 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fb2dce1..b9ad8de8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: php dist: trusty php: - - 5.6 - - 7.0 - 7.1 - 7.2 - 7.3 @@ -12,7 +10,6 @@ php: matrix: fast_finish: true allow_failures: - - php: 5.6 - php: 7.4snapshot cache: diff --git a/composer.json b/composer.json index 6f9fd9c3..575fa08f 100644 --- a/composer.json +++ b/composer.json @@ -35,11 +35,11 @@ "php-cs-fixer fix --ansi" ], "versions": [ - "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 5.6- -n" + "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.1- -n" ] }, "require": { - "php": "^5.6|^7.0", + "php": "^7.1", "ext-ctype": "*", "ext-dom": "*", "ext-gd": "*", @@ -84,4 +84,4 @@ "PhpOffice\\PhpSpreadsheetTests\\": "tests/PhpSpreadsheetTests" } } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index a23c7f8d..6a4b2093 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d70247696f417581626dde9641b53bdc", + "content-hash": "844c52e10f1e289de51d2b71cb7fc1ff", "packages": [ { "name": "markbaker/complex", @@ -3192,7 +3192,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^5.6|^7.0", + "php": "^7.1", "ext-ctype": "*", "ext-dom": "*", "ext-gd": "*", @@ -3208,4 +3208,4 @@ "ext-zlib": "*" }, "platform-dev": [] -} \ No newline at end of file +} diff --git a/docs/index.md b/docs/index.md index be4e0fd0..7c276792 100644 --- a/docs/index.md +++ b/docs/index.md @@ -25,12 +25,9 @@ spreadsheet file formats, like Excel and LibreOffice Calc. ## Software requirements -The following software is required to develop using PhpSpreadsheet: - -- PHP version 5.6 or newer -- PHP extension php\_zip enabled -- PHP extension php\_xml enabled -- PHP extension php\_gd2 enabled (if not compiled in) +PHP version 7.1 or newer to develop using PhpSpreadsheet. Other requirements, such as PHP extensions, are enforced by +composer. See the `require` section of [the composer.json file](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/composer.json) +for details. ### PHP version support diff --git a/samples/index.php b/samples/index.php index ec100cf4..598caef4 100644 --- a/samples/index.php +++ b/samples/index.php @@ -3,7 +3,7 @@ require_once 'Header.php'; $requirements = [ - 'PHP 5.6.0' => version_compare(PHP_VERSION, '5.6.0', '>='), + 'PHP 7.1.0' => version_compare(PHP_VERSION, '7.1.0', '>='), 'PHP extension XML' => extension_loaded('xml'), 'PHP extension xmlwriter' => extension_loaded('xmlwriter'), 'PHP extension mbstring' => extension_loaded('mbstring'), diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php index c297dd68..03fa6ac2 100644 --- a/src/PhpSpreadsheet/Settings.php +++ b/src/PhpSpreadsheet/Settings.php @@ -30,7 +30,6 @@ class Settings * 7.2 < 7.2.1 * 7.1 < 7.1.13 * 7.0 < 7.0.27 - * 5.6 ANY * then you may need to disable this check to prevent unwanted behaviour in other threads * SECURITY WARNING: Changing this flag is not recommended. * @@ -122,7 +121,6 @@ class Settings * 7.2 < 7.2.1 * 7.1 < 7.1.13 * 7.0 < 7.0.27 - * 5.6 ANY * then you may need to disable this check to prevent unwanted behaviour in other threads * SECURITY WARNING: Changing this flag to false is not recommended. * diff --git a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php index 5136226d..8d041c26 100644 --- a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php +++ b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php @@ -243,10 +243,6 @@ class CoordinateTest extends TestCase { $this->expectException(\TypeError::class); - if (PHP_MAJOR_VERSION < 7) { - $this->markTestSkipped('Cannot catch type hinting error with PHP 5.6'); - } - $cellRange = ''; Coordinate::buildRange($cellRange); } From 7faee3d6cc6ff6265886c17d19645bc5849ef41e Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Wed, 24 Jul 2019 23:43:28 -0700 Subject: [PATCH 6/8] Take advantage of PHP 7.1 syntax --- .php_cs.dist | 4 +-- .../Calculation/Calculation.php | 34 +++++++++---------- src/PhpSpreadsheet/Calculation/Functions.php | 2 +- src/PhpSpreadsheet/Calculation/LookupRef.php | 28 +++++++-------- src/PhpSpreadsheet/Calculation/MathTrig.php | 4 +-- .../Cell/AdvancedValueBinder.php | 4 +-- src/PhpSpreadsheet/Cell/Cell.php | 4 +-- src/PhpSpreadsheet/Cell/Coordinate.php | 20 +++++------ src/PhpSpreadsheet/Chart/DataSeriesValues.php | 2 +- src/PhpSpreadsheet/Chart/Renderer/JpGraph.php | 2 +- src/PhpSpreadsheet/Reader/Csv.php | 5 ++- src/PhpSpreadsheet/Reader/Gnumeric.php | 4 +-- src/PhpSpreadsheet/Reader/Html.php | 2 +- src/PhpSpreadsheet/Reader/Ods.php | 2 +- src/PhpSpreadsheet/Reader/Slk.php | 2 +- src/PhpSpreadsheet/Reader/Xls.php | 26 +++++++------- src/PhpSpreadsheet/Reader/Xlsx.php | 6 ++-- src/PhpSpreadsheet/Reader/Xlsx/Properties.php | 2 +- src/PhpSpreadsheet/Reader/Xlsx/Styles.php | 2 +- src/PhpSpreadsheet/ReferenceHelper.php | 32 +++++++---------- src/PhpSpreadsheet/Shared/JAMA/Matrix.php | 10 +++--- src/PhpSpreadsheet/Shared/OLE.php | 6 ++-- src/PhpSpreadsheet/Shared/OLE/PPS/Root.php | 4 +-- src/PhpSpreadsheet/Shared/Xls.php | 2 +- src/PhpSpreadsheet/Style/NumberFormat.php | 4 +-- src/PhpSpreadsheet/Style/Style.php | 2 +- src/PhpSpreadsheet/Worksheet/AutoFilter.php | 12 +++---- src/PhpSpreadsheet/Worksheet/Drawing.php | 2 +- src/PhpSpreadsheet/Worksheet/Worksheet.php | 10 +++--- src/PhpSpreadsheet/Writer/Html.php | 6 ++-- src/PhpSpreadsheet/Writer/Ods/Content.php | 2 +- src/PhpSpreadsheet/Writer/Xls.php | 2 +- src/PhpSpreadsheet/Writer/Xls/Escher.php | 4 +-- src/PhpSpreadsheet/Writer/Xls/Parser.php | 30 ++++++++-------- src/PhpSpreadsheet/Writer/Xls/Worksheet.php | 32 ++++++++--------- src/PhpSpreadsheet/Writer/Xlsx/Chart.php | 2 +- src/PhpSpreadsheet/Writer/Xlsx/Comments.php | 2 +- src/PhpSpreadsheet/Writer/Xlsx/Workbook.php | 2 +- src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php | 4 +-- 39 files changed, 159 insertions(+), 166 deletions(-) diff --git a/.php_cs.dist b/.php_cs.dist index 88f7f8bb..23216924 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -56,7 +56,7 @@ return PhpCsFixer\Config::create() 'is_null' => ['use_yoda_style' => false], 'linebreak_after_opening_tag' => true, 'line_ending' => true, - 'list_syntax' => ['syntax' => 'long'], // Stay compatiblew with PHP 5.6 + 'list_syntax' => ['syntax' => 'short'], 'lowercase_cast' => true, 'lowercase_constants' => true, 'lowercase_keywords' => true, @@ -172,7 +172,7 @@ return PhpCsFixer\Config::create() 'switch_case_semicolon_to_colon' => true, 'switch_case_space' => true, 'ternary_operator_spaces' => true, - 'ternary_to_null_coalescing' => false, // Cannot use that with PHP 5.6 + 'ternary_to_null_coalescing' => true, 'trailing_comma_in_multiline_array' => true, 'trim_array_spaces' => true, 'unary_operator_spaces' => true, diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php index f6385acd..325d132b 100644 --- a/src/PhpSpreadsheet/Calculation/Calculation.php +++ b/src/PhpSpreadsheet/Calculation/Calculation.php @@ -2416,7 +2416,7 @@ class Calculation // Identify our locale and language $language = $locale = strtolower($locale); if (strpos($locale, '_') !== false) { - list($language) = explode('_', $locale); + [$language] = explode('_', $locale); } if (count(self::$validLocaleLanguages) == 1) { self::loadLocales(); @@ -2441,9 +2441,9 @@ class Calculation // Retrieve the list of locale or language specific function names $localeFunctions = file($functionNamesFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); foreach ($localeFunctions as $localeFunction) { - list($localeFunction) = explode('##', $localeFunction); // Strip out comments + [$localeFunction] = explode('##', $localeFunction); // Strip out comments if (strpos($localeFunction, '=') !== false) { - list($fName, $lfName) = explode('=', $localeFunction); + [$fName, $lfName] = explode('=', $localeFunction); $fName = trim($fName); $lfName = trim($lfName); if ((isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) { @@ -2466,9 +2466,9 @@ class Calculation if (file_exists($configFile)) { $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); foreach ($localeSettings as $localeSetting) { - list($localeSetting) = explode('##', $localeSetting); // Strip out comments + [$localeSetting] = explode('##', $localeSetting); // Strip out comments if (strpos($localeSetting, '=') !== false) { - list($settingName, $settingValue) = explode('=', $localeSetting); + [$settingName, $settingValue] = explode('=', $localeSetting); $settingName = strtoupper(trim($settingName)); switch ($settingName) { case 'ARGUMENTSEPARATOR': @@ -2977,17 +2977,17 @@ class Calculation // Examine each of the two operands, and turn them into an array if they aren't one already // Note that this function should only be called if one or both of the operand is already an array if (!is_array($operand1)) { - list($matrixRows, $matrixColumns) = self::getMatrixDimensions($operand2); + [$matrixRows, $matrixColumns] = self::getMatrixDimensions($operand2); $operand1 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand1)); $resize = 0; } elseif (!is_array($operand2)) { - list($matrixRows, $matrixColumns) = self::getMatrixDimensions($operand1); + [$matrixRows, $matrixColumns] = self::getMatrixDimensions($operand1); $operand2 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand2)); $resize = 0; } - list($matrix1Rows, $matrix1Columns) = self::getMatrixDimensions($operand1); - list($matrix2Rows, $matrix2Columns) = self::getMatrixDimensions($operand2); + [$matrix1Rows, $matrix1Columns] = self::getMatrixDimensions($operand1); + [$matrix2Rows, $matrix2Columns] = self::getMatrixDimensions($operand2); if (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) { $resize = 1; } @@ -3496,11 +3496,11 @@ class Calculation $testPrevOp = $stack->last(1); if ($testPrevOp['value'] == ':') { $startRowColRef = $output[count($output) - 1]['value']; - list($rangeWS1, $startRowColRef) = Worksheet::extractSheetTitle($startRowColRef, true); + [$rangeWS1, $startRowColRef] = Worksheet::extractSheetTitle($startRowColRef, true); if ($rangeWS1 != '') { $rangeWS1 .= '!'; } - list($rangeWS2, $val) = Worksheet::extractSheetTitle($val, true); + [$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true); if ($rangeWS2 != '') { $rangeWS2 .= '!'; } else { @@ -3678,12 +3678,12 @@ class Calculation // Binary Operators case ':': // Range if (strpos($operand1Data['reference'], '!') !== false) { - list($sheet1, $operand1Data['reference']) = Worksheet::extractSheetTitle($operand1Data['reference'], true); + [$sheet1, $operand1Data['reference']] = Worksheet::extractSheetTitle($operand1Data['reference'], true); } else { $sheet1 = ($pCellParent !== null) ? $pCellWorksheet->getTitle() : ''; } - list($sheet2, $operand2Data['reference']) = Worksheet::extractSheetTitle($operand2Data['reference'], true); + [$sheet2, $operand2Data['reference']] = Worksheet::extractSheetTitle($operand2Data['reference'], true); if (empty($sheet2)) { $sheet2 = $sheet1; } @@ -4312,7 +4312,7 @@ class Calculation if ($pSheet !== null) { $pSheetName = $pSheet->getTitle(); if (strpos($pRange, '!') !== false) { - list($pSheetName, $pRange) = Worksheet::extractSheetTitle($pRange, true); + [$pSheetName, $pRange] = Worksheet::extractSheetTitle($pRange, true); $pSheet = $this->spreadsheet->getSheetByName($pSheetName); } @@ -4365,7 +4365,7 @@ class Calculation if ($pSheet !== null) { $pSheetName = $pSheet->getTitle(); if (strpos($pRange, '!') !== false) { - list($pSheetName, $pRange) = Worksheet::extractSheetTitle($pRange, true); + [$pSheetName, $pRange] = Worksheet::extractSheetTitle($pRange, true); $pSheet = $this->spreadsheet->getSheetByName($pSheetName); } @@ -4389,7 +4389,7 @@ class Calculation $aReferences = Coordinate::extractAllCellReferencesInRange($pRange); if (!isset($aReferences[1])) { // Single cell (or single column or row) in range - list($currentCol, $currentRow) = Coordinate::coordinateFromString($aReferences[0]); + [$currentCol, $currentRow] = Coordinate::coordinateFromString($aReferences[0]); if ($pSheet->cellExists($aReferences[0])) { $returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog); } else { @@ -4399,7 +4399,7 @@ class Calculation // Extract cell data for all cells in the range foreach ($aReferences as $reference) { // Extract range - list($currentCol, $currentRow) = Coordinate::coordinateFromString($reference); + [$currentCol, $currentRow] = Coordinate::coordinateFromString($reference); if ($pSheet->cellExists($reference)) { $returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog); } else { diff --git a/src/PhpSpreadsheet/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php index d2baf4ea..40e7d964 100644 --- a/src/PhpSpreadsheet/Calculation/Functions.php +++ b/src/PhpSpreadsheet/Calculation/Functions.php @@ -281,7 +281,7 @@ class Functions return '=' . $condition; } preg_match('/(=|<[>=]?|>=?)(.*)/', $condition, $matches); - list(, $operator, $operand) = $matches; + [, $operator, $operand] = $matches; if (is_numeric(trim($operand, '"'))) { $operand = trim($operand, '"'); diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php index f2d22c00..5bc0a435 100644 --- a/src/PhpSpreadsheet/Calculation/LookupRef.php +++ b/src/PhpSpreadsheet/Calculation/LookupRef.php @@ -98,9 +98,9 @@ class LookupRef return (int) Coordinate::columnIndexFromString($columnKey); } } else { - list($sheet, $cellAddress) = Worksheet::extractSheetTitle($cellAddress, true); + [$sheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true); if (strpos($cellAddress, ':') !== false) { - list($startAddress, $endAddress) = explode(':', $cellAddress); + [$startAddress, $endAddress] = explode(':', $cellAddress); $startAddress = preg_replace('/[^a-z]/i', '', $startAddress); $endAddress = preg_replace('/[^a-z]/i', '', $endAddress); $returnValue = []; @@ -138,7 +138,7 @@ class LookupRef reset($cellAddress); $isMatrix = (is_numeric(key($cellAddress))); - list($columns, $rows) = Calculation::getMatrixDimensions($cellAddress); + [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress); if ($isMatrix) { return $rows; @@ -175,9 +175,9 @@ class LookupRef } } } else { - list($sheet, $cellAddress) = Worksheet::extractSheetTitle($cellAddress, true); + [$sheet, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true); if (strpos($cellAddress, ':') !== false) { - list($startAddress, $endAddress) = explode(':', $cellAddress); + [$startAddress, $endAddress] = explode(':', $cellAddress); $startAddress = preg_replace('/\D/', '', $startAddress); $endAddress = preg_replace('/\D/', '', $endAddress); $returnValue = []; @@ -187,7 +187,7 @@ class LookupRef return $returnValue; } - list($cellAddress) = explode(':', $cellAddress); + [$cellAddress] = explode(':', $cellAddress); return (int) preg_replace('/\D/', '', $cellAddress); } @@ -215,7 +215,7 @@ class LookupRef reset($cellAddress); $isMatrix = (is_numeric(key($cellAddress))); - list($columns, $rows) = Calculation::getMatrixDimensions($cellAddress); + [$columns, $rows] = Calculation::getMatrixDimensions($cellAddress); if ($isMatrix) { return $columns; @@ -285,7 +285,7 @@ class LookupRef $cellAddress1 = $cellAddress; $cellAddress2 = null; if (strpos($cellAddress, ':') !== false) { - list($cellAddress1, $cellAddress2) = explode(':', $cellAddress); + [$cellAddress1, $cellAddress2] = explode(':', $cellAddress); } if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) || @@ -295,7 +295,7 @@ class LookupRef } if (strpos($cellAddress, '!') !== false) { - list($sheetName, $cellAddress) = Worksheet::extractSheetTitle($cellAddress, true); + [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true); $sheetName = trim($sheetName, "'"); $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName); } else { @@ -306,7 +306,7 @@ class LookupRef } if (strpos($cellAddress, '!') !== false) { - list($sheetName, $cellAddress) = Worksheet::extractSheetTitle($cellAddress, true); + [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true); $sheetName = trim($sheetName, "'"); $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName); } else { @@ -359,16 +359,16 @@ class LookupRef $sheetName = null; if (strpos($cellAddress, '!')) { - list($sheetName, $cellAddress) = Worksheet::extractSheetTitle($cellAddress, true); + [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true); $sheetName = trim($sheetName, "'"); } if (strpos($cellAddress, ':')) { - list($startCell, $endCell) = explode(':', $cellAddress); + [$startCell, $endCell] = explode(':', $cellAddress); } else { $startCell = $endCell = $cellAddress; } - list($startCellColumn, $startCellRow) = Coordinate::coordinateFromString($startCell); - list($endCellColumn, $endCellRow) = Coordinate::coordinateFromString($endCell); + [$startCellColumn, $startCellRow] = Coordinate::coordinateFromString($startCell); + [$endCellColumn, $endCellRow] = Coordinate::coordinateFromString($endCell); $startCellRow += $rows; $startCellColumn = Coordinate::columnIndexFromString($startCellColumn) - 1; diff --git a/src/PhpSpreadsheet/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php index 5afdaf35..4e384ea3 100644 --- a/src/PhpSpreadsheet/Calculation/MathTrig.php +++ b/src/PhpSpreadsheet/Calculation/MathTrig.php @@ -1074,7 +1074,7 @@ class MathTrig return array_filter( $args, function ($index) use ($cellReference) { - list(, $row, $column) = explode('.', $index); + [, $row, $column] = explode('.', $index); return $cellReference->getWorksheet()->getRowDimension($row)->getVisible() && $cellReference->getWorksheet()->getColumnDimension($column)->getVisible(); @@ -1088,7 +1088,7 @@ class MathTrig return array_filter( $args, function ($index) use ($cellReference) { - list(, $row, $column) = explode('.', $index); + [, $row, $column] = explode('.', $index); if ($cellReference->getWorksheet()->cellExists($column . $row)) { //take this cell out if it contains the SUBTOTAL or AGGREGATE functions in a formula $isFormula = $cellReference->getWorksheet()->getCell($column . $row)->isFormula(); diff --git a/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php b/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php index 4052c23c..1d28f247 100644 --- a/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php +++ b/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php @@ -118,7 +118,7 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder // Check for time without seconds e.g. '9:45', '09:45' if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d$/', $value)) { // Convert value to number - list($h, $m) = explode(':', $value); + [$h, $m] = explode(':', $value); $days = $h / 24 + $m / 1440; $cell->setValueExplicit($days, DataType::TYPE_NUMERIC); // Set style @@ -131,7 +131,7 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder // Check for time with seconds '9:45:59', '09:45:59' if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d:[0-5]\d$/', $value)) { // Convert value to number - list($h, $m, $s) = explode(':', $value); + [$h, $m, $s] = explode(':', $value); $days = $h / 24 + $m / 1440 + $s / 86400; // Convert value to number $cell->setValueExplicit($days, DataType::TYPE_NUMERIC); diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php index 813eee4a..45d1b5ba 100644 --- a/src/PhpSpreadsheet/Cell/Cell.php +++ b/src/PhpSpreadsheet/Cell/Cell.php @@ -511,7 +511,7 @@ class Cell { if ($mergeRange = $this->getMergeRange()) { $mergeRange = Coordinate::splitRange($mergeRange); - list($startCell) = $mergeRange[0]; + [$startCell] = $mergeRange[0]; if ($this->getCoordinate() === $startCell) { return true; } @@ -569,7 +569,7 @@ class Cell */ public function isInRange($pRange) { - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($pRange); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange); // Translate properties $myColumn = Coordinate::columnIndexFromString($this->getColumn()); diff --git a/src/PhpSpreadsheet/Cell/Coordinate.php b/src/PhpSpreadsheet/Cell/Coordinate.php index 5e20ec6d..cc0543f6 100644 --- a/src/PhpSpreadsheet/Cell/Coordinate.php +++ b/src/PhpSpreadsheet/Cell/Coordinate.php @@ -71,7 +71,7 @@ abstract class Coordinate } // Split out any worksheet name from the reference - list($worksheet, $pCoordinateString) = Worksheet::extractSheetTitle($pCoordinateString, true); + [$worksheet, $pCoordinateString] = Worksheet::extractSheetTitle($pCoordinateString, true); if ($worksheet > '') { $worksheet .= '!'; } @@ -102,13 +102,13 @@ abstract class Coordinate } // Split out any worksheet name from the coordinate - list($worksheet, $pCoordinateString) = Worksheet::extractSheetTitle($pCoordinateString, true); + [$worksheet, $pCoordinateString] = Worksheet::extractSheetTitle($pCoordinateString, true); if ($worksheet > '') { $worksheet .= '!'; } // Create absolute coordinate - list($column, $row) = self::coordinateFromString($pCoordinateString); + [$column, $row] = self::coordinateFromString($pCoordinateString); $column = ltrim($column, '$'); $row = ltrim($row, '$'); @@ -187,7 +187,7 @@ abstract class Coordinate if (strpos($pRange, ':') === false) { $rangeA = $rangeB = $pRange; } else { - list($rangeA, $rangeB) = explode(':', $pRange); + [$rangeA, $rangeB] = explode(':', $pRange); } // Calculate range outer borders @@ -211,7 +211,7 @@ abstract class Coordinate public static function rangeDimension($pRange) { // Calculate range outer borders - list($rangeStart, $rangeEnd) = self::rangeBoundaries($pRange); + [$rangeStart, $rangeEnd] = self::rangeBoundaries($pRange); return [($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1)]; } @@ -238,7 +238,7 @@ abstract class Coordinate if (strpos($pRange, ':') === false) { $rangeA = $rangeB = $pRange; } else { - list($rangeA, $rangeB) = explode(':', $pRange); + [$rangeA, $rangeB] = explode(':', $pRange); } return [self::coordinateFromString($rangeA), self::coordinateFromString($rangeB)]; @@ -376,9 +376,9 @@ abstract class Coordinate } // Range... - list($rangeStart, $rangeEnd) = $range; - list($startColumn, $startRow) = self::coordinateFromString($rangeStart); - list($endColumn, $endRow) = self::coordinateFromString($rangeEnd); + [$rangeStart, $rangeEnd] = $range; + [$startColumn, $startRow] = self::coordinateFromString($rangeStart); + [$endColumn, $endRow] = self::coordinateFromString($rangeEnd); $startColumnIndex = self::columnIndexFromString($startColumn); $endColumnIndex = self::columnIndexFromString($endColumn); ++$endColumnIndex; @@ -432,7 +432,7 @@ abstract class Coordinate continue; } - list($column, $row) = self::coordinateFromString($coord); + [$column, $row] = self::coordinateFromString($coord); $row = (int) (ltrim($row, '$')); $hashCode = $column . '-' . (is_object($value) ? $value->getHashCode() : $value); diff --git a/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/src/PhpSpreadsheet/Chart/DataSeriesValues.php index e82b7efe..73905d97 100644 --- a/src/PhpSpreadsheet/Chart/DataSeriesValues.php +++ b/src/PhpSpreadsheet/Chart/DataSeriesValues.php @@ -376,7 +376,7 @@ class DataSeriesValues } unset($dataValue); } else { - list($worksheet, $cellRange) = Worksheet::extractSheetTitle($this->dataSource, true); + [$worksheet, $cellRange] = Worksheet::extractSheetTitle($this->dataSource, true); $dimensions = Coordinate::rangeDimension(str_replace('$', '', $cellRange)); if (($dimensions[0] == 1) || ($dimensions[1] == 1)) { $this->dataValues = Functions::flattenArray($newDataValues); diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php index c0445d49..9dcab049 100644 --- a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php +++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php @@ -442,7 +442,7 @@ class JpGraph implements IRenderer $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]); } elseif ($scatterStyle == 'smoothMarker') { $spline = new \Spline($dataValuesY, $dataValuesX); - list($splineDataY, $splineDataX) = $spline->Get(count($dataValuesX) * self::$width / 20); + [$splineDataY, $splineDataX] = $spline->Get(count($dataValuesX) * self::$width / 20); $lplot = new \LinePlot($splineDataX, $splineDataY); $lplot->SetColor(self::$colourSet[self::$plotColour]); diff --git a/src/PhpSpreadsheet/Reader/Csv.php b/src/PhpSpreadsheet/Reader/Csv.php index 81ca1a8c..21251913 100644 --- a/src/PhpSpreadsheet/Reader/Csv.php +++ b/src/PhpSpreadsheet/Reader/Csv.php @@ -175,9 +175,8 @@ class Csv extends BaseReader } } foreach ($potentialDelimiters as $delimiter) { - $counts[$delimiter][] = isset($countLine[$delimiter]) - ? $countLine[$delimiter] - : 0; + $counts[$delimiter][] = $countLine[$delimiter] + ?? 0; } } diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php index 7445ef1b..44ab701d 100644 --- a/src/PhpSpreadsheet/Reader/Gnumeric.php +++ b/src/PhpSpreadsheet/Reader/Gnumeric.php @@ -267,7 +267,7 @@ class Gnumeric extends BaseReader break; case 'user-defined': - list(, $attrName) = explode(':', $attributes['name']); + [, $attrName] = explode(':', $attributes['name']); switch ($attrName) { case 'publisher': $docProps->setCompany(trim($propertyValue)); @@ -879,7 +879,7 @@ class Gnumeric extends BaseReader private static function parseGnumericColour($gnmColour) { - list($gnmR, $gnmG, $gnmB) = explode(':', $gnmColour); + [$gnmR, $gnmG, $gnmB] = explode(':', $gnmColour); $gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2); $gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2); $gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2); diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php index 75db7591..d599424d 100644 --- a/src/PhpSpreadsheet/Reader/Html.php +++ b/src/PhpSpreadsheet/Reader/Html.php @@ -920,7 +920,7 @@ class Html extends BaseReader */ private function setBorderStyle(Style $cellStyle, $styleValue, $type) { - list(, $borderStyle, $color) = explode(' ', $styleValue); + [, $borderStyle, $color] = explode(' ', $styleValue); $cellStyle->applyFromArray([ 'borders' => [ diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php index 51462c20..5fff07aa 100644 --- a/src/PhpSpreadsheet/Reader/Ods.php +++ b/src/PhpSpreadsheet/Reader/Ods.php @@ -490,7 +490,7 @@ class Ods extends BaseReader $dateObj = new DateTime($value, $GMT); $dateObj->setTimeZone($timezoneObj); - list($year, $month, $day, $hour, $minute, $second) = explode( + [$year, $month, $day, $hour, $minute, $second] = explode( ' ', $dateObj->format('Y m d H i s') ); diff --git a/src/PhpSpreadsheet/Reader/Slk.php b/src/PhpSpreadsheet/Reader/Slk.php index c1013c2e..d73f598c 100644 --- a/src/PhpSpreadsheet/Reader/Slk.php +++ b/src/PhpSpreadsheet/Reader/Slk.php @@ -384,7 +384,7 @@ class Slk extends BaseReader break; case 'W': - list($startCol, $endCol, $columnWidth) = explode(' ', substr($rowDatum, 1)); + [$startCol, $endCol, $columnWidth] = explode(' ', substr($rowDatum, 1)); break; case 'S': diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php index bd2c9c1d..36b50f0a 100644 --- a/src/PhpSpreadsheet/Reader/Xls.php +++ b/src/PhpSpreadsheet/Reader/Xls.php @@ -1089,8 +1089,8 @@ class Xls extends BaseReader } // calculate the width and height of the shape - list($startColumn, $startRow) = Coordinate::coordinateFromString($spContainer->getStartCoordinates()); - list($endColumn, $endRow) = Coordinate::coordinateFromString($spContainer->getEndCoordinates()); + [$startColumn, $startRow] = Coordinate::coordinateFromString($spContainer->getStartCoordinates()); + [$endColumn, $endRow] = Coordinate::coordinateFromString($spContainer->getEndCoordinates()); $startOffsetX = $spContainer->getStartOffsetX(); $startOffsetY = $spContainer->getStartOffsetY(); @@ -1175,7 +1175,7 @@ class Xls extends BaseReader // treat SHAREDFMLA records if ($this->version == self::XLS_BIFF8) { foreach ($this->sharedFormulaParts as $cell => $baseCell) { - list($column, $row) = Coordinate::coordinateFromString($cell); + [$column, $row] = Coordinate::coordinateFromString($cell); if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) { $formula = $this->getFormulaFromStructure($this->sharedFormulas[$baseCell], $cell); $this->phpSheet->getCell($cell)->setValueExplicit('=' . $formula, DataType::TYPE_FORMULA); @@ -1251,8 +1251,8 @@ class Xls extends BaseReader $coordinateStrings = explode(':', $extractedRange); if (count($coordinateStrings) == 2) { - list($firstColumn, $firstRow) = Coordinate::coordinateFromString($coordinateStrings[0]); - list($lastColumn, $lastRow) = Coordinate::coordinateFromString($coordinateStrings[1]); + [$firstColumn, $firstRow] = Coordinate::coordinateFromString($coordinateStrings[0]); + [$lastColumn, $lastRow] = Coordinate::coordinateFromString($coordinateStrings[1]); if ($firstColumn == 'A' and $lastColumn == 'IV') { // then we have repeating rows @@ -5355,12 +5355,12 @@ class Xls extends BaseReader $formulaStrings = []; foreach ($tokens as $token) { // initialize spaces - $space0 = isset($space0) ? $space0 : ''; // spaces before next token, not tParen - $space1 = isset($space1) ? $space1 : ''; // carriage returns before next token, not tParen - $space2 = isset($space2) ? $space2 : ''; // spaces before opening parenthesis - $space3 = isset($space3) ? $space3 : ''; // carriage returns before opening parenthesis - $space4 = isset($space4) ? $space4 : ''; // spaces before closing parenthesis - $space5 = isset($space5) ? $space5 : ''; // carriage returns before closing parenthesis + $space0 = $space0 ?? ''; // spaces before next token, not tParen + $space1 = $space1 ?? ''; // carriage returns before next token, not tParen + $space2 = $space2 ?? ''; // spaces before opening parenthesis + $space3 = $space3 ?? ''; // carriage returns before opening parenthesis + $space4 = $space4 ?? ''; // spaces before closing parenthesis + $space5 = $space5 ?? ''; // carriage returns before closing parenthesis switch ($token['name']) { case 'tAdd': // addition @@ -7145,7 +7145,7 @@ class Xls extends BaseReader */ private function readBIFF8CellAddressB($cellAddressStructure, $baseCell = 'A1') { - list($baseCol, $baseRow) = Coordinate::coordinateFromString($baseCell); + [$baseCol, $baseRow] = Coordinate::coordinateFromString($baseCell); $baseCol = Coordinate::columnIndexFromString($baseCol) - 1; // offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767)) @@ -7328,7 +7328,7 @@ class Xls extends BaseReader */ private function readBIFF8CellRangeAddressB($subData, $baseCell = 'A1') { - list($baseCol, $baseRow) = Coordinate::coordinateFromString($baseCell); + [$baseCol, $baseRow] = Coordinate::coordinateFromString($baseCell); $baseCol = Coordinate::columnIndexFromString($baseCol) - 1; // TODO: if cell range is just a single cell, should this funciton diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php index 5372fef9..1c1351f7 100644 --- a/src/PhpSpreadsheet/Reader/Xlsx.php +++ b/src/PhpSpreadsheet/Reader/Xlsx.php @@ -1352,7 +1352,7 @@ class Xlsx extends BaseReader $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE); $newRangeSets = []; foreach ($rangeSets as $rangeSet) { - list($sheetName, $rangeSet) = Worksheet::extractSheetTitle($rangeSet, true); + [$sheetName, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true); if (strpos($rangeSet, ':') === false) { $rangeSet = $rangeSet . ':' . $rangeSet; } @@ -1426,7 +1426,7 @@ class Xlsx extends BaseReader $locatedSheet = $excel->getSheetByName($extractedSheetName); // Modify range - list($worksheetName, $extractedRange) = Worksheet::extractSheetTitle($extractedRange, true); + [$worksheetName, $extractedRange] = Worksheet::extractSheetTitle($extractedRange, true); } if ($locatedSheet !== null) { @@ -1841,7 +1841,7 @@ class Xlsx extends BaseReader private static function getArrayItem($array, $key = 0) { - return isset($array[$key]) ? $array[$key] : null; + return $array[$key] ?? null; } private static function dirAdd($base, $add) diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Properties.php b/src/PhpSpreadsheet/Reader/Xlsx/Properties.php index bc6bba2c..bf8e57d8 100644 --- a/src/PhpSpreadsheet/Reader/Xlsx/Properties.php +++ b/src/PhpSpreadsheet/Reader/Xlsx/Properties.php @@ -86,6 +86,6 @@ class Properties private static function getArrayItem(array $array, $key = 0) { - return isset($array[$key]) ? $array[$key] : null; + return $array[$key] ?? null; } } diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Styles.php b/src/PhpSpreadsheet/Reader/Xlsx/Styles.php index c06564a3..af52a6b2 100644 --- a/src/PhpSpreadsheet/Reader/Xlsx/Styles.php +++ b/src/PhpSpreadsheet/Reader/Xlsx/Styles.php @@ -260,6 +260,6 @@ class Styles extends BaseParserClass private static function getArrayItem($array, $key = 0) { - return isset($array[$key]) ? $array[$key] : null; + return $array[$key] ?? null; } } diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php index 13dbe042..143e80d8 100644 --- a/src/PhpSpreadsheet/ReferenceHelper.php +++ b/src/PhpSpreadsheet/ReferenceHelper.php @@ -82,11 +82,8 @@ class ReferenceHelper */ public static function cellSort($a, $b) { - // TODO Scrutinizer doesn't like sscanf($a, '%[A-Z]%d', $ac, $ar), and we can't use short list() syntax - // [$ac, $ar] = sscanf($a, '%[A-Z]%d') while retaining PHP 5.6 support. - // Switch when we drop support for 5.6 - list($ac, $ar) = sscanf($a, '%[A-Z]%d'); - list($bc, $br) = sscanf($b, '%[A-Z]%d'); + [$ac, $ar] = sscanf($a, '%[A-Z]%d'); + [$bc, $br] = sscanf($b, '%[A-Z]%d'); if ($ar === $br) { return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc); @@ -106,11 +103,8 @@ class ReferenceHelper */ public static function cellReverseSort($a, $b) { - // TODO Scrutinizer doesn't like sscanf($a, '%[A-Z]%d', $ac, $ar), and we can't use short list() syntax - // [$ac, $ar] = sscanf($a, '%[A-Z]%d') while retaining PHP 5.6 support. - // Switch when we drop support for 5.6 - list($ac, $ar) = sscanf($a, '%[A-Z]%d'); - list($bc, $br) = sscanf($b, '%[A-Z]%d'); + [$ac, $ar] = sscanf($a, '%[A-Z]%d'); + [$bc, $br] = sscanf($b, '%[A-Z]%d'); if ($ar === $br) { return 1 - strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc); @@ -132,7 +126,7 @@ class ReferenceHelper */ private static function cellAddressInDeleteRange($cellAddress, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols) { - list($cellColumn, $cellRow) = Coordinate::coordinateFromString($cellAddress); + [$cellColumn, $cellRow] = Coordinate::coordinateFromString($cellAddress); $cellColumnIndex = Coordinate::columnIndexFromString($cellColumn); // Is cell within the range of rows/columns if we're deleting if ($pNumRows < 0 && @@ -319,7 +313,7 @@ class ReferenceHelper if (!empty($aColumnDimensions)) { foreach ($aColumnDimensions as $objColumnDimension) { $newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1', $pBefore, $pNumCols, $pNumRows); - list($newReference) = Coordinate::coordinateFromString($newReference); + [$newReference] = Coordinate::coordinateFromString($newReference); if ($objColumnDimension->getColumnIndex() != $newReference) { $objColumnDimension->setColumnIndex($newReference); } @@ -344,7 +338,7 @@ class ReferenceHelper if (!empty($aRowDimensions)) { foreach ($aRowDimensions as $objRowDimension) { $newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex(), $pBefore, $pNumCols, $pNumRows); - list(, $newReference) = Coordinate::coordinateFromString($newReference); + [, $newReference] = Coordinate::coordinateFromString($newReference); if ($objRowDimension->getRowIndex() != $newReference) { $objRowDimension->setRowIndex($newReference); } @@ -378,7 +372,7 @@ class ReferenceHelper $allCoordinates = $pSheet->getCoordinates(); // Get coordinate of $pBefore - list($beforeColumn, $beforeRow) = Coordinate::coordinateFromString($pBefore); + [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($pBefore); $beforeColumnIndex = Coordinate::columnIndexFromString($beforeColumn); // Clear cells if we are removing columns or rows @@ -539,7 +533,7 @@ class ReferenceHelper $row = 0; sscanf($pBefore, '%[A-Z]%d', $column, $row); $columnIndex = Coordinate::columnIndexFromString($column); - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($autoFilterRange); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($autoFilterRange); if ($columnIndex <= $rangeEnd[0]) { if ($pNumCols < 0) { // If we're actually deleting any columns that fall within the autofilter range, @@ -707,7 +701,7 @@ class ReferenceHelper if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) { $toString = ($match[2] > '') ? $match[2] . '!' : ''; $toString .= $modified3 . ':' . $modified4; - list($column, $row) = Coordinate::coordinateFromString($match[3]); + [$column, $row] = Coordinate::coordinateFromString($match[3]); // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more $column = Coordinate::columnIndexFromString(trim($column, '$')) + 100000; $row = trim($row, '$') + 10000000; @@ -733,7 +727,7 @@ class ReferenceHelper if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) { $toString = ($match[2] > '') ? $match[2] . '!' : ''; $toString .= $modified3; - list($column, $row) = Coordinate::coordinateFromString($match[3]); + [$column, $row] = Coordinate::coordinateFromString($match[3]); // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more $column = Coordinate::columnIndexFromString(trim($column, '$')) + 100000; $row = trim($row, '$') + 10000000; @@ -881,10 +875,10 @@ class ReferenceHelper } // Get coordinate of $pBefore - list($beforeColumn, $beforeRow) = Coordinate::coordinateFromString($pBefore); + [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($pBefore); // Get coordinate of $pCellReference - list($newColumn, $newRow) = Coordinate::coordinateFromString($pCellReference); + [$newColumn, $newRow] = Coordinate::coordinateFromString($pCellReference); // Verify which parts should be updated $updateColumn = (($newColumn[0] != '$') && ($beforeColumn[0] != '$') && (Coordinate::columnIndexFromString($newColumn) >= Coordinate::columnIndexFromString($beforeColumn))); diff --git a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php index b3d82d46..17f32107 100644 --- a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php +++ b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php @@ -174,7 +174,7 @@ class Matrix switch ($match) { //A($i0...; $j0...) case 'integer,integer': - list($i0, $j0) = $args; + [$i0, $j0] = $args; if ($i0 >= 0) { $m = $this->m - $i0; } else { @@ -197,7 +197,7 @@ class Matrix break; //A($i0...$iF; $j0...$jF) case 'integer,integer,integer,integer': - list($i0, $iF, $j0, $jF) = $args; + [$i0, $iF, $j0, $jF] = $args; if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { @@ -220,7 +220,7 @@ class Matrix break; //$R = array of row indices; $C = array of column indices case 'array,array': - list($RL, $CL) = $args; + [$RL, $CL] = $args; if (count($RL) > 0) { $m = count($RL); } else { @@ -243,7 +243,7 @@ class Matrix break; //A($i0...$iF); $CL = array of column indices case 'integer,integer,array': - list($i0, $iF, $CL) = $args; + [$i0, $iF, $CL] = $args; if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { @@ -266,7 +266,7 @@ class Matrix break; //$RL = array of row indices case 'array,integer,integer': - list($RL, $j0, $jF) = $args; + [$RL, $j0, $jF] = $args; if (count($RL) > 0) { $m = count($RL); } else { diff --git a/src/PhpSpreadsheet/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php index f09fbc92..efa7522f 100644 --- a/src/PhpSpreadsheet/Shared/OLE.php +++ b/src/PhpSpreadsheet/Shared/OLE.php @@ -253,7 +253,7 @@ class OLE */ private static function _readInt1($fh) { - list(, $tmp) = unpack('c', fread($fh, 1)); + [, $tmp] = unpack('c', fread($fh, 1)); return $tmp; } @@ -267,7 +267,7 @@ class OLE */ private static function _readInt2($fh) { - list(, $tmp) = unpack('v', fread($fh, 2)); + [, $tmp] = unpack('v', fread($fh, 2)); return $tmp; } @@ -281,7 +281,7 @@ class OLE */ private static function _readInt4($fh) { - list(, $tmp) = unpack('V', fread($fh, 4)); + [, $tmp] = unpack('V', fread($fh, 4)); return $tmp; } diff --git a/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php b/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php index 578e08fa..c52cea23 100644 --- a/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php +++ b/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php @@ -118,7 +118,7 @@ class Root extends PPS $aList = []; PPS::_savePpsSetPnt($aList, [$this]); // calculate values for header - list($iSBDcnt, $iBBcnt, $iPPScnt) = $this->_calcSize($aList); //, $rhInfo); + [$iSBDcnt, $iBBcnt, $iPPScnt] = $this->_calcSize($aList); //, $rhInfo); // Save Header $this->_saveHeader($iSBDcnt, $iBBcnt, $iPPScnt); @@ -149,7 +149,7 @@ class Root extends PPS public function _calcSize(&$raList) { // Calculate Basic Setting - list($iSBDcnt, $iBBcnt, $iPPScnt) = [0, 0, 0]; + [$iSBDcnt, $iBBcnt, $iPPScnt] = [0, 0, 0]; $iSmallLen = 0; $iSBcnt = 0; $iCount = count($raList); diff --git a/src/PhpSpreadsheet/Shared/Xls.php b/src/PhpSpreadsheet/Shared/Xls.php index 177779f8..51407ade 100644 --- a/src/PhpSpreadsheet/Shared/Xls.php +++ b/src/PhpSpreadsheet/Shared/Xls.php @@ -211,7 +211,7 @@ class Xls */ public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height) { - list($column, $row) = Coordinate::coordinateFromString($coordinates); + [$column, $row] = Coordinate::coordinateFromString($coordinates); $col_start = Coordinate::columnIndexFromString($column); $row_start = $row - 1; diff --git a/src/PhpSpreadsheet/Style/NumberFormat.php b/src/PhpSpreadsheet/Style/NumberFormat.php index 785c1f0c..ac64b20e 100644 --- a/src/PhpSpreadsheet/Style/NumberFormat.php +++ b/src/PhpSpreadsheet/Style/NumberFormat.php @@ -706,7 +706,7 @@ class NumberFormat extends Supervisor if (preg_match('/\[\$(.*)\]/u', $format, $m)) { // Currency or Accounting $currencyCode = $m[1]; - list($currencyCode) = explode('-', $currencyCode); + [$currencyCode] = explode('-', $currencyCode); if ($currencyCode == '') { $currencyCode = StringHelper::getCurrencyCode(); } @@ -807,7 +807,7 @@ class NumberFormat extends Supervisor // Additional formatting provided by callback function if ($callBack !== null) { - list($writerInstance, $function) = $callBack; + [$writerInstance, $function] = $callBack; $value = $writerInstance->$function($value, $formatColor); } diff --git a/src/PhpSpreadsheet/Style/Style.php b/src/PhpSpreadsheet/Style/Style.php index fbe07c2c..9cdfc1b1 100644 --- a/src/PhpSpreadsheet/Style/Style.php +++ b/src/PhpSpreadsheet/Style/Style.php @@ -204,7 +204,7 @@ class Style extends Supervisor $rangeA = $pRange; $rangeB = $pRange; } else { - list($rangeA, $rangeB) = explode(':', $pRange); + [$rangeA, $rangeB] = explode(':', $pRange); } // Calculate range outer borders diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php index 494948a7..b4449254 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php @@ -90,7 +90,7 @@ class AutoFilter public function setRange($pRange) { // extract coordinate - list($worksheet, $pRange) = Worksheet::extractSheetTitle($pRange, true); + [$worksheet, $pRange] = Worksheet::extractSheetTitle($pRange, true); if (strpos($pRange, ':') !== false) { $this->range = $pRange; @@ -105,7 +105,7 @@ class AutoFilter $this->columns = []; } else { // Discard any column rules that are no longer valid within this range - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($this->range); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range); foreach ($this->columns as $key => $value) { $colIndex = Coordinate::columnIndexFromString($key); if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) { @@ -143,7 +143,7 @@ class AutoFilter } $columnIndex = Coordinate::columnIndexFromString($column); - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($this->range); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range); if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) { throw new PhpSpreadsheetException('Column is outside of current autofilter range.'); } @@ -196,7 +196,7 @@ class AutoFilter */ public function getColumnByOffset($pColumnOffset) { - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($this->range); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range); $pColumn = Coordinate::stringFromColumnIndex($rangeStart[0] + $pColumnOffset); return $this->getColumn($pColumn); @@ -357,7 +357,7 @@ class AutoFilter { $dataSet = $ruleSet['filterRules']; $join = $ruleSet['join']; - $customRuleForBlanks = isset($ruleSet['customRuleForBlanks']) ? $ruleSet['customRuleForBlanks'] : false; + $customRuleForBlanks = $ruleSet['customRuleForBlanks'] ?? false; if (!$customRuleForBlanks) { // Blank cells are always ignored, so return a FALSE @@ -621,7 +621,7 @@ class AutoFilter */ public function showHideRows() { - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($this->range); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($this->range); // The heading row should always be visible $this->workSheet->getRowDimension($rangeStart[1])->setVisible(true); diff --git a/src/PhpSpreadsheet/Worksheet/Drawing.php b/src/PhpSpreadsheet/Worksheet/Drawing.php index ed26006c..8194da31 100644 --- a/src/PhpSpreadsheet/Worksheet/Drawing.php +++ b/src/PhpSpreadsheet/Worksheet/Drawing.php @@ -88,7 +88,7 @@ class Drawing extends BaseDrawing if ($this->width == 0 && $this->height == 0) { // Get width/height - list($this->width, $this->height) = getimagesize($pValue); + [$this->width, $this->height] = getimagesize($pValue); } } else { throw new PhpSpreadsheetException("File $pValue not found!"); diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php index 1e525a3f..689c547e 100644 --- a/src/PhpSpreadsheet/Worksheet/Worksheet.php +++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php @@ -1561,7 +1561,7 @@ class Worksheet implements IComparable } // Calculate range outer borders - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($pRange . ':' . $pRange); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange . ':' . $pRange); // Make sure we can loop upwards on rows and columns if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) { @@ -1601,7 +1601,7 @@ class Worksheet implements IComparable } // Calculate range outer borders - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($pRange . ':' . $pRange); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange . ':' . $pRange); // Make sure we can loop upwards on rows and columns if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) { @@ -2424,7 +2424,7 @@ class Worksheet implements IComparable $pCoordinate = preg_replace('/^(\d+):(\d+)$/', 'A${1}:XFD${2}', $pCoordinate); if (Coordinate::coordinateIsRange($pCoordinate)) { - list($first) = Coordinate::splitRange($pCoordinate); + [$first] = Coordinate::splitRange($pCoordinate); $this->activeCell = $first[0]; } else { $this->activeCell = $pCoordinate; @@ -2493,7 +2493,7 @@ class Worksheet implements IComparable } // start coordinate - list($startColumn, $startRow) = Coordinate::coordinateFromString($startCell); + [$startColumn, $startRow] = Coordinate::coordinateFromString($startCell); // Loop through $source foreach ($source as $rowData) { @@ -2535,7 +2535,7 @@ class Worksheet implements IComparable // Returnvalue $returnValue = []; // Identify the range that we need to extract from the worksheet - list($rangeStart, $rangeEnd) = Coordinate::rangeBoundaries($pRange); + [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($pRange); $minCol = Coordinate::stringFromColumnIndex($rangeStart[0]); $minRow = $rangeStart[1]; $maxCol = Coordinate::stringFromColumnIndex($rangeEnd[0]); diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php index 6ab08a96..ebda5c33 100644 --- a/src/PhpSpreadsheet/Writer/Html.php +++ b/src/PhpSpreadsheet/Writer/Html.php @@ -1541,14 +1541,14 @@ class Html extends BaseWriter // loop through all Excel merged cells foreach ($sheet->getMergeCells() as $cells) { - list($cells) = Coordinate::splitRange($cells); + [$cells] = Coordinate::splitRange($cells); $first = $cells[0]; $last = $cells[1]; - list($fc, $fr) = Coordinate::coordinateFromString($first); + [$fc, $fr] = Coordinate::coordinateFromString($first); $fc = Coordinate::columnIndexFromString($fc) - 1; - list($lc, $lr) = Coordinate::coordinateFromString($last); + [$lc, $lr] = Coordinate::coordinateFromString($last); $lc = Coordinate::columnIndexFromString($lc) - 1; // loop through the individual cells in the individual merge diff --git a/src/PhpSpreadsheet/Writer/Ods/Content.php b/src/PhpSpreadsheet/Writer/Ods/Content.php index 11de0fd3..962f8fff 100644 --- a/src/PhpSpreadsheet/Writer/Ods/Content.php +++ b/src/PhpSpreadsheet/Writer/Ods/Content.php @@ -383,7 +383,7 @@ class Content extends WriterPart } $mergeRange = Coordinate::splitRange($cell->getMergeRange()); - list($startCell, $endCell) = $mergeRange[0]; + [$startCell, $endCell] = $mergeRange[0]; $start = Coordinate::coordinateFromString($startCell); $end = Coordinate::coordinateFromString($endCell); $columnSpan = Coordinate::columnIndexFromString($end[0]) - Coordinate::columnIndexFromString($start[0]) + 1; diff --git a/src/PhpSpreadsheet/Writer/Xls.php b/src/PhpSpreadsheet/Writer/Xls.php index 6dff1342..6932eb1a 100644 --- a/src/PhpSpreadsheet/Writer/Xls.php +++ b/src/PhpSpreadsheet/Writer/Xls.php @@ -459,7 +459,7 @@ class Xls extends BaseWriter if ($drawing instanceof Drawing) { $filename = $drawing->getPath(); - list($imagesx, $imagesy, $imageFormat) = getimagesize($filename); + [$imagesx, $imagesy, $imageFormat] = getimagesize($filename); switch ($imageFormat) { case 1: // GIF, not supported by BIFF8, we convert to PNG diff --git a/src/PhpSpreadsheet/Writer/Xls/Escher.php b/src/PhpSpreadsheet/Writer/Xls/Escher.php index 1dcef807..1ee2e904 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Escher.php +++ b/src/PhpSpreadsheet/Writer/Xls/Escher.php @@ -420,7 +420,7 @@ class Escher $recType = 0xF010; // start coordinates - list($column, $row) = Coordinate::coordinateFromString($this->object->getStartCoordinates()); + [$column, $row] = Coordinate::coordinateFromString($this->object->getStartCoordinates()); $c1 = Coordinate::columnIndexFromString($column) - 1; $r1 = $row - 1; @@ -431,7 +431,7 @@ class Escher $startOffsetY = $this->object->getStartOffsetY(); // end coordinates - list($column, $row) = Coordinate::coordinateFromString($this->object->getEndCoordinates()); + [$column, $row] = Coordinate::coordinateFromString($this->object->getEndCoordinates()); $c2 = Coordinate::columnIndexFromString($column) - 1; $r2 = $row - 1; diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php index 6049e328..625a243d 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Parser.php +++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php @@ -608,15 +608,15 @@ class Parser // TODO: possible class value 0,1,2 check Formula.pm // Split the range into 2 cell refs if (preg_match('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) { - list($cell1, $cell2) = explode(':', $range); + [$cell1, $cell2] = explode(':', $range); } else { // TODO: use real error codes throw new WriterException('Unknown range separator'); } // Convert the cell references - list($row1, $col1) = $this->cellToPackedRowcol($cell1); - list($row2, $col2) = $this->cellToPackedRowcol($cell2); + [$row1, $col1] = $this->cellToPackedRowcol($cell1); + [$row2, $col2] = $this->cellToPackedRowcol($cell2); // The ptg value depends on the class of the ptg. if ($class == 0) { @@ -644,20 +644,20 @@ class Parser private function convertRange3d($token) { // Split the ref at the ! symbol - list($ext_ref, $range) = PhpspreadsheetWorksheet::extractSheetTitle($token, true); + [$ext_ref, $range] = PhpspreadsheetWorksheet::extractSheetTitle($token, true); // Convert the external reference part (different for BIFF8) $ext_ref = $this->getRefIndex($ext_ref); // Split the range into 2 cell refs - list($cell1, $cell2) = explode(':', $range); + [$cell1, $cell2] = explode(':', $range); // Convert the cell references if (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\\d+)$/', $cell1)) { - list($row1, $col1) = $this->cellToPackedRowcol($cell1); - list($row2, $col2) = $this->cellToPackedRowcol($cell2); + [$row1, $col1] = $this->cellToPackedRowcol($cell1); + [$row2, $col2] = $this->cellToPackedRowcol($cell2); } else { // It's a rows range (like 26:27) - list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2); + [$row1, $col1, $row2, $col2] = $this->rangeToPackedRange($cell1 . ':' . $cell2); } // The ptg value depends on the class of the ptg. @@ -677,7 +677,7 @@ class Parser { // Convert the cell reference $cell_array = $this->cellToPackedRowcol($cell); - list($row, $col) = $cell_array; + [$row, $col] = $cell_array; // The ptg value depends on the class of the ptg. $ptgRef = pack('C', $this->ptg['ptgRefA']); @@ -696,13 +696,13 @@ class Parser private function convertRef3d($cell) { // Split the ref at the ! symbol - list($ext_ref, $cell) = PhpspreadsheetWorksheet::extractSheetTitle($cell, true); + [$ext_ref, $cell] = PhpspreadsheetWorksheet::extractSheetTitle($cell, true); // Convert the external reference part (different for BIFF8) $ext_ref = $this->getRefIndex($ext_ref); // Convert the cell reference part - list($row, $col) = $this->cellToPackedRowcol($cell); + [$row, $col] = $this->cellToPackedRowcol($cell); // The ptg value depends on the class of the ptg. $ptgRef = pack('C', $this->ptg['ptgRef3dA']); @@ -756,7 +756,7 @@ class Parser // Check if there is a sheet range eg., Sheet1:Sheet2. if (preg_match('/:/', $ext_ref)) { - list($sheet_name1, $sheet_name2) = explode(':', $ext_ref); + [$sheet_name1, $sheet_name2] = explode(':', $ext_ref); $sheet1 = $this->getSheetIndex($sheet_name1); if ($sheet1 == -1) { @@ -769,7 +769,7 @@ class Parser // Reverse max and min sheet numbers if necessary if ($sheet1 > $sheet2) { - list($sheet1, $sheet2) = [$sheet2, $sheet1]; + [$sheet1, $sheet2] = [$sheet2, $sheet1]; } } else { // Single sheet name only. $sheet1 = $this->getSheetIndex($ext_ref); @@ -843,7 +843,7 @@ class Parser private function cellToPackedRowcol($cell) { $cell = strtoupper($cell); - list($row, $col, $row_rel, $col_rel) = $this->cellToRowcol($cell); + [$row, $col, $row_rel, $col_rel] = $this->cellToRowcol($cell); if ($col >= 256) { throw new WriterException("Column in: $cell greater than 255"); } @@ -1078,7 +1078,7 @@ class Parser { $this->currentCharacter = 0; $this->formula = $formula; - $this->lookAhead = isset($formula[1]) ? $formula[1] : ''; + $this->lookAhead = $formula[1] ?? ''; $this->advance(); $this->parseTree = $this->condition(); diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php index db63fa34..d8822d80 100644 --- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php +++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php @@ -479,7 +479,7 @@ class Worksheet extends BIFFwriter // Hyperlinks foreach ($phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) { - list($column, $row) = Coordinate::coordinateFromString($coordinate); + [$column, $row] = Coordinate::coordinateFromString($coordinate); $url = $hyperlink->getUrl(); @@ -1355,17 +1355,17 @@ class Worksheet extends BIFFwriter $selectedCells = Coordinate::splitRange($this->phpSheet->getSelectedCells()); $selectedCells = $selectedCells[0]; if (count($selectedCells) == 2) { - list($first, $last) = $selectedCells; + [$first, $last] = $selectedCells; } else { $first = $selectedCells[0]; $last = $selectedCells[0]; } - list($colFirst, $rwFirst) = Coordinate::coordinateFromString($first); + [$colFirst, $rwFirst] = Coordinate::coordinateFromString($first); $colFirst = Coordinate::columnIndexFromString($colFirst) - 1; // base 0 column index --$rwFirst; // base 0 row index - list($colLast, $rwLast) = Coordinate::coordinateFromString($last); + [$colLast, $rwLast] = Coordinate::coordinateFromString($last); $colLast = Coordinate::columnIndexFromString($colLast) - 1; // base 0 column index --$rwLast; // base 0 row index @@ -1394,11 +1394,11 @@ class Worksheet extends BIFFwriter // Swap last row/col for first row/col as necessary if ($rwFirst > $rwLast) { - list($rwFirst, $rwLast) = [$rwLast, $rwFirst]; + [$rwFirst, $rwLast] = [$rwLast, $rwFirst]; } if ($colFirst > $colLast) { - list($colFirst, $colLast) = [$colLast, $colFirst]; + [$colFirst, $colLast] = [$colLast, $colFirst]; } $header = pack('vv', $record, $length); @@ -1440,9 +1440,9 @@ class Worksheet extends BIFFwriter // extract the row and column indexes $range = Coordinate::splitRange($mergeCell); - list($first, $last) = $range[0]; - list($firstColumn, $firstRow) = Coordinate::coordinateFromString($first); - list($lastColumn, $lastRow) = Coordinate::coordinateFromString($last); + [$first, $last] = $range[0]; + [$firstColumn, $firstRow] = Coordinate::coordinateFromString($first); + [$lastColumn, $lastRow] = Coordinate::coordinateFromString($last); $recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, Coordinate::columnIndexFromString($firstColumn) - 1, Coordinate::columnIndexFromString($lastColumn) - 1); @@ -1589,11 +1589,11 @@ class Worksheet extends BIFFwriter { $panes = []; if ($this->phpSheet->getFreezePane()) { - list($column, $row) = Coordinate::coordinateFromString($this->phpSheet->getFreezePane()); + [$column, $row] = Coordinate::coordinateFromString($this->phpSheet->getFreezePane()); $panes[0] = Coordinate::columnIndexFromString($column) - 1; $panes[1] = $row - 1; - list($leftMostColumn, $topRow) = Coordinate::coordinateFromString($this->phpSheet->getTopLeftCell()); + [$leftMostColumn, $topRow] = Coordinate::coordinateFromString($this->phpSheet->getTopLeftCell()); //Coordinates are zero-based in xls files $panes[2] = $topRow - 1; $panes[3] = Coordinate::columnIndexFromString($leftMostColumn) - 1; @@ -1602,10 +1602,10 @@ class Worksheet extends BIFFwriter return; } - $x = isset($panes[0]) ? $panes[0] : null; - $y = isset($panes[1]) ? $panes[1] : null; - $rwTop = isset($panes[2]) ? $panes[2] : null; - $colLeft = isset($panes[3]) ? $panes[3] : null; + $x = $panes[0] ?? null; + $y = $panes[1] ?? null; + $rwTop = $panes[2] ?? null; + $colLeft = $panes[3] ?? null; if (count($panes) > 4) { // if Active pane was received $pnnAct = $panes[4]; } else { @@ -2215,7 +2215,7 @@ class Worksheet extends BIFFwriter public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) { $bitmap_array = (is_resource($bitmap) ? $this->processBitmapGd($bitmap) : $this->processBitmap($bitmap)); - list($width, $height, $size, $data) = $bitmap_array; + [$width, $height, $size, $data] = $bitmap_array; // Scale the frame of the image. $width *= $scale_x; diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php index 625fd16d..3241d403 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php @@ -1136,7 +1136,7 @@ class Chart extends WriterPart $fillColorValues = $plotSeriesValues->getFillColor(); if ($fillColorValues !== null && is_array($fillColorValues)) { foreach ($plotSeriesValues->getDataValues() as $dataKey => $dataValue) { - $this->writePlotSeriesValuesElement($objWriter, $dataKey, (isset($fillColorValues[$dataKey]) ? $fillColorValues[$dataKey] : 'FF9900')); + $this->writePlotSeriesValuesElement($objWriter, $dataKey, ($fillColorValues[$dataKey] ?? 'FF9900')); } } else { $this->writePlotSeriesValuesElement($objWriter); diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Comments.php b/src/PhpSpreadsheet/Writer/Xlsx/Comments.php index 8b08f31f..a95298af 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/Comments.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/Comments.php @@ -175,7 +175,7 @@ class Comments extends WriterPart private function writeVMLComment(XMLWriter $objWriter, $pCellReference, Comment $pComment) { // Metadata - list($column, $row) = Coordinate::coordinateFromString($pCellReference); + [$column, $row] = Coordinate::coordinateFromString($pCellReference); $column = Coordinate::columnIndexFromString($column); $id = 1024 + $column + $row; $id = substr($id, 0, 4); diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php index b9f8f99b..fd936748 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php @@ -339,7 +339,7 @@ class Workbook extends WriterPart $range = Coordinate::splitRange($autoFilterRange); $range = $range[0]; // Strip any worksheet ref so we can make the cell ref absolute - list($ws, $range[0]) = Worksheet::extractSheetTitle($range[0], true); + [$ws, $range[0]] = Worksheet::extractSheetTitle($range[0], true); $range[0] = Coordinate::absoluteCoordinate($range[0]); $range[1] = Coordinate::absoluteCoordinate($range[1]); diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php index 065eaaf1..07bf39bf 100644 --- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php +++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php @@ -251,7 +251,7 @@ class Worksheet extends WriterPart // Pane $pane = ''; if ($pSheet->getFreezePane()) { - list($xSplit, $ySplit) = Coordinate::coordinateFromString($pSheet->getFreezePane()); + [$xSplit, $ySplit] = Coordinate::coordinateFromString($pSheet->getFreezePane()); $xSplit = Coordinate::columnIndexFromString($xSplit); --$xSplit; --$ySplit; @@ -752,7 +752,7 @@ class Worksheet extends WriterPart $range = Coordinate::splitRange($autoFilterRange); $range = $range[0]; // Strip any worksheet ref - list($ws, $range[0]) = PhpspreadsheetWorksheet::extractSheetTitle($range[0], true); + [$ws, $range[0]] = PhpspreadsheetWorksheet::extractSheetTitle($range[0], true); $range = implode(':', $range); $objWriter->writeAttribute('ref', str_replace('$', '', $range)); From b2070fd18178af574bb6e0904b732d24875f4824 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Wed, 24 Jul 2019 23:45:43 -0700 Subject: [PATCH 7/8] Upgrade to phpunit 7.5 --- composer.json | 5 +- composer.lock | 708 ++++++++++-------- phpunit.xml.dist | 11 +- .../Calculation/EngineeringTest.php | 58 +- .../Calculation/FunctionsTest.php | 28 +- .../Calculation/LookupRefTest.php | 2 +- .../Calculation/TextDataTest.php | 4 +- .../PhpSpreadsheetTests/Helper/SampleTest.php | 2 + tests/PhpSpreadsheetTests/Shared/DateTest.php | 8 +- tests/data/Calculation/TextData/TEXT.php | 6 +- tests/data/Style/NumberFormat.php | 6 +- 11 files changed, 467 insertions(+), 371 deletions(-) diff --git a/composer.json b/composer.json index 575fa08f..3043f8fb 100644 --- a/composer.json +++ b/composer.json @@ -59,14 +59,13 @@ }, "require-dev": { "tecnickcom/tcpdf": "^6.2", - "phpunit/phpunit": "^5.7", - "doctrine/instantiator": "^1.0.0", "dompdf/dompdf": "^0.8.0", "mpdf/mpdf": "^7.0.0", "jpgraph/jpgraph": "^4.0", "friendsofphp/php-cs-fixer": "@stable", "phpcompatibility/php-compatibility": "^8.0", - "squizlabs/php_codesniffer": "^3.3" + "squizlabs/php_codesniffer": "^3.3", + "phpunit/phpunit": "^7.5" }, "suggest": { "mpdf/mpdf": "Option for rendering PDF with PDF Writer", diff --git a/composer.lock b/composer.lock index 6a4b2093..6b1ba8ab 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "844c52e10f1e289de51d2b71cb7fc1ff", + "content-hash": "669a432d9ce5fef80535c0aae2e48b9b", "packages": [ { "name": "markbaker/complex", @@ -397,32 +397,34 @@ }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "a2c590166b2133a4633738648b6b064edae0814a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", + "reference": "a2c590166b2133a4633738648b6b064edae0814a", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { - "athletic/athletic": "~0.1.8", + "doctrine/coding-standard": "^6.0", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpbench/phpbench": "^0.13", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-shim": "^0.11", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -442,12 +444,12 @@ } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2019-03-17T17:37:11+00:00" }, { "name": "doctrine/lexer", @@ -766,25 +768,28 @@ }, { "name": "myclabs/deep-copy", - "version": "1.7.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { @@ -807,7 +812,7 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2019-04-07T13:18:21+00:00" }, { "name": "paragonie/random_compat", @@ -858,6 +863,108 @@ ], "time": "2018-07-04T16:31:37+00:00" }, + { + "name": "phar-io/manifest", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^2.0", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2018-07-08T19:23:20+00:00" + }, + { + "name": "phar-io/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2018-07-08T19:19:57+00:00" + }, { "name": "phenx/php-font-lib", "version": "0.5.1", @@ -1095,29 +1202,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.3.2", + "version": "4.3.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.0", "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -1136,7 +1249,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-10T14:09:06+00:00" + "time": "2019-04-30T17:48:53+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1187,16 +1300,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", "shasum": "" }, "require": { @@ -1217,8 +1330,8 @@ } }, "autoload": { - "psr-0": { - "Prophecy\\": "src/" + "psr-4": { + "Prophecy\\": "src/Prophecy" } }, "notification-url": "https://packagist.org/downloads/", @@ -1246,44 +1359,44 @@ "spy", "stub" ], - "time": "2018-08-05T17:53:17+00:00" + "time": "2019-06-13T12:50:23+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "4.0.8", + "version": "6.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "^1.3", - "phpunit/php-text-template": "^1.2", - "phpunit/php-token-stream": "^1.4.2 || ^2.0", - "sebastian/code-unit-reverse-lookup": "^1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "^1.0 || ^2.0" + "php": "^7.1", + "phpunit/php-file-iterator": "^2.0", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^3.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.1 || ^4.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.1.4", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^7.0" }, "suggest": { - "ext-xdebug": "^2.5.1" + "ext-xdebug": "^2.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -1298,8 +1411,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -1309,29 +1422,32 @@ "testing", "xunit" ], - "time": "2017-04-02T07:44:40+00:00" + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.5", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + "reference": "050bedf145a257b1ff02746c31894800e5122946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", + "reference": "050bedf145a257b1ff02746c31894800e5122946", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1346,7 +1462,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1356,7 +1472,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2018-09-13T20:33:42+00:00" }, { "name": "phpunit/php-text-template", @@ -1401,28 +1517,28 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.9", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -1437,7 +1553,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1446,33 +1562,33 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2019-06-07T04:22:29+00:00" }, { "name": "phpunit/php-token-stream", - "version": "1.4.12", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a", + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1495,55 +1611,57 @@ "keywords": [ "tokenizer" ], - "time": "2017-12-04T08:55:13+00:00" + "time": "2019-07-25T05:29:42+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.27", + "version": "7.5.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c" + "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", - "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2834789aeb9ac182ad69bfdf9ae91856a59945ff", + "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.4", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "^1.2.4", - "sebastian/diff": "^1.4.3", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.1", - "sebastian/object-enumerator": "~2.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "^1.0.6|^2.0.1", - "symfony/yaml": "~2.1|~3.0|~4.0" + "myclabs/deep-copy": "^1.7", + "phar-io/manifest": "^1.0.2", + "phar-io/version": "^2.0", + "php": "^7.1", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^6.0.7", + "phpunit/php-file-iterator": "^2.0.1", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^2.1", + "sebastian/comparator": "^3.0", + "sebastian/diff": "^3.0", + "sebastian/environment": "^4.0", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^2.0", + "sebastian/version": "^2.0.1" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpunit/phpunit-mock-objects": "*" }, "require-dev": { "ext-pdo": "*" }, "suggest": { + "ext-soap": "*", "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" + "phpunit/php-invoker": "^2.0" }, "bin": [ "phpunit" @@ -1551,7 +1669,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -1566,8 +1684,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "The PHP Unit Testing framework.", @@ -1577,66 +1695,7 @@ "testing", "xunit" ], - "time": "2018-02-01T05:50:59+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "3.4.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" - }, - "conflict": { - "phpunit/phpunit": "<5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.4" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2017-06-30T09:13:00+00:00" + "time": "2019-07-15T06:24:08+00:00" }, { "name": "psr/log", @@ -1776,30 +1835,30 @@ }, { "name": "sebastian/comparator", - "version": "1.2.4", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" + "php": "^7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1830,38 +1889,39 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-01-29T09:50:25+00:00" + "time": "2018-07-12T15:12:46+00:00" }, { "name": "sebastian/diff", - "version": "1.4.3", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.5 || ^8.0", + "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1886,34 +1946,40 @@ "description": "Diff implementation", "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ - "diff" + "diff", + "udiff", + "unidiff", + "unified diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2019-02-04T06:01:07+00:00" }, { "name": "sebastian/environment", - "version": "2.0.0", + "version": "4.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404", + "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^5.0" + "phpunit/phpunit": "^7.5" + }, + "suggest": { + "ext-posix": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -1938,34 +2004,34 @@ "environment", "hhvm" ], - "time": "2016-11-26T07:53:53+00:00" + "time": "2019-05-05T09:05:15+00:00" }, { "name": "sebastian/exporter", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/recursion-context": "^3.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -2005,27 +2071,27 @@ "export", "exporter" ], - "time": "2016-11-19T08:54:04+00:00" + "time": "2017-04-03T13:19:02+00:00" }, { "name": "sebastian/global-state", - "version": "1.1.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -2033,7 +2099,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2056,33 +2122,34 @@ "keywords": [ "global state" ], - "time": "2015-10-12T03:26:01+00:00" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", - "version": "2.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2102,32 +2169,77 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18T15:18:39+00:00" + "time": "2017-08-03T12:35:26+00:00" }, { - "name": "sebastian/recursion-context", - "version": "2.0.0", + "name": "sebastian/object-reflector", + "version": "1.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2155,29 +2267,29 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19T07:33:16+00:00" + "time": "2017-03-03T06:23:57+00:00" }, { "name": "sebastian/resource-operations", - "version": "1.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", "shasum": "" }, "require": { - "php": ">=5.6.0" + "php": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2197,7 +2309,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2018-10-04T04:07:39+00:00" }, { "name": "sebastian/version", @@ -2685,16 +2797,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "82ebae02209c21113908c229e9883c419720738a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", + "reference": "82ebae02209c21113908c229e9883c419720738a", "shasum": "" }, "require": { @@ -2706,7 +2818,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.11-dev" } }, "autoload": { @@ -2739,7 +2851,7 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -3012,65 +3124,6 @@ "homepage": "https://symfony.com", "time": "2018-10-02T12:28:39+00:00" }, - { - "name": "symfony/yaml", - "version": "v3.4.18", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/640b6c27fed4066d64b64d5903a86043f4a4de7f", - "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-ctype": "~1.8" - }, - "conflict": { - "symfony/console": "<3.4" - }, - "require-dev": { - "symfony/console": "~3.4|~4.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2018-10-02T16:33:53+00:00" - }, { "name": "tecnickcom/tcpdf", "version": "6.2.26", @@ -3134,21 +3187,62 @@ "time": "2018-10-16T17:24:05+00:00" }, { - "name": "webmozart/assert", - "version": "1.3.0", + "name": "theseer/tokenizer", + "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + "url": "https://github.com/theseer/tokenizer.git", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2019-06-13T22:48:21+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -3181,7 +3275,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-12-25T11:19:39+00:00" } ], "aliases": [], diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6880d23e..be3643d8 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,9 +1,10 @@ - + diff --git a/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php b/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php index 09da20c9..1ea22443 100644 --- a/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php @@ -37,7 +37,7 @@ class EngineeringTest extends TestCase public function testBESSELI($expectedResult, ...$args) { $result = Engineering::BESSELI(...$args); - self::assertEquals($expectedResult, $result, null, self::BESSEL_PRECISION); + self::assertEquals($expectedResult, $result, '', self::BESSEL_PRECISION); } public function providerBESSELI() @@ -53,7 +53,7 @@ class EngineeringTest extends TestCase public function testBESSELJ($expectedResult, ...$args) { $result = Engineering::BESSELJ(...$args); - self::assertEquals($expectedResult, $result, null, self::BESSEL_PRECISION); + self::assertEquals($expectedResult, $result, '', self::BESSEL_PRECISION); } public function providerBESSELJ() @@ -69,7 +69,7 @@ class EngineeringTest extends TestCase public function testBESSELK($expectedResult, ...$args) { $result = Engineering::BESSELK(...$args); - self::assertEquals($expectedResult, $result, null, self::BESSEL_PRECISION); + self::assertEquals($expectedResult, $result, '', self::BESSEL_PRECISION); } public function providerBESSELK() @@ -85,7 +85,7 @@ class EngineeringTest extends TestCase public function testBESSELY($expectedResult, ...$args) { $result = Engineering::BESSELY(...$args); - self::assertEquals($expectedResult, $result, null, self::BESSEL_PRECISION); + self::assertEquals($expectedResult, $result, '', self::BESSEL_PRECISION); } public function providerBESSELY() @@ -100,7 +100,7 @@ class EngineeringTest extends TestCase */ public function testParseComplex() { - list($real, $imaginary, $suffix) = [1.23e-4, 5.67e+8, 'j']; + [$real, $imaginary, $suffix] = [1.23e-4, 5.67e+8, 'j']; $result = Engineering::parseComplex('1.23e-4+5.67e+8j'); $this->assertArrayHasKey('real', $result); @@ -136,7 +136,7 @@ class EngineeringTest extends TestCase public function testIMAGINARY($expectedResult, $value) { $result = Engineering::IMAGINARY($value); - self::assertEquals($expectedResult, $result, null, self::COMPLEX_PRECISION); + self::assertEquals($expectedResult, $result, '', self::COMPLEX_PRECISION); } public function providerIMAGINARY() @@ -153,7 +153,7 @@ class EngineeringTest extends TestCase public function testIMREAL($expectedResult, $value) { $result = Engineering::IMREAL($value); - self::assertEquals($expectedResult, $result, null, self::COMPLEX_PRECISION); + self::assertEquals($expectedResult, $result, '', self::COMPLEX_PRECISION); } public function providerIMREAL() @@ -170,7 +170,7 @@ class EngineeringTest extends TestCase public function testIMABS($expectedResult, $value) { $result = Engineering::IMABS($value); - self::assertEquals($expectedResult, $result, null, self::COMPLEX_PRECISION); + self::assertEquals($expectedResult, $result, '', self::COMPLEX_PRECISION); } public function providerIMABS() @@ -187,7 +187,7 @@ class EngineeringTest extends TestCase public function testIMARGUMENT($expectedResult, $value) { $result = Engineering::IMARGUMENT($value); - self::assertEquals($expectedResult, $result, null, self::COMPLEX_PRECISION); + self::assertEquals($expectedResult, $result, '', self::COMPLEX_PRECISION); } public function providerIMARGUMENT() @@ -618,7 +618,7 @@ class EngineeringTest extends TestCase public function testERF($expectedResult, ...$args) { $result = Engineering::ERF(...$args); - self::assertEquals($expectedResult, $result, null, self::ERF_PRECISION); + self::assertEquals($expectedResult, $result, '', self::ERF_PRECISION); } public function providerERF() @@ -634,7 +634,7 @@ class EngineeringTest extends TestCase public function testERFPRECISE($expectedResult, ...$args) { $result = Engineering::ERFPRECISE(...$args); - self::assertEquals($expectedResult, $result, null, self::ERF_PRECISION); + self::assertEquals($expectedResult, $result, '', self::ERF_PRECISION); } public function providerERFPRECISE() @@ -650,7 +650,7 @@ class EngineeringTest extends TestCase public function testERFC($expectedResult, ...$args) { $result = Engineering::ERFC(...$args); - self::assertEquals($expectedResult, $result, null, self::ERF_PRECISION); + self::assertEquals($expectedResult, $result, '', self::ERF_PRECISION); } public function providerERFC() @@ -714,7 +714,7 @@ class EngineeringTest extends TestCase public function testDEC2BIN($expectedResult, ...$args) { $result = Engineering::DECTOBIN(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerDEC2BIN() @@ -730,7 +730,7 @@ class EngineeringTest extends TestCase public function testDEC2HEX($expectedResult, ...$args) { $result = Engineering::DECTOHEX(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerDEC2HEX() @@ -746,7 +746,7 @@ class EngineeringTest extends TestCase public function testDEC2OCT($expectedResult, ...$args) { $result = Engineering::DECTOOCT(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerDEC2OCT() @@ -762,7 +762,7 @@ class EngineeringTest extends TestCase public function testHEX2BIN($expectedResult, ...$args) { $result = Engineering::HEXTOBIN(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerHEX2BIN() @@ -778,7 +778,7 @@ class EngineeringTest extends TestCase public function testHEX2DEC($expectedResult, ...$args) { $result = Engineering::HEXTODEC(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerHEX2DEC() @@ -794,7 +794,7 @@ class EngineeringTest extends TestCase public function testHEX2OCT($expectedResult, ...$args) { $result = Engineering::HEXTOOCT(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerHEX2OCT() @@ -810,7 +810,7 @@ class EngineeringTest extends TestCase public function testOCT2BIN($expectedResult, ...$args) { $result = Engineering::OCTTOBIN(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerOCT2BIN() @@ -826,7 +826,7 @@ class EngineeringTest extends TestCase public function testOCT2DEC($expectedResult, ...$args) { $result = Engineering::OCTTODEC(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerOCT2DEC() @@ -842,7 +842,7 @@ class EngineeringTest extends TestCase public function testOCT2HEX($expectedResult, ...$args) { $result = Engineering::OCTTOHEX(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerOCT2HEX() @@ -859,7 +859,7 @@ class EngineeringTest extends TestCase public function testBITAND($expectedResult, array $args) { $result = Engineering::BITAND(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerBITAND() @@ -876,7 +876,7 @@ class EngineeringTest extends TestCase public function testBITOR($expectedResult, array $args) { $result = Engineering::BITOR(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerBITOR() @@ -893,7 +893,7 @@ class EngineeringTest extends TestCase public function testBITXOR($expectedResult, array $args) { $result = Engineering::BITXOR(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerBITXOR() @@ -910,7 +910,7 @@ class EngineeringTest extends TestCase public function testBITLSHIFT($expectedResult, array $args) { $result = Engineering::BITLSHIFT(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerBITLSHIFT() @@ -927,7 +927,7 @@ class EngineeringTest extends TestCase public function testBITRSHIFT($expectedResult, array $args) { $result = Engineering::BITRSHIFT(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerBITRSHIFT() @@ -943,7 +943,7 @@ class EngineeringTest extends TestCase public function testDELTA($expectedResult, ...$args) { $result = Engineering::DELTA(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerDELTA() @@ -959,7 +959,7 @@ class EngineeringTest extends TestCase public function testGESTEP($expectedResult, ...$args) { $result = Engineering::GESTEP(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerGESTEP() @@ -999,7 +999,7 @@ class EngineeringTest extends TestCase public function testCONVERTUOM($expectedResult, ...$args) { $result = Engineering::CONVERTUOM(...$args); - self::assertEquals($expectedResult, $result, null); + self::assertEquals($expectedResult, $result, ''); } public function providerCONVERTUOM() diff --git a/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php b/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php index df2028c0..2e8e7e9d 100644 --- a/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php @@ -114,7 +114,7 @@ class FunctionsTest extends TestCase public function testIsBlank($expectedResult, ...$args) { $result = Functions::isBlank(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsBlank() @@ -130,7 +130,7 @@ class FunctionsTest extends TestCase public function testIsErr($expectedResult, ...$args) { $result = Functions::isErr(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsErr() @@ -146,7 +146,7 @@ class FunctionsTest extends TestCase public function testIsError($expectedResult, ...$args) { $result = Functions::isError(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsError() @@ -162,7 +162,7 @@ class FunctionsTest extends TestCase public function testErrorType($expectedResult, ...$args) { $result = Functions::errorType(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerErrorType() @@ -178,7 +178,7 @@ class FunctionsTest extends TestCase public function testIsLogical($expectedResult, ...$args) { $result = Functions::isLogical(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsLogical() @@ -194,7 +194,7 @@ class FunctionsTest extends TestCase public function testIsNa($expectedResult, ...$args) { $result = Functions::isNa(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsNa() @@ -210,7 +210,7 @@ class FunctionsTest extends TestCase public function testIsNumber($expectedResult, ...$args) { $result = Functions::isNumber(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsNumber() @@ -226,7 +226,7 @@ class FunctionsTest extends TestCase public function testIsText($expectedResult, ...$args) { $result = Functions::isText(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsText() @@ -242,7 +242,7 @@ class FunctionsTest extends TestCase public function testIsNonText($expectedResult, ...$args) { $result = Functions::isNonText(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsNonText() @@ -258,7 +258,7 @@ class FunctionsTest extends TestCase public function testIsEven($expectedResult, ...$args) { $result = Functions::isEven(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsEven() @@ -274,7 +274,7 @@ class FunctionsTest extends TestCase public function testIsOdd($expectedResult, ...$args) { $result = Functions::isOdd(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsOdd() @@ -290,7 +290,7 @@ class FunctionsTest extends TestCase public function testTYPE($expectedResult, ...$args) { $result = Functions::TYPE(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerTYPE() @@ -306,7 +306,7 @@ class FunctionsTest extends TestCase public function testN($expectedResult, ...$args) { $result = Functions::n(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerN() @@ -359,7 +359,7 @@ class FunctionsTest extends TestCase } $result = Functions::isFormula($reference, $ourCell); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerIsFormula() diff --git a/tests/PhpSpreadsheetTests/Calculation/LookupRefTest.php b/tests/PhpSpreadsheetTests/Calculation/LookupRefTest.php index acf709be..f7f035e7 100644 --- a/tests/PhpSpreadsheetTests/Calculation/LookupRefTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/LookupRefTest.php @@ -178,7 +178,7 @@ class LookupRefTest extends TestCase } $result = LookupRef::FORMULATEXT($reference, $ourCell); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerFormulaText() diff --git a/tests/PhpSpreadsheetTests/Calculation/TextDataTest.php b/tests/PhpSpreadsheetTests/Calculation/TextDataTest.php index b625727d..32d7605f 100644 --- a/tests/PhpSpreadsheetTests/Calculation/TextDataTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/TextDataTest.php @@ -362,7 +362,7 @@ class TextDataTest extends TestCase StringHelper::setCurrencyCode('$'); $result = TextData::VALUE(...$args); - self::assertEquals($expectedResult, $result, null, 1E-8); + self::assertEquals($expectedResult, $result, '', 1E-8); } public function providerVALUE() @@ -383,7 +383,7 @@ class TextDataTest extends TestCase StringHelper::setCurrencyCode('$'); $result = TextData::EXACT(...$args); - self::assertSame($expectedResult, $result, null); + self::assertSame($expectedResult, $result); } /** diff --git a/tests/PhpSpreadsheetTests/Helper/SampleTest.php b/tests/PhpSpreadsheetTests/Helper/SampleTest.php index a56d7813..121ec148 100644 --- a/tests/PhpSpreadsheetTests/Helper/SampleTest.php +++ b/tests/PhpSpreadsheetTests/Helper/SampleTest.php @@ -21,6 +21,8 @@ class SampleTest extends TestCase }); require $sample; + + self::assertTrue(true); } public function providerSample() diff --git a/tests/PhpSpreadsheetTests/Shared/DateTest.php b/tests/PhpSpreadsheetTests/Shared/DateTest.php index 4a5479ef..5de34702 100644 --- a/tests/PhpSpreadsheetTests/Shared/DateTest.php +++ b/tests/PhpSpreadsheetTests/Shared/DateTest.php @@ -55,7 +55,7 @@ class DateTest extends TestCase Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900); $result = Date::timestampToExcel(...$args); - self::assertEquals($expectedResult, $result, null, 1E-5); + self::assertEquals($expectedResult, $result, '', 1E-5); } public function providerDateTimeTimestampToExcel1900() @@ -73,7 +73,7 @@ class DateTest extends TestCase Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900); $result = Date::dateTimeToExcel(...$args); - self::assertEquals($expectedResult, $result, null, 1E-5); + self::assertEquals($expectedResult, $result, '', 1E-5); } public function providerDateTimeDateTimeToExcel() @@ -91,7 +91,7 @@ class DateTest extends TestCase Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900); $result = Date::formattedPHPToExcel(...$args); - self::assertEquals($expectedResult, $result, null, 1E-5); + self::assertEquals($expectedResult, $result, '', 1E-5); } public function providerDateTimeFormattedPHPToExcel1900() @@ -127,7 +127,7 @@ class DateTest extends TestCase Date::setExcelCalendar(Date::CALENDAR_MAC_1904); $result = Date::timestampToExcel(...$args); - self::assertEquals($expectedResult, $result, null, 1E-5); + self::assertEquals($expectedResult, $result, '', 1E-5); } public function providerDateTimeTimestampToExcel1904() diff --git a/tests/data/Calculation/TextData/TEXT.php b/tests/data/Calculation/TextData/TEXT.php index e92f4a2e..fcb05191 100644 --- a/tests/data/Calculation/TextData/TEXT.php +++ b/tests/data/Calculation/TextData/TEXT.php @@ -37,17 +37,17 @@ return [ '#,##0.00', ], [ - '1.23E05', + '1.23E+5', 123456.789, '0.00E+00', ], [ - '-1.23E05', + '-1.23E+5', -123456.789, '0.00E+00', ], [ - '1.23E-05', + '1.23E-5', 1.2345E-5, '0.00E+00', ], diff --git a/tests/data/Style/NumberFormat.php b/tests/data/Style/NumberFormat.php index 4c3b2f14..b7c39b3a 100644 --- a/tests/data/Style/NumberFormat.php +++ b/tests/data/Style/NumberFormat.php @@ -29,7 +29,7 @@ return [ '##0', ], [ - '12.0', + '12.00', 12, '#.0#', ], @@ -263,12 +263,12 @@ return [ [ '-70', -70, - '#,##0;[Red]-#,##0' + '#,##0;[Red]-#,##0', ], [ '-12,345', -12345, - '#,##0;[Red]-#,##0' + '#,##0;[Red]-#,##0', ], // Multiple colors [ From fa54ca79a3351512ce721c928d7ac3b6849ac3a5 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Thu, 25 Jul 2019 10:15:53 -0700 Subject: [PATCH 8/8] Migrate away from deprecated PHPUnit asserts --- .../Calculation/CalculationTest.php | 2 +- .../Calculation/EngineeringTest.php | 8 +++---- .../Functions/DateTime/DateTest.php | 2 +- .../Functions/DateTime/DateValueTest.php | 5 ++-- .../Functions/DateTime/EDateTest.php | 2 +- .../Functions/DateTime/EoMonthTest.php | 2 +- .../Functions/DateTime/TimeTest.php | 2 +- .../Functions/DateTime/TimeValueTest.php | 2 +- .../PhpSpreadsheetTests/Cell/DataTypeTest.php | 2 +- tests/PhpSpreadsheetTests/Reader/OdsTest.php | 24 +++++++++---------- .../Reader/Security/XmlScannerTest.php | 2 +- tests/PhpSpreadsheetTests/Reader/XlsxTest.php | 2 +- .../Worksheet/AutoFilter/ColumnTest.php | 2 +- .../Worksheet/AutoFilterTest.php | 12 +++++----- 14 files changed, 35 insertions(+), 34 deletions(-) diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php index 86ca7a3e..4b81fbf4 100644 --- a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php @@ -52,7 +52,7 @@ class CalculationTest extends TestCase */ public function testGetFunctions($category, $functionCall, $argumentCount) { - self::assertInternalType('callable', $functionCall); + self::assertIsCallable($functionCall); } public function providerGetFunctions() diff --git a/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php b/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php index 1ea22443..003ef206 100644 --- a/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php @@ -970,25 +970,25 @@ class EngineeringTest extends TestCase public function testGetConversionGroups() { $result = Engineering::getConversionGroups(); - self::assertInternalType('array', $result); + self::assertIsArray($result); } public function testGetConversionGroupUnits() { $result = Engineering::getConversionGroupUnits(); - self::assertInternalType('array', $result); + self::assertIsArray($result); } public function testGetConversionGroupUnitDetails() { $result = Engineering::getConversionGroupUnitDetails(); - self::assertInternalType('array', $result); + self::assertIsArray($result); } public function testGetConversionMultipliers() { $result = Engineering::getConversionMultipliers(); - self::assertInternalType('array', $result); + self::assertIsArray($result); } /** diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php index 08587336..6628322a 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php @@ -49,7 +49,7 @@ class DateTest extends TestCase $result = DateTime::DATE(2012, 1, 31); // Must return an object... - $this->assertInternalType('object', $result); + self::assertIsObject($result); // ... of the correct type $this->assertTrue(is_a($result, 'DateTimeInterface')); // ... with the correct value diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php index 937fc10a..2c4e96eb 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\DateTime; +use DateTimeInterface; use PhpOffice\PhpSpreadsheet\Calculation\DateTime; use PhpOffice\PhpSpreadsheet\Calculation\Functions; use PhpOffice\PhpSpreadsheet\Shared\Date; @@ -47,9 +48,9 @@ class DateValueTest extends TestCase $result = DateTime::DATEVALUE('2012-1-31'); // Must return an object... - $this->assertInternalType('object', $result); + self::assertIsObject($result); // ... of the correct type - $this->assertTrue(is_a($result, 'DateTimeInterface')); + $this->assertTrue(is_a($result, DateTimeInterface::class)); // ... with the correct value $this->assertEquals($result->format('d-M-Y'), '31-Jan-2012'); } diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php index 74c4a388..7f885096 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php @@ -48,7 +48,7 @@ class EDateTest extends TestCase $result = DateTime::EDATE('2012-1-26', -1); // Must return an object... - $this->assertInternalType('object', $result); + self::assertIsObject($result); // ... of the correct type $this->assertTrue(is_a($result, 'DateTimeInterface')); // ... with the correct value diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php index edb9d7ed..6092151a 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php @@ -48,7 +48,7 @@ class EoMonthTest extends TestCase $result = DateTime::EOMONTH('2012-1-26', -1); // Must return an object... - $this->assertInternalType('object', $result); + self::assertIsObject($result); // ... of the correct type $this->assertTrue(is_a($result, 'DateTimeInterface')); // ... with the correct value diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php index 5a0f3b00..61406f5a 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php @@ -46,7 +46,7 @@ class TimeTest extends TestCase $result = DateTime::TIME(7, 30, 20); // Must return an object... - $this->assertInternalType('object', $result); + self::assertIsObject($result); // ... of the correct type $this->assertTrue(is_a($result, 'DateTimeInterface')); // ... with the correct value diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php index 6a45f6a3..4fc09a2d 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php @@ -46,7 +46,7 @@ class TimeValueTest extends TestCase $result = DateTime::TIMEVALUE('7:30:20'); // Must return an object... - $this->assertInternalType('object', $result); + self::assertIsObject($result); // ... of the correct type $this->assertTrue(is_a($result, 'DateTimeInterface')); // ... with the correct value diff --git a/tests/PhpSpreadsheetTests/Cell/DataTypeTest.php b/tests/PhpSpreadsheetTests/Cell/DataTypeTest.php index c450e6e1..1e1b5ecc 100644 --- a/tests/PhpSpreadsheetTests/Cell/DataTypeTest.php +++ b/tests/PhpSpreadsheetTests/Cell/DataTypeTest.php @@ -10,7 +10,7 @@ class DataTypeTest extends TestCase public function testGetErrorCodes() { $result = DataType::getErrorCodes(); - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertGreaterThan(0, count($result)); self::assertArrayHasKey('#NULL!', $result); } diff --git a/tests/PhpSpreadsheetTests/Reader/OdsTest.php b/tests/PhpSpreadsheetTests/Reader/OdsTest.php index 59ae006b..bec85f7b 100644 --- a/tests/PhpSpreadsheetTests/Reader/OdsTest.php +++ b/tests/PhpSpreadsheetTests/Reader/OdsTest.php @@ -240,28 +240,28 @@ class OdsTest extends TestCase $properties = $spreadsheet->getProperties(); // Core Properties -// $this->assertSame('Mark Baker', $properties->getCreator()); - $this->assertSame('Property Test File', $properties->getTitle()); - $this->assertSame('Testing for Properties', $properties->getSubject()); - $this->assertSame('TEST ODS PHPSpreadsheet', $properties->getKeywords()); +// self::assertSame('Mark Baker', $properties->getCreator()); + self::assertSame('Property Test File', $properties->getTitle()); + self::assertSame('Testing for Properties', $properties->getSubject()); + self::assertSame('TEST ODS PHPSpreadsheet', $properties->getKeywords()); // Extended Properties -// $this->assertSame('PHPOffice', $properties->getCompany()); -// $this->assertSame('The Big Boss', $properties->getManager()); +// self::assertSame('PHPOffice', $properties->getCompany()); +// self::assertSame('The Big Boss', $properties->getManager()); // Custom Properties $customProperties = $properties->getCustomProperties(); - $this->assertInternalType('array', $customProperties); + self::assertIsArray($customProperties); $customProperties = array_flip($customProperties); - $this->assertArrayHasKey('TestDate', $customProperties); + self::assertArrayHasKey('TestDate', $customProperties); foreach ($customPropertySet as $propertyName => $testData) { - $this->assertTrue($properties->isCustomPropertySet($propertyName)); - $this->assertSame($testData['type'], $properties->getCustomPropertyType($propertyName)); + self::assertTrue($properties->isCustomPropertySet($propertyName)); + self::assertSame($testData['type'], $properties->getCustomPropertyType($propertyName)); if ($properties->getCustomPropertyType($propertyName) == Properties::PROPERTY_TYPE_DATE) { - $this->assertSame($testData['value'], date('Y-m-d', $properties->getCustomPropertyValue($propertyName))); + self::assertSame($testData['value'], date('Y-m-d', $properties->getCustomPropertyValue($propertyName))); } else { - $this->assertSame($testData['value'], $properties->getCustomPropertyValue($propertyName)); + self::assertSame($testData['value'], $properties->getCustomPropertyValue($propertyName)); } } } diff --git a/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php b/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php index c1d7fa38..0d9fc13f 100644 --- a/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php @@ -82,7 +82,7 @@ class XmlScannerTest extends TestCase $scanner = $fileReader->getSecurityScanner(); // Must return an object... - $this->assertInternalType('object', $scanner); + self::assertIsObject($scanner); // ... of the correct type $this->assertInstanceOf(XmlScanner::class, $scanner); } diff --git a/tests/PhpSpreadsheetTests/Reader/XlsxTest.php b/tests/PhpSpreadsheetTests/Reader/XlsxTest.php index 5cf6f93f..1180aacc 100644 --- a/tests/PhpSpreadsheetTests/Reader/XlsxTest.php +++ b/tests/PhpSpreadsheetTests/Reader/XlsxTest.php @@ -40,7 +40,7 @@ class XlsxTest extends TestCase // Custom Properties $customProperties = $properties->getCustomProperties(); - $this->assertInternalType('array', $customProperties); + self::assertIsArray($customProperties); $customProperties = array_flip($customProperties); $this->assertArrayHasKey('Publisher', $customProperties); diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php index 9ce636d8..855de2bc 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php @@ -127,7 +127,7 @@ class ColumnTest extends TestCase $this->testAutoFilterColumnObject->setAttributes($attributeSet); $result = $this->testAutoFilterColumnObject->getAttributes(); - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertCount(count($attributeSet), $result); } diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php index 6766aac8..aa66eb8e 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php @@ -111,7 +111,7 @@ class AutoFilterTest extends TestCase { // There should be no columns yet defined $result = $this->testAutoFilterObject->getColumns(); - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertCount(0, $result); } @@ -151,7 +151,7 @@ class AutoFilterTest extends TestCase $result = $this->testAutoFilterObject->getColumns(); // Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\AutoFilter\Column // objects for each column we set indexed by the column ID - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertCount(1, $result); self::assertArrayHasKey($expectedResult, $result); self::assertInstanceOf(Column::class, $result[$expectedResult]); @@ -178,7 +178,7 @@ class AutoFilterTest extends TestCase $result = $this->testAutoFilterObject->getColumns(); // Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\AutoFilter\Column // objects for each column we set indexed by the column ID - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertCount(1, $result); self::assertArrayHasKey($expectedResult, $result); self::assertInstanceOf(Column::class, $result[$expectedResult]); @@ -211,7 +211,7 @@ class AutoFilterTest extends TestCase $result = $this->testAutoFilterObject->getColumns(); // Result should be an array of \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet\AutoFilter\Column // objects for each column we set indexed by the column ID - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertCount(count($columnIndexes), $result); foreach ($columnIndexes as $columnIndex) { self::assertArrayHasKey($columnIndex, $result); @@ -288,7 +288,7 @@ class AutoFilterTest extends TestCase // Column array should be cleared $result = $this->testAutoFilterObject->getColumns(); - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertCount(0, $result); } @@ -318,7 +318,7 @@ class AutoFilterTest extends TestCase // Only columns that existed in the original range and that // still fall within the new range should be retained $result = $this->testAutoFilterObject->getColumns(); - self::assertInternalType('array', $result); + self::assertIsArray($result); self::assertCount(count($columnIndexes1), $result); }