From 80b4ae2bbdc523a7d1d756df5887b8cdb3092e35 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Tue, 12 Sep 2023 10:48:13 +0800 Subject: [PATCH] Rector TypedPropertyFromStrictSetUpRector --- .../Calculation/BinaryComparisonTest.php | 5 +---- .../Calculation/CalculationFunctionListTest.php | 10 ++-------- .../Calculation/CalculationSettingsTest.php | 10 ++-------- .../Calculation/CalculationTest.php | 10 ++-------- .../Calculation/Engine/RangeTest.php | 5 +---- .../Calculation/Functions/DateTime/DateTest.php | 10 ++-------- .../Functions/DateTime/DateValueTest.php | 10 ++-------- .../Calculation/Functions/DateTime/DayTest.php | 5 +---- .../Calculation/Functions/DateTime/EDateTest.php | 5 +---- .../Functions/DateTime/EoMonthTest.php | 5 +---- .../Functions/DateTime/IsoWeekNumTest.php | 5 +---- .../Calculation/Functions/DateTime/TimeTest.php | 10 ++-------- .../Functions/DateTime/TimeValueTest.php | 5 +---- .../Functions/DateTime/WeekDayTest.php | 5 +---- .../Functions/DateTime/WeekNumTest.php | 5 +---- .../Functions/Engineering/Bin2DecTest.php | 5 +---- .../Functions/Engineering/Bin2HexTest.php | 5 +---- .../Functions/Engineering/Bin2OctTest.php | 5 +---- .../Functions/Engineering/Dec2BinTest.php | 5 +---- .../Functions/Engineering/Dec2HexTest.php | 5 +---- .../Functions/Engineering/Dec2OctTest.php | 5 +---- .../Functions/Engineering/Hex2BinTest.php | 5 +---- .../Functions/Engineering/Hex2DecTest.php | 5 +---- .../Functions/Engineering/Hex2OctTest.php | 5 +---- .../Functions/Engineering/ImConjugateTest.php | 5 +---- .../Functions/Engineering/ImCosTest.php | 5 +---- .../Functions/Engineering/ImCoshTest.php | 5 +---- .../Functions/Engineering/ImCotTest.php | 5 +---- .../Functions/Engineering/ImCscTest.php | 5 +---- .../Functions/Engineering/ImCschTest.php | 5 +---- .../Functions/Engineering/ImDivTest.php | 5 +---- .../Functions/Engineering/ImExpTest.php | 5 +---- .../Functions/Engineering/ImLnTest.php | 5 +---- .../Functions/Engineering/ImLog10Test.php | 5 +---- .../Functions/Engineering/ImLog2Test.php | 5 +---- .../Functions/Engineering/ImPowerTest.php | 5 +---- .../Functions/Engineering/ImProductTest.php | 5 +---- .../Functions/Engineering/ImSecTest.php | 5 +---- .../Functions/Engineering/ImSechTest.php | 5 +---- .../Functions/Engineering/ImSinTest.php | 5 +---- .../Functions/Engineering/ImSinhTest.php | 5 +---- .../Functions/Engineering/ImSqrtTest.php | 5 +---- .../Functions/Engineering/ImSubTest.php | 5 +---- .../Functions/Engineering/ImSumTest.php | 5 +---- .../Functions/Engineering/ImTanTest.php | 5 +---- .../Functions/Engineering/Oct2BinTest.php | 5 +---- .../Functions/Engineering/Oct2DecTest.php | 5 +---- .../Functions/Engineering/Oct2HexTest.php | 5 +---- .../Functions/Financial/AllSetupTeardown.php | 5 +---- .../Functions/Logical/AllSetupTeardown.php | 5 +---- .../LookupRef/AddressInternationalTest.php | 3 +-- .../LookupRef/IndirectInternationalTest.php | 3 +-- .../Functions/MathTrig/AllSetupTeardown.php | 5 +---- .../Functions/Statistical/AllSetupTeardown.php | 5 +---- .../Functions/TextData/AllSetupTeardown.php | 10 ++-------- .../Calculation/Functions/TextData/ValueTest.php | 15 +++------------ .../Calculation/FunctionsTest.php | 10 ++-------- .../Calculation/TranslationTest.php | 13 +++---------- .../Cell/StringValueBinderTest.php | 6 +----- tests/PhpSpreadsheetTests/DefinedNameTest.php | 3 +-- tests/PhpSpreadsheetTests/NamedFormulaTest.php | 3 +-- tests/PhpSpreadsheetTests/NamedRangeTest.php | 3 +-- .../Reader/Csv/CsvNumberFormatLocaleTest.php | 5 +---- .../Reader/Html/HtmlLibxmlTest.php | 3 +-- .../Reader/Html/HtmlPhpunit10Test.php | 3 +-- .../Reader/Ods/OdsPropertiesTest.php | 5 +---- tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php | 5 +---- .../PhpSpreadsheetTests/Reader/Xls/ColourTest.php | 6 +----- .../Reader/Xml/XmlLoadTest.php | 3 +-- tests/PhpSpreadsheetTests/Shared/Date2Test.php | 3 +-- tests/PhpSpreadsheetTests/Shared/DateTest.php | 10 ++-------- .../PhpSpreadsheetTests/Shared/ExactFontTest.php | 15 +++++---------- tests/PhpSpreadsheetTests/Shared/FileTest.php | 3 +-- tests/PhpSpreadsheetTests/Shared/Font3Test.php | 3 +-- .../Shared/FontFileNameTest.php | 6 ++---- .../Shared/OLEPhpunit10Test.php | 3 +-- .../Shared/StringHelperTest.php | 15 +++------------ tests/PhpSpreadsheetTests/Shared/TimeZoneTest.php | 10 ++-------- .../PhpSpreadsheetTests/Shared/XmlWriterTest.php | 3 +-- .../Style/NumberFormatTest.php | 15 +++------------ .../Worksheet/DefaultPaperSizeTest.php | 6 ++---- .../Writer/Html/HtmlNumberFormatTest.php | 15 +++------------ .../Writer/Html/ImagesRootTest.php | 5 +---- .../Writer/Ods/ContentTest.php | 9 +-------- .../Writer/Xls/FormulaErrTest.php | 3 +-- .../Writer/Xlsx/LocaleFloatsTest.php | 5 +---- 86 files changed, 112 insertions(+), 406 deletions(-) diff --git a/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php b/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php index d1303aefc..86b869756 100644 --- a/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php @@ -11,10 +11,7 @@ use PHPUnit\Framework\TestCase; class BinaryComparisonTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php index d23786cb6..22c2c78b0 100644 --- a/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php @@ -11,15 +11,9 @@ use PHPUnit\Framework\TestCase; class CalculationFunctionListTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; - /** - * @var string - */ - private $locale; + private string $locale; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php index b205a1d18..afaf58d0e 100644 --- a/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php @@ -10,15 +10,9 @@ use PHPUnit\Framework\TestCase; class CalculationSettingsTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; - /** - * @var string - */ - private $locale; + private string $locale; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php index 5848d84a1..403ae8606 100644 --- a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php @@ -13,15 +13,9 @@ use PHPUnit\Framework\TestCase; class CalculationTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; - /** - * @var string - */ - private $locale; + private string $locale; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php index 9dd9b377d..c36c48d40 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php @@ -14,10 +14,7 @@ class RangeTest extends TestCase /** @var string */ private $incompleteMessage = 'Must be revisited'; - /** - * @var Spreadsheet - */ - private $spreadSheet; + private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadSheet; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php index 4a1c8762f..494b41b90 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php @@ -16,15 +16,9 @@ use PHPUnit\Framework\TestCase; class DateTest extends TestCase { - /** - * @var int - */ - private $excelCalendar; + private int $excelCalendar; - /** - * @var string - */ - private $returnDateType; + private string $returnDateType; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php index 997987c1e..be35cb29e 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php @@ -17,15 +17,9 @@ use PHPUnit\Framework\TestCase; class DateValueTest extends TestCase { - /** - * @var int - */ - private $excelCalendar; + private int $excelCalendar; - /** - * @var string - */ - private $returnDateType; + private string $returnDateType; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php index 83587a45e..6270ac088 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class DayTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php index c6f793f71..a1618cf0d 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class EDateTest extends TestCase { - /** - * @var string - */ - private $returnDateType; + private string $returnDateType; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php index 996397dae..a6d573896 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class EoMonthTest extends TestCase { - /** - * @var string - */ - private $returnDateType; + private string $returnDateType; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php index a2452e0ad..7aee56b9a 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class IsoWeekNumTest extends TestCase { - /** - * @var int - */ - private $excelCalendar; + private int $excelCalendar; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php index 7d20a0994..f1097ba1b 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php @@ -16,15 +16,9 @@ use PHPUnit\Framework\TestCase; class TimeTest extends TestCase { - /** - * @var int - */ - private $excelCalendar; + private int $excelCalendar; - /** - * @var string - */ - private $returnDateType; + private string $returnDateType; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php index f10f4aa3e..f188c1408 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class TimeValueTest extends TestCase { - /** - * @var string - */ - private $returnDateType; + private string $returnDateType; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php index e5c42b6a9..cf487bfd0 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php @@ -13,10 +13,7 @@ use PHPUnit\Framework\TestCase; class WeekDayTest extends TestCase { - /** - * @var int - */ - private $excelCalendar; + private int $excelCalendar; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php index daa0eeb77..555418ade 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class WeekNumTest extends TestCase { - /** - * @var int - */ - private $excelCalendar; + private int $excelCalendar; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php index 06c62b4cb..28589bcdd 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Bin2DecTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php index 0c92a482c..45fb5de85 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Bin2HexTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php index 7f25427ef..ecc6a033c 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Bin2OctTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php index e29c17adc..02212732f 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class Dec2BinTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php index c1fa9de75..3ea9ad782 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class Dec2HexTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php index b99608546..869b5b9a4 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php @@ -14,10 +14,7 @@ use PHPUnit\Framework\TestCase; class Dec2OctTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php index 261d9c589..fca419fe6 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Hex2BinTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php index a9b294254..d3822810f 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Hex2DecTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php index 8ae7ab5f3..b227f4872 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Hex2OctTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php index 7dd9b7b90..a944227f4 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php @@ -17,10 +17,7 @@ class ImConjugateTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php index 5910d26b4..26f721d68 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php @@ -17,10 +17,7 @@ class ImCosTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php index e52b3dee7..a23fd7a04 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php @@ -17,10 +17,7 @@ class ImCoshTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php index d7ac678b5..a79fb2f75 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php @@ -17,10 +17,7 @@ class ImCotTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php index 7b6c1693e..0e469566d 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php @@ -17,10 +17,7 @@ class ImCscTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php index 0683326c0..57765ca6e 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php @@ -17,10 +17,7 @@ class ImCschTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php index b07d46a46..635b566f5 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php @@ -17,10 +17,7 @@ class ImDivTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php index 985d4960e..53d08ab6f 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php @@ -17,10 +17,7 @@ class ImExpTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php index 0acf60f00..9c4448b66 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php @@ -17,10 +17,7 @@ class ImLnTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php index c552c1949..7d0042999 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php @@ -17,10 +17,7 @@ class ImLog10Test extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php index 707654b1e..19ed1c622 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php @@ -17,10 +17,7 @@ class ImLog2Test extends TestCase { const COMPLEX_PRECISION = 1E-8; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php index e60d6288c..f4f80ee9e 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php @@ -17,10 +17,7 @@ class ImPowerTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php index 8e8594821..472cb7868 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php @@ -17,10 +17,7 @@ class ImProductTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php index 2b3d1f6f3..5a432cb8c 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php @@ -17,10 +17,7 @@ class ImSecTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php index d438f90e6..cc62f3114 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php @@ -17,10 +17,7 @@ class ImSechTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php index b69bb72d5..678229d81 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php @@ -17,10 +17,7 @@ class ImSinTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php index 651bd4828..19fc93e7b 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php @@ -17,10 +17,7 @@ class ImSinhTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php index 6ff243020..c93918cdc 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php @@ -17,10 +17,7 @@ class ImSqrtTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php index 1d5a18823..4457dc60d 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php @@ -17,10 +17,7 @@ class ImSubTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php index 99a30c5d1..0dd9a1e0f 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php @@ -17,10 +17,7 @@ class ImSumTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php index 6efb1800e..1ed1b1934 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php @@ -17,10 +17,7 @@ class ImTanTest extends TestCase { const COMPLEX_PRECISION = 1E-12; - /** - * @var ComplexAssert - */ - private $complexAssert; + private \PhpOffice\PhpSpreadsheetTests\Custom\ComplexAssert $complexAssert; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php index 18c602746..fe0953d23 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Oct2BinTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php index bc9b9666a..c1e02fbc7 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Oct2DecTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php index af52760d6..1a43a4994 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php @@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase; class Oct2HexTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php index 4d46664c1..6fd236934 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php @@ -13,10 +13,7 @@ use PHPUnit\Framework\TestCase; class AllSetupTeardown extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; /** * @var ?Spreadsheet diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php index 8510d1ad2..709535dc9 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php @@ -13,10 +13,7 @@ use PHPUnit\Framework\TestCase; class AllSetupTeardown extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; /** * @var ?Spreadsheet diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php index da504e972..d7aa9101c 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php @@ -9,8 +9,7 @@ use PhpOffice\PhpSpreadsheet\Settings; class AddressInternationalTest extends AllSetupTeardown { - /** @var string */ - private $locale; + private string $locale; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php index 2c974282a..1cfcfc603 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php @@ -9,8 +9,7 @@ use PhpOffice\PhpSpreadsheet\Settings; class IndirectInternationalTest extends AllSetupTeardown { - /** @var string */ - private $locale; + private string $locale; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php index 8edba539f..a73de31c0 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php @@ -13,10 +13,7 @@ use PHPUnit\Framework\TestCase; class AllSetupTeardown extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; /** * @var ?Spreadsheet diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php index 261ece097..da8038189 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php @@ -13,10 +13,7 @@ use PHPUnit\Framework\TestCase; class AllSetupTeardown extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; /** * @var ?Spreadsheet diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php index e50b8163c..63f2e01c8 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php @@ -14,15 +14,9 @@ use PHPUnit\Framework\TestCase; class AllSetupTeardown extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; - /** - * @var string - */ - private $locale; + private string $locale; /** * @var ?Spreadsheet diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php index a06fe6911..c04dfe879 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php @@ -9,20 +9,11 @@ use PhpOffice\PhpSpreadsheet\Shared\StringHelper; class ValueTest extends AllSetupTeardown { - /** - * @var string - */ - private $currencyCode; + private string $currencyCode; - /** - * @var string - */ - private $decimalSeparator; + private string $decimalSeparator; - /** - * @var string - */ - private $thousandsSeparator; + private string $thousandsSeparator; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php b/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php index d4908ad5a..9385a1a95 100644 --- a/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php @@ -10,15 +10,9 @@ use PHPUnit\Framework\TestCase; class FunctionsTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; - /** - * @var string - */ - private $returnDate; + private string $returnDate; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php b/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php index 39fa96a65..c14ee0a64 100644 --- a/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php @@ -11,18 +11,11 @@ use PHPUnit\Framework\TestCase; class TranslationTest extends TestCase { - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; - /** - * @var string - */ - private $returnDate; + private string $returnDate; - /** @var string */ - private $locale; + private string $locale; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php b/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php index 192bcd388..19a08ac4d 100644 --- a/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php +++ b/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php @@ -8,7 +8,6 @@ use DateTime; use DateTimeZone; use PhpOffice\PhpSpreadsheet\Cell\Cell; use PhpOffice\PhpSpreadsheet\Cell\DataType; -use PhpOffice\PhpSpreadsheet\Cell\IValueBinder; use PhpOffice\PhpSpreadsheet\Cell\StringValueBinder; use PhpOffice\PhpSpreadsheet\RichText\RichText; use PhpOffice\PhpSpreadsheet\Spreadsheet; @@ -16,10 +15,7 @@ use PHPUnit\Framework\TestCase; class StringValueBinderTest extends TestCase { - /** - * @var IValueBinder - */ - private $valueBinder; + private \PhpOffice\PhpSpreadsheet\Cell\IValueBinder $valueBinder; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/DefinedNameTest.php b/tests/PhpSpreadsheetTests/DefinedNameTest.php index e1a9bfe5d..75b559be0 100644 --- a/tests/PhpSpreadsheetTests/DefinedNameTest.php +++ b/tests/PhpSpreadsheetTests/DefinedNameTest.php @@ -12,8 +12,7 @@ use PHPUnit\Framework\TestCase; class DefinedNameTest extends TestCase { - /** @var Spreadsheet */ - private $spreadsheet; + private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/NamedFormulaTest.php b/tests/PhpSpreadsheetTests/NamedFormulaTest.php index 2feec4dec..103a1250b 100644 --- a/tests/PhpSpreadsheetTests/NamedFormulaTest.php +++ b/tests/PhpSpreadsheetTests/NamedFormulaTest.php @@ -11,8 +11,7 @@ use PHPUnit\Framework\TestCase; class NamedFormulaTest extends TestCase { - /** @var Spreadsheet */ - private $spreadsheet; + private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/NamedRangeTest.php b/tests/PhpSpreadsheetTests/NamedRangeTest.php index ffdfe5048..0d69ccb80 100644 --- a/tests/PhpSpreadsheetTests/NamedRangeTest.php +++ b/tests/PhpSpreadsheetTests/NamedRangeTest.php @@ -11,8 +11,7 @@ use PHPUnit\Framework\TestCase; class NamedRangeTest extends TestCase { - /** @var Spreadsheet */ - private $spreadsheet; + private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php index 0da49772e..9550636b3 100644 --- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php @@ -10,10 +10,7 @@ use PHPUnit\Framework\TestCase; class CsvNumberFormatLocaleTest extends TestCase { - /** - * @var bool - */ - private $localeAdjusted; + private bool $localeAdjusted; /** * @var false|string diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlLibxmlTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlLibxmlTest.php index b943d1acd..bb29eb6c5 100644 --- a/tests/PhpSpreadsheetTests/Reader/Html/HtmlLibxmlTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlLibxmlTest.php @@ -19,8 +19,7 @@ use PHPUnit\Framework\TestCase; */ class HtmlLibxmlTest extends TestCase { - /** @var bool */ - private $useErrors; + private bool $useErrors; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlPhpunit10Test.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlPhpunit10Test.php index 9a8f53a3e..175f0e8bb 100644 --- a/tests/PhpSpreadsheetTests/Reader/Html/HtmlPhpunit10Test.php +++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlPhpunit10Test.php @@ -16,8 +16,7 @@ use PHPUnit\Framework\TestCase; */ class HtmlPhpunit10Test extends TestCase { - /** @var string */ - private static $errorString; + private static string $errorString; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/OdsPropertiesTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/OdsPropertiesTest.php index 8c1aff9b6..b9722ec13 100644 --- a/tests/PhpSpreadsheetTests/Reader/Ods/OdsPropertiesTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Ods/OdsPropertiesTest.php @@ -11,10 +11,7 @@ use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional; class OdsPropertiesTest extends AbstractFunctional { - /** - * @var string - */ - private $timeZone; + private string $timeZone; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php index e3e6a636a..c26f99d50 100644 --- a/tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php @@ -23,10 +23,7 @@ class OdsTest extends TestCase /** @var string */ private $incompleteMessage = 'Features not implemented yet'; - /** - * @var string - */ - private $timeZone; + private string $timeZone; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/ColourTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/ColourTest.php index 9b997ed8c..45dab0726 100644 --- a/tests/PhpSpreadsheetTests/Reader/Xls/ColourTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Xls/ColourTest.php @@ -5,15 +5,11 @@ declare(strict_types=1); namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls; use PhpOffice\PhpSpreadsheet\Reader\Xls; -use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional; class ColourTest extends AbstractFunctional { - /** - * @var Spreadsheet - */ - private $spreadsheet; + private \PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet; protected function setup(): void { diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php index be159c735..821533aae 100644 --- a/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php +++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php @@ -16,8 +16,7 @@ class XmlLoadTest extends TestCase /** @var ?Spreadsheet */ private $spreadsheet; - /** @var string */ - private $locale; + private string $locale; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/Date2Test.php b/tests/PhpSpreadsheetTests/Shared/Date2Test.php index dd9c8a5ab..7d66fe871 100644 --- a/tests/PhpSpreadsheetTests/Shared/Date2Test.php +++ b/tests/PhpSpreadsheetTests/Shared/Date2Test.php @@ -15,8 +15,7 @@ class Date2Test extends TestCase /** @var ?Spreadsheet */ private $spreadsheet; - /** @var int */ - private $calculateDateTimeType; + private int $calculateDateTimeType; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/DateTest.php b/tests/PhpSpreadsheetTests/Shared/DateTest.php index 116e8981c..7839cfc45 100644 --- a/tests/PhpSpreadsheetTests/Shared/DateTest.php +++ b/tests/PhpSpreadsheetTests/Shared/DateTest.php @@ -12,15 +12,9 @@ use PHPUnit\Framework\TestCase; class DateTest extends TestCase { - /** - * @var int - */ - private $excelCalendar; + private int $excelCalendar; - /** - * @var null|DateTimeZone - */ - private $dttimezone; + private ?DateTimeZone $dttimezone; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/ExactFontTest.php b/tests/PhpSpreadsheetTests/Shared/ExactFontTest.php index 3beef8778..c5a3aa0d8 100644 --- a/tests/PhpSpreadsheetTests/Shared/ExactFontTest.php +++ b/tests/PhpSpreadsheetTests/Shared/ExactFontTest.php @@ -38,17 +38,13 @@ class ExactFontTest extends TestCase ], ]; - /** @var string */ - private $holdDirectory; + private string $holdDirectory; - /** @var string */ - private $holdAutoSizeMethod; + private string $holdAutoSizeMethod; - /** @var string */ - private $directoryName = ''; + private string $directoryName = ''; - /** @var string */ - private $incompleteMessage = ''; + private string $incompleteMessage = ''; private const KNOWN_MD5 = [ '6a15e0a7c0367ba77a959ea27ebf11cf', @@ -56,8 +52,7 @@ class ExactFontTest extends TestCase 'be189a7e2711cdf2a7f6275c60cbc7e2', ]; - /** @var null|float|int */ - private $paddingAmountExact; + private float|int|null $paddingAmountExact; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/FileTest.php b/tests/PhpSpreadsheetTests/Shared/FileTest.php index f96f56ead..c4baf51ce 100644 --- a/tests/PhpSpreadsheetTests/Shared/FileTest.php +++ b/tests/PhpSpreadsheetTests/Shared/FileTest.php @@ -10,8 +10,7 @@ use PHPUnit\Framework\TestCase; class FileTest extends TestCase { - /** @var bool */ - private $uploadFlag = false; + private bool $uploadFlag = false; /** @var string */ private $tempfile = ''; diff --git a/tests/PhpSpreadsheetTests/Shared/Font3Test.php b/tests/PhpSpreadsheetTests/Shared/Font3Test.php index 029712390..b2801456d 100644 --- a/tests/PhpSpreadsheetTests/Shared/Font3Test.php +++ b/tests/PhpSpreadsheetTests/Shared/Font3Test.php @@ -11,8 +11,7 @@ use PHPUnit\Framework\TestCase; class Font3Test extends TestCase { - /** @var string */ - private $holdDirectory; + private string $holdDirectory; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/FontFileNameTest.php b/tests/PhpSpreadsheetTests/Shared/FontFileNameTest.php index 06ee3243b..bc0f0cf0b 100644 --- a/tests/PhpSpreadsheetTests/Shared/FontFileNameTest.php +++ b/tests/PhpSpreadsheetTests/Shared/FontFileNameTest.php @@ -14,11 +14,9 @@ class FontFileNameTest extends TestCase private const DEFAULT_DIRECTORY = 'tests/data/Shared/FakeFonts/Default'; private const MAC_DIRECTORY = 'tests/data/Shared/FakeFonts/Mac'; - /** @var string */ - private $holdDirectory; + private string $holdDirectory; - /** @var array */ - private $holdExtraFontArray; + private array $holdExtraFontArray; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/OLEPhpunit10Test.php b/tests/PhpSpreadsheetTests/Shared/OLEPhpunit10Test.php index 6e80a42e0..7b97a979d 100644 --- a/tests/PhpSpreadsheetTests/Shared/OLEPhpunit10Test.php +++ b/tests/PhpSpreadsheetTests/Shared/OLEPhpunit10Test.php @@ -16,8 +16,7 @@ use PHPUnit\Framework\TestCase; */ class OLEPhpunit10Test extends TestCase { - /** @var string */ - private static $errorString; + private static string $errorString; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php b/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php index b5634b80b..e77e02a42 100644 --- a/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php +++ b/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php @@ -9,20 +9,11 @@ use PHPUnit\Framework\TestCase; class StringHelperTest extends TestCase { - /** - * @var string - */ - private $currencyCode; + private string $currencyCode; - /** - * @var string - */ - private $decimalSeparator; + private string $decimalSeparator; - /** - * @var string - */ - private $thousandsSeparator; + private string $thousandsSeparator; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/TimeZoneTest.php b/tests/PhpSpreadsheetTests/Shared/TimeZoneTest.php index 05224fe07..ec42f59ce 100644 --- a/tests/PhpSpreadsheetTests/Shared/TimeZoneTest.php +++ b/tests/PhpSpreadsheetTests/Shared/TimeZoneTest.php @@ -12,15 +12,9 @@ use PHPUnit\Framework\TestCase; class TimeZoneTest extends TestCase { - /** - * @var string - */ - private $tztimezone; + private string $tztimezone; - /** - * @var null|DateTimeZone - */ - private $dttimezone; + private ?DateTimeZone $dttimezone; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Shared/XmlWriterTest.php b/tests/PhpSpreadsheetTests/Shared/XmlWriterTest.php index 47f66d102..63bebc34d 100644 --- a/tests/PhpSpreadsheetTests/Shared/XmlWriterTest.php +++ b/tests/PhpSpreadsheetTests/Shared/XmlWriterTest.php @@ -10,8 +10,7 @@ use PHPUnit\Framework\TestCase; class XmlWriterTest extends TestCase { - /** @var bool */ - private $debugEnabled; + private bool $debugEnabled; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php index 47d473088..5cd09574c 100644 --- a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php +++ b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php @@ -11,20 +11,11 @@ use PHPUnit\Framework\TestCase; class NumberFormatTest extends TestCase { - /** - * @var string - */ - private $currencyCode; + private string $currencyCode; - /** - * @var string - */ - private $decimalSeparator; + private string $decimalSeparator; - /** - * @var string - */ - private $thousandsSeparator; + private string $thousandsSeparator; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Worksheet/DefaultPaperSizeTest.php b/tests/PhpSpreadsheetTests/Worksheet/DefaultPaperSizeTest.php index 6aecd2a78..b309bef02 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/DefaultPaperSizeTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/DefaultPaperSizeTest.php @@ -10,11 +10,9 @@ use PHPUnit\Framework\TestCase; class DefaultPaperSizeTest extends TestCase { - /** @var int */ - private $paperSize; + private int $paperSize; - /** @var string */ - private $orientation; + private string $orientation; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php index 7bf5e121c..1594a6fa3 100644 --- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php @@ -13,20 +13,11 @@ use PhpOffice\PhpSpreadsheetTests\Functional; class HtmlNumberFormatTest extends Functional\AbstractFunctional { - /** - * @var string - */ - private $currency; + private string $currency; - /** - * @var string - */ - private $decsep; + private string $decsep; - /** - * @var string - */ - private $thosep; + private string $thosep; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Writer/Html/ImagesRootTest.php b/tests/PhpSpreadsheetTests/Writer/Html/ImagesRootTest.php index 395287575..f36fa3b95 100644 --- a/tests/PhpSpreadsheetTests/Writer/Html/ImagesRootTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Html/ImagesRootTest.php @@ -11,10 +11,7 @@ use PhpOffice\PhpSpreadsheetTests\Functional; class ImagesRootTest extends Functional\AbstractFunctional { - /** - * @var string - */ - private $curdir = ''; + private string $curdir = ''; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Writer/Ods/ContentTest.php b/tests/PhpSpreadsheetTests/Writer/Ods/ContentTest.php index c2769da25..ae8239cca 100644 --- a/tests/PhpSpreadsheetTests/Writer/Ods/ContentTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Ods/ContentTest.php @@ -24,14 +24,7 @@ class ContentTest extends TestCase */ private $samplesPath = 'tests/data/Writer/Ods'; - /** - * @var string - */ - - /** - * @var string - */ - private $compatibilityMode; + private string $compatibilityMode; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php index b449a1068..9dc7281b6 100644 --- a/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php @@ -18,8 +18,7 @@ class FormulaErrTest extends AbstractFunctional /** @var ?Spreadsheet */ private $reloadedSpreadsheet; - /** @var bool */ - private $allowThrow; + private bool $allowThrow; protected function setUp(): void { diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php index 2163e263a..185154e1b 100644 --- a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php @@ -9,10 +9,7 @@ use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional; class LocaleFloatsTest extends AbstractFunctional { - /** - * @var bool - */ - private $localeAdjusted; + private bool $localeAdjusted; /** * @var false|string