diff --git a/composer.lock b/composer.lock
index 6e6165afd..2567436eb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1055,16 +1055,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.60.0",
+            "version": "v3.61.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "e595e4e070d17c5d42ed8c4206f630fcc5f401a4"
+                "reference": "94a87189f55814e6cabca2d9a33b06de384a2ab8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e595e4e070d17c5d42ed8c4206f630fcc5f401a4",
-                "reference": "e595e4e070d17c5d42ed8c4206f630fcc5f401a4",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/94a87189f55814e6cabca2d9a33b06de384a2ab8",
+                "reference": "94a87189f55814e6cabca2d9a33b06de384a2ab8",
                 "shasum": ""
             },
             "require": {
@@ -1146,7 +1146,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.60.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.61.1"
             },
             "funding": [
                 {
@@ -1154,7 +1154,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-25T09:26:51+00:00"
+            "time": "2024-07-31T14:33:15+00:00"
         },
         {
             "name": "masterminds/html5",
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index d372005a2..8d622d4e6 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -69,8 +69,6 @@ class Calculation
 
     /**
      * Instance of this class.
-     *
-     * @var ?Calculation
      */
     private static ?Calculation $instance = null;
 
@@ -3272,10 +3270,8 @@ class Calculation
         return $formula;
     }
 
-    /** @var ?array */
     private static ?array $functionReplaceFromExcel;
 
-    /** @var ?array */
     private static ?array $functionReplaceToLocale;
 
     /**
@@ -3321,10 +3317,8 @@ class Calculation
         );
     }
 
-    /** @var ?array */
     private static ?array $functionReplaceFromLocale;
 
-    /** @var ?array */
     private static ?array $functionReplaceToExcel;
 
     /**
diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php
index 6aed63f20..9ddafce1b 100644
--- a/src/PhpSpreadsheet/Cell/Cell.php
+++ b/src/PhpSpreadsheet/Cell/Cell.php
@@ -50,8 +50,6 @@ class Cell implements Stringable
 
     /**
      * The collection of cells that this cell belongs to (i.e. The Cell Collection for the parent Worksheet).
-     *
-     * @var ?Cells
      */
     private ?Cells $parent;
 
diff --git a/src/PhpSpreadsheet/Chart/Properties.php b/src/PhpSpreadsheet/Chart/Properties.php
index 655e79c85..3e02a964f 100644
--- a/src/PhpSpreadsheet/Chart/Properties.php
+++ b/src/PhpSpreadsheet/Chart/Properties.php
@@ -105,7 +105,6 @@ abstract class Properties
 
     protected bool $objectState = false; // used only for minor gridlines
 
-    /** @var ?float */
     protected ?float $glowSize = null;
 
     protected ChartColor $glowColor;
diff --git a/src/PhpSpreadsheet/Helper/Html.php b/src/PhpSpreadsheet/Helper/Html.php
index 2e9f185d0..e690ae652 100644
--- a/src/PhpSpreadsheet/Helper/Html.php
+++ b/src/PhpSpreadsheet/Helper/Html.php
@@ -533,13 +533,10 @@ class Html
         'yellowgreen' => '9acd32',
     ];
 
-    /** @var ?string */
     private ?string $face = null;
 
-    /** @var ?string */
     private ?string $size = null;
 
-    /** @var ?string */
     private ?string $color = null;
 
     private bool $bold = false;
diff --git a/src/PhpSpreadsheet/Reader/Csv/Delimiter.php b/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
index d13156f31..92ec0b5d3 100644
--- a/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
+++ b/src/PhpSpreadsheet/Reader/Csv/Delimiter.php
@@ -17,7 +17,6 @@ class Delimiter
 
     protected int $numberLines = 0;
 
-    /** @var ?string */
     protected ?string $delimiter = null;
 
     /**
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index be9ccb268..a6b4fb1c8 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -350,8 +350,6 @@ class Xls extends BaseReader
 
     /**
      * The current RC4 decryption object.
-     *
-     * @var ?Xls\RC4
      */
     private ?Xls\RC4 $rc4Key = null;
 
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Styles.php b/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
index e35d6f3e8..0672854ad 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Styles.php
@@ -19,8 +19,6 @@ class Styles extends BaseParserClass
 {
     /**
      * Theme instance.
-     *
-     * @var ?Theme
      */
     private ?Theme $theme = null;
 
diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php
index c8acfd8cf..cdbe37861 100644
--- a/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/src/PhpSpreadsheet/ReferenceHelper.php
@@ -24,8 +24,6 @@ class ReferenceHelper
 
     /**
      * Instance of this class.
-     *
-     * @var ?ReferenceHelper
      */
     private static ?ReferenceHelper $instance = null;
 
diff --git a/src/PhpSpreadsheet/RichText/Run.php b/src/PhpSpreadsheet/RichText/Run.php
index 3bc980c78..6a6ccdd4b 100644
--- a/src/PhpSpreadsheet/RichText/Run.php
+++ b/src/PhpSpreadsheet/RichText/Run.php
@@ -9,8 +9,6 @@ class Run extends TextElement implements ITextElement
 {
     /**
      * Font.
-     *
-     * @var ?Font
      */
     private ?Font $font;
 
diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php
index 58d75164b..7f727a8cc 100644
--- a/src/PhpSpreadsheet/Settings.php
+++ b/src/PhpSpreadsheet/Settings.php
@@ -27,8 +27,6 @@ class Settings
 
     /**
      * The cache implementation to be used for cell collection.
-     *
-     * @var ?CacheInterface
      */
     private static ?CacheInterface $cache = null;
 
diff --git a/src/PhpSpreadsheet/Shared/Escher.php b/src/PhpSpreadsheet/Shared/Escher.php
index 8b9b3df11..9eb9956a2 100644
--- a/src/PhpSpreadsheet/Shared/Escher.php
+++ b/src/PhpSpreadsheet/Shared/Escher.php
@@ -6,15 +6,11 @@ class Escher
 {
     /**
      * Drawing Group Container.
-     *
-     * @var ?Escher\DggContainer
      */
     private ?Escher\DggContainer $dggContainer = null;
 
     /**
      * Drawing Container.
-     *
-     * @var ?Escher\DgContainer
      */
     private ?Escher\DgContainer $dgContainer = null;
 
diff --git a/src/PhpSpreadsheet/Shared/Escher/DggContainer.php b/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
index 9b0c9bb26..d0bf1bb5a 100644
--- a/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
+++ b/src/PhpSpreadsheet/Shared/Escher/DggContainer.php
@@ -21,8 +21,6 @@ class DggContainer
 
     /**
      * BLIP Store Container.
-     *
-     * @var ?DggContainer\BstoreContainer
      */
     private ?DggContainer\BstoreContainer $bstoreContainer = null;
 
diff --git a/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
index 0f5bf31d7..98e3656cf 100644
--- a/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
+++ b/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
@@ -25,8 +25,6 @@ class BSE
 
     /**
      * The BLIP (Big Large Image or Picture).
-     *
-     * @var ?BSE\Blip
      */
     private ?BSE\Blip $blip = null;
 
diff --git a/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php b/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
index 02d068093..953a55934 100644
--- a/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
+++ b/src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/WizardAbstract.php
@@ -9,9 +9,6 @@ use PhpOffice\PhpSpreadsheet\Style\Style;
 
 abstract class WizardAbstract
 {
-    /**
-     * @var ?Style
-     */
     protected ?Style $style = null;
 
     protected string $expression;
diff --git a/src/PhpSpreadsheet/Style/Font.php b/src/PhpSpreadsheet/Style/Font.php
index 232959de9..b96cfca60 100644
--- a/src/PhpSpreadsheet/Style/Font.php
+++ b/src/PhpSpreadsheet/Style/Font.php
@@ -38,10 +38,8 @@ class Font extends Supervisor
 
     private string $strikeType = '';
 
-    /** @var ?ChartColor */
     private ?ChartColor $underlineColor = null;
 
-    /** @var ?ChartColor */
     private ?ChartColor $chartColor = null;
     // end of chart title items
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php
index 5094d8ea4..51cd04997 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php
@@ -14,14 +14,8 @@ class SetupTeardownDatabases extends TestCase
 {
     protected const RESULT_CELL = 'Z1';
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php
index b51a8509a..bd1ea8a79 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php
@@ -15,14 +15,8 @@ class AllSetupTeardown extends TestCase
 {
     private string $compatibilityMode;
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php
index 9d41cedc3..5db3c9b91 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php
@@ -15,14 +15,8 @@ class AllSetupTeardown extends TestCase
 {
     private string $compatibilityMode;
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php
index 93240fa00..da8d350e4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php
@@ -15,14 +15,8 @@ class AllSetupTeardown extends TestCase
 {
     protected string $compatibilityMode;
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php
index d4594cc67..ca55bfa65 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php
@@ -15,14 +15,8 @@ class AllSetupTeardown extends TestCase
 {
     private string $compatibilityMode;
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php
index f1a660e47..8aaf6e73f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php
@@ -16,14 +16,8 @@ class AllSetupTeardown extends TestCase
 {
     private string $compatibilityMode;
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php
index a24822476..ddb1d9202 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php
@@ -18,14 +18,8 @@ class AllSetupTeardown extends TestCase
 
     private string $locale;
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
index 6c05513a9..48c528c6a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
@@ -15,7 +15,6 @@ use Psr\Http\Message\StreamInterface;
 
 class WebServiceTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/Cell/CellDetachTest.php b/tests/PhpSpreadsheetTests/Cell/CellDetachTest.php
index efd2dca04..faec5dbd9 100644
--- a/tests/PhpSpreadsheetTests/Cell/CellDetachTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CellDetachTest.php
@@ -11,7 +11,6 @@ use PHPUnit\Framework\TestCase;
 
 class CellDetachTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/NamedRange2Test.php b/tests/PhpSpreadsheetTests/NamedRange2Test.php
index dcf038c52..9061d6e1e 100644
--- a/tests/PhpSpreadsheetTests/NamedRange2Test.php
+++ b/tests/PhpSpreadsheetTests/NamedRange2Test.php
@@ -12,7 +12,6 @@ use PHPUnit\Framework\TestCase;
 
 class NamedRange2Test extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function setUp(): void
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/LoadSheetsOnlyTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/LoadSheetsOnlyTest.php
index 5edcbe6d3..c8c543afd 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/LoadSheetsOnlyTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/LoadSheetsOnlyTest.php
@@ -11,7 +11,6 @@ use PHPUnit\Framework\TestCase;
 
 class LoadSheetsOnlyTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     private static string $testbook = 'tests/data/Reader/XLS/HiddenSheet.xls';
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/LoadSheetsOnlyTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/LoadSheetsOnlyTest.php
index 93739b635..5c70a7521 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/LoadSheetsOnlyTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/LoadSheetsOnlyTest.php
@@ -11,7 +11,6 @@ use PHPUnit\Framework\TestCase;
 
 class LoadSheetsOnlyTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     private static string $testbook = 'tests/data/Reader/XLSX/HiddenSheet.xlsx';
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
index 47d831241..63e64709f 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -15,9 +15,6 @@ class PageSetupTest extends TestCase
 
     private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
 
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
     private string $filename = 'tests/data/Reader/Xml/PageSetup.xml';
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
index beded2509..b3ff5cb35 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
@@ -14,7 +14,6 @@ use PHPUnit\Framework\TestCase;
 
 class XmlLoadTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     private string $locale;
diff --git a/tests/PhpSpreadsheetTests/Shared/Date2Test.php b/tests/PhpSpreadsheetTests/Shared/Date2Test.php
index d1cbb2346..f5e51728f 100644
--- a/tests/PhpSpreadsheetTests/Shared/Date2Test.php
+++ b/tests/PhpSpreadsheetTests/Shared/Date2Test.php
@@ -12,7 +12,6 @@ use PHPUnit\Framework\TestCase;
 
 class Date2Test extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     private int $calculateDateTimeType;
diff --git a/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php b/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
index f9a6d126c..91e4e9ce8 100644
--- a/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
+++ b/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
@@ -10,10 +10,8 @@ use PHPUnit\Framework\TestCase;
 
 class SpreadsheetCoverageTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet2 = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/SpreadsheetTest.php b/tests/PhpSpreadsheetTests/SpreadsheetTest.php
index a3e7a9fd4..a35ab101f 100644
--- a/tests/PhpSpreadsheetTests/SpreadsheetTest.php
+++ b/tests/PhpSpreadsheetTests/SpreadsheetTest.php
@@ -11,7 +11,6 @@ use PHPUnit\Framework\TestCase;
 
 class SpreadsheetTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php b/tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php
index 1e232b72a..02fce92ac 100644
--- a/tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php
+++ b/tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php
@@ -14,7 +14,6 @@ use ZipArchive;
 
 class AlignmentMiddleTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     private string $outputFileName = '';
diff --git a/tests/PhpSpreadsheetTests/Style/AlignmentTest.php b/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
index 1b9380004..32957d90f 100644
--- a/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
+++ b/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
@@ -11,7 +11,6 @@ use PHPUnit\Framework\TestCase;
 
 class AlignmentTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
index ac0ba30d8..334736e87 100644
--- a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
@@ -14,9 +14,6 @@ use PHPUnit\Framework\TestCase;
 
 class CellMatcherTest extends TestCase
 {
-    /**
-     * @var ?Spreadsheet
-     */
     protected ?Spreadsheet $spreadsheet = null;
 
     protected function loadSpreadsheet(): Spreadsheet
diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/SetupTeardown.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/SetupTeardown.php
index ef3cfb4b3..bdb512c52 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/SetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/SetupTeardown.php
@@ -10,14 +10,8 @@ use PHPUnit\Framework\TestCase;
 
 class SetupTeardown extends TestCase
 {
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected int $maxRow = 4;
diff --git a/tests/PhpSpreadsheetTests/Worksheet/ByColumnAndRowUndeprecatedTest.php b/tests/PhpSpreadsheetTests/Worksheet/ByColumnAndRowUndeprecatedTest.php
index 2209bc3ca..0a761ada0 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/ByColumnAndRowUndeprecatedTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/ByColumnAndRowUndeprecatedTest.php
@@ -14,7 +14,6 @@ use PHPUnit\Framework\TestCase;
 
 class ByColumnAndRowUndeprecatedTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/Worksheet/Table/SetupTeardown.php b/tests/PhpSpreadsheetTests/Worksheet/Table/SetupTeardown.php
index 192e76e4c..404874dcd 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/Table/SetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/Table/SetupTeardown.php
@@ -10,14 +10,8 @@ use PHPUnit\Framework\TestCase;
 
 class SetupTeardown extends TestCase
 {
-    /**
-     * @var ?Spreadsheet
-     */
     private ?Spreadsheet $spreadsheet = null;
 
-    /**
-     * @var ?Worksheet
-     */
     private ?Worksheet $sheet = null;
 
     protected int $maxRow = 4;
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php
index 23398bf06..1fe717efa 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php
@@ -12,10 +12,8 @@ use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
 
 class FormulaErrTest extends AbstractFunctional
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $reloadedSpreadsheet = null;
 
     private bool $allowThrow;
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
index 73e7239ce..ac814b8ce 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
@@ -11,7 +11,6 @@ use PHPUnit\Framework\TestCase;
 
 class ParserTest extends TestCase
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
index 253ea3039..a0296804b 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
@@ -14,7 +14,6 @@ class WorkbookTest extends TestCase
 {
     private Workbook $workbook;
 
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/CalculationErrorTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/CalculationErrorTest.php
index 85d246fb0..8a22768ff 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/CalculationErrorTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/CalculationErrorTest.php
@@ -11,10 +11,8 @@ use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
 
 class CalculationErrorTest extends AbstractFunctional
 {
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $reloadedSpreadsheet = null;
 
     protected function tearDown(): void
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
index c4d5b25e1..9c691f4c8 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
@@ -17,10 +17,8 @@ class LocaleFloatsTest extends AbstractFunctional
 
     private string $originalLocale;
 
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $spreadsheet = null;
 
-    /** @var ?Spreadsheet */
     private ?Spreadsheet $reloadedSpreadsheet = null;
 
     protected function setUp(): void