diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index b894ce138..a61afca18 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -23,4 +23,3 @@ parameters:
         - '~^Parameter \#2 \$src_im(age)? of function imagecopy expects (GdImage|resource), GdImage\|resource given\.$~'
         # Accept a bit anything for assert methods
         - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
-        - '~^Method PhpOffice\\PhpSpreadsheetTests\\.*\:\:test.*\(\) has parameter \$args with no type specified\.$~'
diff --git a/src/PhpSpreadsheet/Calculation/Database.php b/src/PhpSpreadsheet/Calculation/Database.php
index 017c57106..88733bbfc 100644
--- a/src/PhpSpreadsheet/Calculation/Database.php
+++ b/src/PhpSpreadsheet/Calculation/Database.php
@@ -25,7 +25,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -97,7 +97,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -132,7 +132,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -167,7 +167,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -202,7 +202,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -236,7 +236,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -271,7 +271,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -306,7 +306,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -340,7 +340,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -375,7 +375,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
@@ -410,7 +410,7 @@ class Database
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DAverage.php b/src/PhpSpreadsheet/Calculation/Database/DAverage.php
index 245e970d6..bb5efe864 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DAverage.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DAverage.php
@@ -19,7 +19,7 @@ class DAverage extends DatabaseAbstract
      *                          A database is a list of related data in which rows of related
      *                              information are records, and columns of data are fields. The
      *                              first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                              column label enclosed between double quotation marks, such as
      *                              "Age" or "Yield," or a number (without quotation marks) that
      *                              represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DCountA.php b/src/PhpSpreadsheet/Calculation/Database/DCountA.php
index 214c20b7b..2d4a7d68e 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DCountA.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DCountA.php
@@ -19,7 +19,7 @@ class DCountA extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DGet.php b/src/PhpSpreadsheet/Calculation/Database/DGet.php
index 5647cba5c..4a52f2e41 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DGet.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DGet.php
@@ -19,7 +19,7 @@ class DGet extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DMax.php b/src/PhpSpreadsheet/Calculation/Database/DMax.php
index 748fd2fc8..512557ccc 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DMax.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DMax.php
@@ -20,7 +20,7 @@ class DMax extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DMin.php b/src/PhpSpreadsheet/Calculation/Database/DMin.php
index 544cbffef..ce01a0deb 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DMin.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DMin.php
@@ -20,7 +20,7 @@ class DMin extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DProduct.php b/src/PhpSpreadsheet/Calculation/Database/DProduct.php
index 351ee6fc2..435271655 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DProduct.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DProduct.php
@@ -19,7 +19,7 @@ class DProduct extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DStDev.php b/src/PhpSpreadsheet/Calculation/Database/DStDev.php
index a1c56532f..05418d490 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DStDev.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DStDev.php
@@ -20,7 +20,7 @@ class DStDev extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DStDevP.php b/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
index 5bca4e723..927e29cec 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DStDevP.php
@@ -20,7 +20,7 @@ class DStDevP extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DSum.php b/src/PhpSpreadsheet/Calculation/Database/DSum.php
index ef4d10e80..aa8976bc8 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DSum.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DSum.php
@@ -19,7 +19,7 @@ class DSum extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DVar.php b/src/PhpSpreadsheet/Calculation/Database/DVar.php
index 9cfa97148..65161fc0f 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DVar.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DVar.php
@@ -20,7 +20,7 @@ class DVar extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DVarP.php b/src/PhpSpreadsheet/Calculation/Database/DVarP.php
index 67dbd6841..51ddcfeb9 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DVarP.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DVarP.php
@@ -20,7 +20,7 @@ class DVarP extends DatabaseAbstract
      *                                        A database is a list of related data in which rows of related
      *                                        information are records, and columns of data are fields. The
      *                                        first row of the list contains labels for each column.
-     * @param int|string $field Indicates which column is used in the function. Enter the
+     * @param null|int|string $field Indicates which column is used in the function. Enter the
      *                                        column label enclosed between double quotation marks, such as
      *                                        "Age" or "Yield," or a number (without quotation marks) that
      *                                        represents the position of the column within the list: 1 for
diff --git a/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php b/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
index 5a599ec7e..d8b0d2094 100644
--- a/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
+++ b/src/PhpSpreadsheet/Calculation/Database/DatabaseAbstract.php
@@ -10,7 +10,7 @@ abstract class DatabaseAbstract
 {
     /**
      * @param array $database
-     * @param int|string $field
+     * @param null|int|string $field
      * @param array $criteria
      *
      * @return null|float|int|string
diff --git a/tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.php b/tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.php
index a089ec24e..65244c5e6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.php
@@ -10,10 +10,8 @@ class ArrayFormulaTest extends TestCase
 {
     /**
      * @dataProvider providerArrayFormulae
-     *
-     * @param mixed $expectedResult
      */
-    public function testArrayFormula(string $formula, $expectedResult): void
+    public function testArrayFormula(string $formula, mixed $expectedResult): void
     {
         $result = Calculation::getInstance()->_calculateFormulaValue($formula);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php b/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php
index 29f9090a5..752c72e15 100644
--- a/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php
@@ -27,13 +27,10 @@ class BinaryComparisonTest extends TestCase
 
     /**
      * @dataProvider providerBinaryComparison
-     *
-     * @param mixed $operand1
-     * @param mixed $operand2
      */
     public function testBinaryComparisonOperation(
-        $operand1,
-        $operand2,
+        mixed $operand1,
+        mixed $operand2,
         string $operator,
         bool $expectedResultExcel,
         bool $expectedResultOpenOffice
diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php
index 3d7e93a63..d13d8c900 100644
--- a/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php
@@ -36,12 +36,8 @@ class CalculationFunctionListTest extends TestCase
 
     /**
      * @dataProvider providerGetFunctions
-     *
-     * @param string $category
-     * @param array|string $functionCall
-     * @param string $argumentCount
      */
-    public function testGetFunctions(/** @scrutinizer ignore-unused */ $category, $functionCall, /** @scrutinizer ignore-unused */ $argumentCount): void
+    public function testGetFunctions(/** @scrutinizer ignore-unused */ string $category, array|string $functionCall): void
     {
         self::assertIsCallable($functionCall);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php
index d72b6c06c..6363685bd 100644
--- a/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php
@@ -35,10 +35,8 @@ class CalculationSettingsTest extends TestCase
 
     /**
      * @dataProvider providerCanLoadAllSupportedLocales
-     *
-     * @param string $locale
      */
-    public function testCanLoadAllSupportedLocales($locale): void
+    public function testCanLoadAllSupportedLocales(string $locale): void
     {
         $calculation = Calculation::getInstance();
         self::assertTrue($calculation->setLocale($locale));
diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php
index 548e133e4..2aba97483 100644
--- a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php
@@ -38,12 +38,8 @@ class CalculationTest extends TestCase
 
     /**
      * @dataProvider providerBinaryComparisonOperation
-     *
-     * @param mixed $formula
-     * @param mixed $expectedResultExcel
-     * @param mixed $expectedResultOpenOffice
      */
-    public function testBinaryComparisonOperation($formula, $expectedResultExcel, $expectedResultOpenOffice): void
+    public function testBinaryComparisonOperation(mixed $formula, mixed $expectedResultExcel, mixed $expectedResultOpenOffice): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
         $resultExcel = Calculation::getInstance()->_calculateFormulaValue($formula);
@@ -358,9 +354,6 @@ class CalculationTest extends TestCase
     }
 
     /**
-     * @param mixed $expectedResult
-     * @param mixed $dataArray
-     * @param string $formula
      * @param string $cellCoordinates where to put the formula
      * @param string[] $shouldBeSetInCacheCells coordinates of cells that must
      *  be set in cache
@@ -370,12 +363,12 @@ class CalculationTest extends TestCase
      * @dataProvider dataProviderBranchPruningFullExecution
      */
     public function testFullExecutionDataPruning(
-        $expectedResult,
-        $dataArray,
-        $formula,
-        $cellCoordinates,
-        $shouldBeSetInCacheCells = [],
-        $shouldNotBeSetInCacheCells = []
+        mixed $expectedResult,
+        mixed $dataArray,
+        string $formula,
+        string $cellCoordinates,
+        array $shouldBeSetInCacheCells = [],
+        array $shouldNotBeSetInCacheCells = []
     ): void {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberSlashTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberSlashTest.php
index baaf32f27..2aef7837b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberSlashTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberSlashTest.php
@@ -30,10 +30,8 @@ class FormattedNumberSlashTest extends TestCase
 
     /**
      * @dataProvider providerNumbers
-     *
-     * @param mixed $expected
      */
-    public function testNumber($expected, string $value, string $thousandsSeparator = ',', string $decimalSeparator = '.'): void
+    public function testNumber(float $expected, string $value, string $thousandsSeparator = ',', string $decimalSeparator = '.'): void
     {
         StringHelper::setThousandsSeparator($thousandsSeparator);
         StringHelper::setDecimalSeparator($decimalSeparator);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberTest.php
index 72bbba919..669882948 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/FormattedNumberTest.php
@@ -10,10 +10,8 @@ class FormattedNumberTest extends TestCase
 {
     /**
      * @dataProvider providerNumbers
-     *
-     * @param mixed $expected
      */
-    public function testNumber($expected, string $value): void
+    public function testNumber(float $expected, string $value): void
     {
         FormattedNumber::convertToNumberIfFormatted($value);
         self::assertSame($expected, $value);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
index 229eec905..834865d96 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -26,10 +26,8 @@ class RangeTest extends TestCase
 
     /**
      * @dataProvider providerRangeEvaluation
-     *
-     * @param mixed $expectedResult
      */
-    public function testRangeEvaluation(string $formula, $expectedResult): void
+    public function testRangeEvaluation(string $formula, int|string $expectedResult): void
     {
         $workSheet = $this->spreadSheet->getActiveSheet();
         $workSheet->setCellValue('H1', $formula);
diff --git a/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php b/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php
index 40c453e75..91b1c5234 100644
--- a/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php
@@ -9,11 +9,8 @@ class FormulaAsStringTest extends TestCase
 {
     /**
      * @dataProvider providerFunctionsAsString
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testFunctionsAsString($expectedResult, $formula): void
+    public function testFunctionsAsString(mixed $expectedResult, string $formula): void
     {
         $spreadsheet = new Spreadsheet();
         $workSheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php
index 777469525..5d49069b9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php
@@ -9,13 +9,8 @@ class DAverageTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDAverage
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDAverage($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDAverage(int|float|string $expectedResult, array $database, string|int|null $field, array $criteria): void
     {
         $result = DAverage::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,11 +18,8 @@ class DAverageTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDAverage
-     *
-     * @param mixed $expectedResult
-     * @param int|string $field
      */
-    public function testDAverageAsWorksheetFormula($expectedResult, array $database, $field, array $criteria): void
+    public function testDAverageAsWorksheetFormula(int|float|string $expectedResult, array $database, string|int|null $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DAVERAGE', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php
index 0bbd0372a..f1b0483d9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php
@@ -9,13 +9,8 @@ class DCountATest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDCountA
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDCountA($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDCountA(int|string $expectedResult, array $database, string $field, array $criteria): void
     {
         $result = DCountA::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DCountATest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDCountA
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDCountAAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDCountAAsWorksheetFormula(int|string $expectedResult, array $database, string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DCOUNTA', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php
index a986e7004..01ab75b39 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php
@@ -9,13 +9,8 @@ class DCountTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDCount
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDCount($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDCount(int|string $expectedResult, array $database, string|int|null $field, array $criteria): void
     {
         $result = DCount::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DCountTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDCount
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDCountAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDCountAsWorksheetFormula(int|string $expectedResult, array $database, string|int|null $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DCOUNT', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php
index 24394c7d9..3b50a4ba3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php
@@ -9,13 +9,8 @@ class DGetTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDGet
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDGet($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDGet(string|int $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $result = DGet::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DGetTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDGet
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDGetAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDGetAsWorksheetFormula(string|int $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DGET', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php
index a4dc9f9e7..63fffd9fa 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php
@@ -9,13 +9,8 @@ class DMaxTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDMax
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDMax($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDMax(int|string $expectedResult, array $database, string|null|int $field, array $criteria): void
     {
         $result = DMax::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DMaxTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDMax
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDMaxAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDMaxAsWorksheetFormula(int|string $expectedResult, array $database, string|null|int $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DMAX', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php
index c3257d272..3095aae82 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php
@@ -9,13 +9,8 @@ class DMinTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDMin
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDMin($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDMin(int|float|string $expectedResult, array $database, string|null|int $field, array $criteria): void
     {
         $result = DMin::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DMinTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDMin
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDMinAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDMinAsWorksheetFormula(int|float|string $expectedResult, array $database, string|null|int $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DMIN', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php
index 6aca35b62..45fcd2316 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php
@@ -10,13 +10,8 @@ class DProductTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDProduct
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDProduct($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDProduct(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $result = DProduct::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -24,13 +19,8 @@ class DProductTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDProduct
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDProductAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDProductAsWorksheetFormula(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DPRODUCT', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php
index 1c7353573..681f92527 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php
@@ -9,13 +9,8 @@ class DStDevPTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDStDevP
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDStDevP($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDStDevP(float|int|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $result = DStDevP::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DStDevPTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDStDevP
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDStDevPAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDStDevPAsWorksheetFormula(float|int|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DSTDEVP', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php
index 7698e73ec..21b56a234 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php
@@ -9,13 +9,8 @@ class DStDevTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDStDev
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDStDev($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDStDev(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $result = DStDev::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DStDevTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDStDev
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDStDevAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDStDevAsWorksheetFormula(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DSTDEV', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php
index 6f16c3e65..1312c23f3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php
@@ -9,13 +9,8 @@ class DSumTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDSum
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDSum($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDSum(int|float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $result = DSum::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DSumTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDSum
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDSumAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDSumAsWorksheetFormula(int|float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DSUM', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php
index 3e12fd0a6..592ae985a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php
@@ -9,13 +9,8 @@ class DVarPTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDVarP
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDVarP($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDVarP(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $result = DVarP::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DVarPTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDVarP
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDVarPAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDVarPAsWorksheetFormula(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DVARP', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php
index da8c31c3d..cd415abb6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php
@@ -9,13 +9,8 @@ class DVarTest extends SetupTeardownDatabases
 {
     /**
      * @dataProvider providerDVar
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDirectCallToDVar($expectedResult, $database, $field, $criteria): void
+    public function testDirectCallToDVar(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $result = DVar::evaluate($database, $field, $criteria);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -23,13 +18,8 @@ class DVarTest extends SetupTeardownDatabases
 
     /**
      * @dataProvider providerDVar
-     *
-     * @param mixed $expectedResult
-     * @param mixed $database
-     * @param mixed $field
-     * @param mixed $criteria
      */
-    public function testDVarAsWorksheetFormula($expectedResult, $database, $field, $criteria): void
+    public function testDVarAsWorksheetFormula(float|string $expectedResult, array $database, ?string $field, array $criteria): void
     {
         $this->prepareWorksheetWithFormula('DVAR', $database, $field, $criteria);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php
index 9c79d9ae1..ff0b65293 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/SetupTeardownDatabases.php
@@ -132,10 +132,7 @@ class SetupTeardownDatabases extends TestCase
         return $this->sheet;
     }
 
-    /**
-     * @param int|string $field
-     */
-    public function prepareWorksheetWithFormula(string $functionName, array $database, $field, array $criteria): void
+    public function prepareWorksheetWithFormula(string $functionName, array $database, null|int|string $field, array $criteria): void
     {
         $sheet = $this->getSheet();
         $maxCol = '';
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateDifTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateDifTest.php
index d4218c4e9..fd0073419 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateDifTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateDifTest.php
@@ -18,10 +18,8 @@ class DateDifTest extends TestCase
 {
     /**
      * @dataProvider providerDATEDIF
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDATEDIF($expectedResult, string ...$args): void
+    public function testDirectCallToDATEDIF(array|int|string $expectedResult, string ...$args): void
     {
         $result = Difference::interval(...$args);
         self::assertSame($expectedResult, $result);
@@ -29,10 +27,8 @@ class DateDifTest extends TestCase
 
     /**
      * @dataProvider providerDATEDIF
-     *
-     * @param mixed $expectedResult
      */
-    public function testDATEDIFAsFormula($expectedResult, ...$args): void
+    public function testDATEDIFAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -45,10 +41,8 @@ class DateDifTest extends TestCase
 
     /**
      * @dataProvider providerDATEDIF
-     *
-     * @param mixed $expectedResult
      */
-    public function testDATEDIFInWorksheet($expectedResult, ...$args): void
+    public function testDATEDIFInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -73,7 +67,7 @@ class DateDifTest extends TestCase
     /**
      * @dataProvider providerUnhappyDATEDIF
      */
-    public function testDATEDIFUnhappyPath(string $expectedException, ...$args): void
+    public function testDATEDIFUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php
index 0386056e8..393c3232b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php
@@ -42,10 +42,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDATE($expectedResult, ...$args): void
+    public function testDirectCallToDATE(mixed $expectedResult, mixed ...$args): void
     {
         $result = Date::fromYMD(...$args);
         self::assertSame($expectedResult, $result);
@@ -53,10 +51,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDATEAsFormula($expectedResult, ...$args): void
+    public function testDATEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -69,10 +65,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDATEInWorksheet($expectedResult, ...$args): void
+    public function testDATEInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -97,7 +91,7 @@ class DateTest extends TestCase
     /**
      * @dataProvider providerUnhappyDATE
      */
-    public function testDATEUnhappyPath(string $expectedException, ...$args): void
+    public function testDATEUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php
index 9c5abb410..987cc3d0d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateValueTest.php
@@ -57,10 +57,8 @@ class DateValueTest extends TestCase
 
     /**
      * @dataProvider providerDATEVALUE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDATEVALUE($expectedResult, ...$args): void
+    public function testDirectCallToDATEVALUE(mixed $expectedResult, mixed ...$args): void
     {
         if ($this->expectationIsTemplate($expectedResult)) {
             $expectedResult = $this->parseTemplatedExpectation($expectedResult);
@@ -73,10 +71,8 @@ class DateValueTest extends TestCase
 
     /**
      * @dataProvider providerDATEVALUE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDATEVALUEAsFormula($expectedResult, ...$args): void
+    public function testDATEVALUEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         if ($this->expectationIsTemplate($expectedResult)) {
             $expectedResult = $this->parseTemplatedExpectation($expectedResult);
@@ -93,10 +89,8 @@ class DateValueTest extends TestCase
 
     /**
      * @dataProvider providerDATEVALUE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDATEVALUEInWorksheet($expectedResult, ...$args): void
+    public function testDATEVALUEInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         if ($this->expectationIsTemplate($expectedResult)) {
             $expectedResult = $this->parseTemplatedExpectation($expectedResult);
@@ -134,7 +128,7 @@ class DateValueTest extends TestCase
     /**
      * @dataProvider providerUnhappyDATEVALUE
      */
-    public function testDATEVALUEUnhappyPath(string $expectedException, ...$args): void
+    public function testDATEVALUEUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php
index feeab4672..657984335 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php
@@ -33,10 +33,8 @@ class DayTest extends TestCase
 
     /**
      * @dataProvider providerDAY
-     *
-     * @param mixed $expectedResultExcel
      */
-    public function testDirectCallToDAY($expectedResultExcel, ...$args): void
+    public function testDirectCallToDAY(mixed $expectedResultExcel, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = DateParts::day(...$args);
@@ -45,10 +43,8 @@ class DayTest extends TestCase
 
     /**
      * @dataProvider providerDAY
-     *
-     * @param mixed $expectedResultExcel
      */
-    public function testDAYAsFormula($expectedResultExcel, ...$args): void
+    public function testDAYAsFormula(mixed $expectedResultExcel, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -61,10 +57,8 @@ class DayTest extends TestCase
 
     /**
      * @dataProvider providerDAY
-     *
-     * @param mixed $expectedResult
      */
-    public function testDAYInWorksheet($expectedResult, ...$args): void
+    public function testDAYInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -88,10 +82,8 @@ class DayTest extends TestCase
 
     /**
      * @dataProvider providerDAYOpenOffice
-     *
-     * @param mixed $expectedResultOpenOffice
      */
-    public function testDirectCallToDAYOpenOffice($expectedResultOpenOffice, ...$args): void
+    public function testDirectCallToDAYOpenOffice(mixed $expectedResultOpenOffice, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
@@ -102,10 +94,8 @@ class DayTest extends TestCase
 
     /**
      * @dataProvider providerDAYOpenOffice
-     *
-     * @param mixed $expectedResultOpenOffice
      */
-    public function testDAYAsFormulaOpenOffice($expectedResultOpenOffice, ...$args): void
+    public function testDAYAsFormulaOpenOffice(mixed $expectedResultOpenOffice, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
@@ -126,7 +116,7 @@ class DayTest extends TestCase
     /**
      * @dataProvider providerUnhappyDAY
      */
-    public function testDAYUnhappyPath(string $expectedException, ...$args): void
+    public function testDAYUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/Days360Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/Days360Test.php
index 084209eb1..4b5569db5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/Days360Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/Days360Test.php
@@ -18,10 +18,8 @@ class Days360Test extends TestCase
 {
     /**
      * @dataProvider providerDAYS360
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDAYS360($expectedResult, ...$args): void
+    public function testDirectCallToDAYS360(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Days360::between(...$args);
@@ -30,10 +28,8 @@ class Days360Test extends TestCase
 
     /**
      * @dataProvider providerDAYS360
-     *
-     * @param mixed $expectedResult
      */
-    public function testDAYS360AsFormula($expectedResult, ...$args): void
+    public function testDAYS360AsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -46,10 +42,8 @@ class Days360Test extends TestCase
 
     /**
      * @dataProvider providerDAYS360
-     *
-     * @param mixed $expectedResult
      */
-    public function testDAYS360InWorksheet($expectedResult, ...$args): void
+    public function testDAYS360InWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -74,7 +68,7 @@ class Days360Test extends TestCase
     /**
      * @dataProvider providerUnhappyDAYS360
      */
-    public function testDAYS360UnhappyPath(string $expectedException, ...$args): void
+    public function testDAYS360UnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DaysTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DaysTest.php
index 783bec8e7..3cf3ba725 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DaysTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DaysTest.php
@@ -17,10 +17,8 @@ class DaysTest extends TestCase
 {
     /**
      * @dataProvider providerDAYS
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDAYS($expectedResult, ...$args): void
+    public function testDirectCallToDAYS(mixed $expectedResult, mixed ...$args): void
     {
         $result = Days::between(...$args);
         self::assertSame($expectedResult, $result);
@@ -28,10 +26,8 @@ class DaysTest extends TestCase
 
     /**
      * @dataProvider providerDAYS
-     *
-     * @param mixed $expectedResult
      */
-    public function testDAYSAsFormula($expectedResult, ...$args): void
+    public function testDAYSAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -44,10 +40,8 @@ class DaysTest extends TestCase
 
     /**
      * @dataProvider providerDAYS
-     *
-     * @param mixed $expectedResult
      */
-    public function testDAYSInWorksheet($expectedResult, ...$args): void
+    public function testDAYSInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -72,7 +66,7 @@ class DaysTest extends TestCase
     /**
      * @dataProvider providerUnhappyDAYS
      */
-    public function testDAYSUnhappyPath(string $expectedException, ...$args): void
+    public function testDAYSUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php
index 7f1a0fdac..6788ad196 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EDateTest.php
@@ -33,10 +33,8 @@ class EDateTest extends TestCase
 
     /**
      * @dataProvider providerEDATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToEDATE($expectedResult, ...$args): void
+    public function testDirectCallToEDATE(mixed $expectedResult, mixed ...$args): void
     {
         $result = Month::adjust(...$args);
         self::assertSame($expectedResult, $result);
@@ -44,10 +42,8 @@ class EDateTest extends TestCase
 
     /**
      * @dataProvider providerEDATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testEDATEAsFormula($expectedResult, ...$args): void
+    public function testEDATEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -60,10 +56,8 @@ class EDateTest extends TestCase
 
     /**
      * @dataProvider providerEDATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testEDATEInWorksheet($expectedResult, ...$args): void
+    public function testEDATEInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -88,7 +82,7 @@ class EDateTest extends TestCase
     /**
      * @dataProvider providerUnhappyEDATE
      */
-    public function testEDATEUnhappyPath(string $expectedException, ...$args): void
+    public function testEDATEUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php
index 0f09e684e..762c94aca 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/EoMonthTest.php
@@ -33,10 +33,8 @@ class EoMonthTest extends TestCase
 
     /**
      * @dataProvider providerEOMONTH
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToEOMONTH($expectedResult, ...$args): void
+    public function testDirectCallToEOMONTH(mixed $expectedResult, mixed ...$args): void
     {
         $result = Month::lastDay(...$args);
         self::assertSame($expectedResult, $result);
@@ -44,10 +42,8 @@ class EoMonthTest extends TestCase
 
     /**
      * @dataProvider providerEOMONTH
-     *
-     * @param mixed $expectedResult
      */
-    public function testEOMONTHAsFormula($expectedResult, ...$args): void
+    public function testEOMONTHAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -60,10 +56,8 @@ class EoMonthTest extends TestCase
 
     /**
      * @dataProvider providerEOMONTH
-     *
-     * @param mixed $expectedResult
      */
-    public function testEOMONTHInWorksheet($expectedResult, ...$args): void
+    public function testEOMONTHInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -88,7 +82,7 @@ class EoMonthTest extends TestCase
     /**
      * @dataProvider providerUnhappyEOMONTH
      */
-    public function testEOMONTHUnhappyPath(string $expectedException, ...$args): void
+    public function testEOMONTHUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/HourTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/HourTest.php
index 5e0b1478b..c26d685cb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/HourTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/HourTest.php
@@ -13,10 +13,8 @@ class HourTest extends TestCase
 {
     /**
      * @dataProvider providerHOUR
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToHOUR($expectedResult, ...$args): void
+    public function testDirectCallToHOUR(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = TimeParts::hour(...$args);
@@ -25,10 +23,8 @@ class HourTest extends TestCase
 
     /**
      * @dataProvider providerHOUR
-     *
-     * @param mixed $expectedResult
      */
-    public function testHOURAsFormula($expectedResult, ...$args): void
+    public function testHOURAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -41,10 +37,8 @@ class HourTest extends TestCase
 
     /**
      * @dataProvider providerHOUR
-     *
-     * @param mixed $expectedResult
      */
-    public function testHOURInWorksheet($expectedResult, ...$args): void
+    public function testHOURInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -69,7 +63,7 @@ class HourTest extends TestCase
     /**
      * @dataProvider providerUnhappyHOUR
      */
-    public function testHOURUnhappyPath(string $expectedException, ...$args): void
+    public function testHOURUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php
index 867096efd..0d9aece43 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/IsoWeekNumTest.php
@@ -33,11 +33,8 @@ class IsoWeekNumTest extends TestCase
 
     /**
      * @dataProvider providerISOWEEKNUM
-     *
-     * @param mixed $expectedResult
-     * @param mixed ...$args
      */
-    public function testDirectCallToISOWEEKNUM($expectedResult, ...$args): void
+    public function testDirectCallToISOWEEKNUM(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Week::isoWeekNumber(...$args);
@@ -46,11 +43,8 @@ class IsoWeekNumTest extends TestCase
 
     /**
      * @dataProvider providerISOWEEKNUM
-     *
-     * @param mixed $expectedResult
-     * @param mixed ...$args
      */
-    public function testISOWEEKNUMAsFormula($expectedResult, ...$args): void
+    public function testISOWEEKNUMAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +57,8 @@ class IsoWeekNumTest extends TestCase
 
     /**
      * @dataProvider providerISOWEEKNUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testISOWEEKNUMInWorksheet($expectedResult, ...$args): void
+    public function testISOWEEKNUMInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +83,7 @@ class IsoWeekNumTest extends TestCase
     /**
      * @dataProvider providerUnhappyISOWEEKNUM
      */
-    public function testISOWEEKNUMUnhappyPath(string $expectedException, ...$args): void
+    public function testISOWEEKNUMUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +110,8 @@ class IsoWeekNumTest extends TestCase
 
     /**
      * @dataProvider providerISOWEEKNUM1904
-     *
-     * @param mixed $expectedResult
      */
-    public function testISOWEEKNUMWith1904Calendar($expectedResult, ...$args): void
+    public function testISOWEEKNUMWith1904Calendar(mixed $expectedResult, mixed ...$args): void
     {
         SharedDate::setExcelCalendar(SharedDate::CALENDAR_MAC_1904);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MinuteTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MinuteTest.php
index f3db66043..c6035a690 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MinuteTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MinuteTest.php
@@ -13,10 +13,8 @@ class MinuteTest extends TestCase
 {
     /**
      * @dataProvider providerMINUTE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToMINUTE($expectedResult, ...$args): void
+    public function testDirectCallToMINUTE(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = TimeParts::MINUTE(...$args);
@@ -25,10 +23,8 @@ class MinuteTest extends TestCase
 
     /**
      * @dataProvider providerMINUTE
-     *
-     * @param mixed $expectedResult
      */
-    public function testMINUTEAsFormula($expectedResult, ...$args): void
+    public function testMINUTEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -41,10 +37,8 @@ class MinuteTest extends TestCase
 
     /**
      * @dataProvider providerMINUTE
-     *
-     * @param mixed $expectedResult
      */
-    public function testMINUTEInWorksheet($expectedResult, ...$args): void
+    public function testMINUTEInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -69,7 +63,7 @@ class MinuteTest extends TestCase
     /**
      * @dataProvider providerUnhappyMINUTE
      */
-    public function testMINUTEUnhappyPath(string $expectedException, ...$args): void
+    public function testMINUTEUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MonthTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MonthTest.php
index 0b3cabee7..8ab199f7a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MonthTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/MonthTest.php
@@ -13,10 +13,8 @@ class MonthTest extends TestCase
 {
     /**
      * @dataProvider providerMONTH
-     *
-     * @param mixed $expectedResultExcel
      */
-    public function testDirectCallToMONTH($expectedResultExcel, ...$args): void
+    public function testDirectCallToMONTH(mixed $expectedResultExcel, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = DateParts::month(...$args);
@@ -25,10 +23,8 @@ class MonthTest extends TestCase
 
     /**
      * @dataProvider providerMONTH
-     *
-     * @param mixed $expectedResult
      */
-    public function testMONTHAsFormula($expectedResult, ...$args): void
+    public function testMONTHAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -41,10 +37,8 @@ class MonthTest extends TestCase
 
     /**
      * @dataProvider providerMONTH
-     *
-     * @param mixed $expectedResult
      */
-    public function testMONTHInWorksheet($expectedResult, ...$args): void
+    public function testMONTHInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -69,7 +63,7 @@ class MonthTest extends TestCase
     /**
      * @dataProvider providerUnhappyMONTH
      */
-    public function testMONTHUnhappyPath(string $expectedException, ...$args): void
+    public function testMONTHUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NetworkDaysTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NetworkDaysTest.php
index b088014d9..09427eaad 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NetworkDaysTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NetworkDaysTest.php
@@ -12,10 +12,8 @@ class NetworkDaysTest extends TestCase
 {
     /**
      * @dataProvider providerNETWORKDAYS
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToNETWORKDAYS($expectedResult, ...$args): void
+    public function testDirectCallToNETWORKDAYS(mixed $expectedResult, mixed ...$args): void
     {
         $result = NetworkDays::count(...$args);
         self::assertSame($expectedResult, $result);
@@ -23,10 +21,8 @@ class NetworkDaysTest extends TestCase
 
     /**
      * @dataProvider providerNETWORKDAYS
-     *
-     * @param mixed $expectedResult
      */
-    public function testNETWORKDAYSAsFormula($expectedResult, ...$args): void
+    public function testNETWORKDAYSAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -39,10 +35,8 @@ class NetworkDaysTest extends TestCase
 
     /**
      * @dataProvider providerNETWORKDAYS
-     *
-     * @param mixed $expectedResult
      */
-    public function testNETWORKDAYSInWorksheet($expectedResult, ...$args): void
+    public function testNETWORKDAYSInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,7 +61,7 @@ class NetworkDaysTest extends TestCase
     /**
      * @dataProvider providerUnhappyNETWORKDAYS
      */
-    public function testNETWORKDAYSUnhappyPath(string $expectedException, ...$args): void
+    public function testNETWORKDAYSUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NowTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NowTest.php
index e9fdd7293..c58ed2556 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NowTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/NowTest.php
@@ -11,10 +11,7 @@ use PHPUnit\Framework\TestCase;
 
 class NowTest extends TestCase
 {
-    /**
-     * @param mixed $result
-     */
-    private function assertions(DateTimeImmutable $dtStart, $result): void
+    private function assertions(DateTimeImmutable $dtStart, mixed $result): void
     {
         self::assertEquals($dtStart->format('Y'), DateParts::year($result));
         self::assertEquals($dtStart->format('m'), DateParts::month($result));
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/SecondTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/SecondTest.php
index b74af2c48..e8a048493 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/SecondTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/SecondTest.php
@@ -12,10 +12,8 @@ class SecondTest extends TestCase
 {
     /**
      * @dataProvider providerSECOND
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToSECOND($expectedResult, ...$args): void
+    public function testDirectCallToSECOND(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = TimeParts::second(...$args);
@@ -24,10 +22,8 @@ class SecondTest extends TestCase
 
     /**
      * @dataProvider providerSECOND
-     *
-     * @param mixed $expectedResult
      */
-    public function testSECONDAsFormula($expectedResult, ...$args): void
+    public function testSECONDAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class SecondTest extends TestCase
 
     /**
      * @dataProvider providerSECOND
-     *
-     * @param mixed $expectedResult
      */
-    public function testSECONDInWorksheet($expectedResult, ...$args): void
+    public function testSECONDInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class SecondTest extends TestCase
     /**
      * @dataProvider providerUnhappySECOND
      */
-    public function testSECONDUnhappyPath(string $expectedException, ...$args): void
+    public function testSECONDUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php
index ea3c6b802..2a8f127f9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeTest.php
@@ -42,10 +42,8 @@ class TimeTest extends TestCase
 
     /**
      * @dataProvider providerTIME
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToTIME($expectedResult, ...$args): void
+    public function testDirectCallToTIME(mixed $expectedResult, mixed ...$args): void
     {
         $result = Time::fromHMS(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
@@ -53,10 +51,8 @@ class TimeTest extends TestCase
 
     /**
      * @dataProvider providerTIME
-     *
-     * @param mixed $expectedResult
      */
-    public function testTIMEAsFormula($expectedResult, ...$args): void
+    public function testTIMEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -75,7 +71,7 @@ class TimeTest extends TestCase
     /**
      * @dataProvider providerUnhappyTIME
      */
-    public function testTIMEUnhappyPath(string $expectedException, ...$args): void
+    public function testTIMEUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php
index b3f5ee5cf..c7856f9a4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TimeValueTest.php
@@ -33,10 +33,8 @@ class TimeValueTest extends TestCase
 
     /**
      * @dataProvider providerTIMEVALUE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToTIMEVALUE($expectedResult, ...$args): void
+    public function testDirectCallToTIMEVALUE(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = TimeValue::fromString(...$args);
@@ -45,10 +43,8 @@ class TimeValueTest extends TestCase
 
     /**
      * @dataProvider providerTIMEVALUE
-     *
-     * @param mixed $expectedResult
      */
-    public function testTIMEVALUEAsFormula($expectedResult, ...$args): void
+    public function testTIMEVALUEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -61,10 +57,8 @@ class TimeValueTest extends TestCase
 
     /**
      * @dataProvider providerTIMEVALUE
-     *
-     * @param mixed $expectedResult
      */
-    public function testTIMEVALUEInWorksheet($expectedResult, ...$args): void
+    public function testTIMEVALUEInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -120,7 +114,7 @@ class TimeValueTest extends TestCase
     /**
      * @dataProvider providerUnhappyTIMEVALUE
      */
-    public function testTIMEVALUEUnhappyPath(string $expectedException, ...$args): void
+    public function testTIMEVALUEUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TodayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TodayTest.php
index fb9f4f598..10152e72a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TodayTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/TodayTest.php
@@ -11,10 +11,7 @@ use PHPUnit\Framework\TestCase;
 
 class TodayTest extends TestCase
 {
-    /**
-     * @param mixed $result
-     */
-    private function assertions(DateTimeImmutable $dtStart, $result): void
+    private function assertions(DateTimeImmutable $dtStart, mixed $result): void
     {
         self::assertEquals($dtStart->format('Y'), DateParts::year($result));
         self::assertEquals($dtStart->format('m'), DateParts::month($result));
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php
index 90974215a..ee37f6450 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekDayTest.php
@@ -32,10 +32,8 @@ class WeekDayTest extends TestCase
 
     /**
      * @dataProvider providerWEEKDAY
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToWEEKDAY($expectedResult, ...$args): void
+    public function testDirectCallToWEEKDAY(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Week::day(...$args);
@@ -44,10 +42,8 @@ class WeekDayTest extends TestCase
 
     /**
      * @dataProvider providerWEEKDAY
-     *
-     * @param mixed $expectedResult
      */
-    public function testWEEKDAYAsFormula($expectedResult, ...$args): void
+    public function testWEEKDAYAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -60,10 +56,8 @@ class WeekDayTest extends TestCase
 
     /**
      * @dataProvider providerWEEKDAY
-     *
-     * @param mixed $expectedResult
      */
-    public function testWEEKDAYInWorksheet($expectedResult, ...$args): void
+    public function testWEEKDAYInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -88,7 +82,7 @@ class WeekDayTest extends TestCase
     /**
      * @dataProvider providerUnhappyWEEKDAY
      */
-    public function testWEEKDAYUnhappyPath(string $expectedException, ...$args): void
+    public function testWEEKDAYUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php
index 35b8116e5..0a0dd4cad 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WeekNumTest.php
@@ -33,10 +33,8 @@ class WeekNumTest extends TestCase
 
     /**
      * @dataProvider providerWEEKNUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToWEEKNUM($expectedResult, ...$args): void
+    public function testDirectCallToWEEKNUM(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Week::number(...$args);
@@ -45,10 +43,8 @@ class WeekNumTest extends TestCase
 
     /**
      * @dataProvider providerWEEKNUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testWEEKNUMAsFormula($expectedResult, ...$args): void
+    public function testWEEKNUMAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -61,10 +57,8 @@ class WeekNumTest extends TestCase
 
     /**
      * @dataProvider providerWEEKNUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testWEEKNUMInWorksheet($expectedResult, ...$args): void
+    public function testWEEKNUMInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -89,7 +83,7 @@ class WeekNumTest extends TestCase
     /**
      * @dataProvider providerUnhappyWEEKNUM
      */
-    public function testWEEKNUMUnhappyPath(string $expectedException, ...$args): void
+    public function testWEEKNUMUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -116,10 +110,8 @@ class WeekNumTest extends TestCase
 
     /**
      * @dataProvider providerWEEKNUM1904
-     *
-     * @param mixed $expectedResult
      */
-    public function testWEEKNUMWith1904Calendar($expectedResult, ...$args): void
+    public function testWEEKNUMWith1904Calendar(mixed $expectedResult, mixed ...$args): void
     {
         SharedDate::setExcelCalendar(SharedDate::CALENDAR_MAC_1904);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WorkDayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WorkDayTest.php
index 031dff235..f18a0fdaf 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WorkDayTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WorkDayTest.php
@@ -12,10 +12,8 @@ class WorkDayTest extends TestCase
 {
     /**
      * @dataProvider providerWORKDAY
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToWORKDAY($expectedResult, ...$args): void
+    public function testDirectCallToWORKDAY(mixed $expectedResult, mixed ...$args): void
     {
         $result = WorkDay::date(...$args);
         self::assertSame($expectedResult, $result);
@@ -23,10 +21,8 @@ class WorkDayTest extends TestCase
 
     /**
      * @dataProvider providerWORKDAY
-     *
-     * @param mixed $expectedResult
      */
-    public function testWORKDAYAsFormula($expectedResult, ...$args): void
+    public function testWORKDAYAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -39,10 +35,8 @@ class WorkDayTest extends TestCase
 
     /**
      * @dataProvider providerWORKDAY
-     *
-     * @param mixed $expectedResult
      */
-    public function testWORKDAYInWorksheet($expectedResult, ...$args): void
+    public function testWORKDAYInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,7 +61,7 @@ class WorkDayTest extends TestCase
     /**
      * @dataProvider providerUnhappyWORKDAY
      */
-    public function testWORKDAYUnhappyPath(string $expectedException, ...$args): void
+    public function testWORKDAYUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearFracTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearFracTest.php
index 53b6341af..216849058 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearFracTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearFracTest.php
@@ -13,10 +13,8 @@ class YearFracTest extends TestCase
 {
     /**
      * @dataProvider providerYEARFRAC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToYEARFRAC($expectedResult, ...$args): void
+    public function testDirectCallToYEARFRAC(mixed $expectedResult, mixed ...$args): void
     {
         $result = YearFrac::fraction(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-6);
@@ -24,10 +22,8 @@ class YearFracTest extends TestCase
 
     /**
      * @dataProvider providerYEARFRAC
-     *
-     * @param mixed $expectedResult
      */
-    public function testYEARFRACAsFormula($expectedResult, ...$args): void
+    public function testYEARFRACAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class YearFracTest extends TestCase
 
     /**
      * @dataProvider providerYEARFRAC
-     *
-     * @param mixed $expectedResult
      */
-    public function testYEARFRACInWorksheet($expectedResult, ...$args): void
+    public function testYEARFRACInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class YearFracTest extends TestCase
     /**
      * @dataProvider providerUnhappyYEARFRAC
      */
-    public function testYEARFRACUnhappyPath(string $expectedException, ...$args): void
+    public function testYEARFRACUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearTest.php
index 192878c67..90037490d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/YearTest.php
@@ -12,10 +12,8 @@ class YearTest extends TestCase
 {
     /**
      * @dataProvider providerYEAR
-     *
-     * @param mixed $expectedResultExcel
      */
-    public function testDirectCallToYEAR($expectedResultExcel, ...$args): void
+    public function testDirectCallToYEAR(mixed $expectedResultExcel, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = DateParts::year(...$args);
@@ -24,10 +22,8 @@ class YearTest extends TestCase
 
     /**
      * @dataProvider providerYEAR
-     *
-     * @param mixed $expectedResult
      */
-    public function testYEARAsFormula($expectedResult, ...$args): void
+    public function testYEARAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class YearTest extends TestCase
 
     /**
      * @dataProvider providerYEAR
-     *
-     * @param mixed $expectedResult
      */
-    public function testYEARInWorksheet($expectedResult, ...$args): void
+    public function testYEARInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class YearTest extends TestCase
     /**
      * @dataProvider providerUnhappyYEAR
      */
-    public function testYEARUnhappyPath(string $expectedException, ...$args): void
+    public function testYEARUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DeprecatedExcelErrorTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DeprecatedExcelErrorTest.php
index 26e8ad77a..cd31177b6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DeprecatedExcelErrorTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DeprecatedExcelErrorTest.php
@@ -10,10 +10,8 @@ class DeprecatedExcelErrorTest extends TestCase
 {
     /**
      * @dataProvider providerDeprecatedExcelError
-     *
-     * @param mixed $expectedResult
      */
-    public function testDeprecatedExcelError(callable $deprecatedMethod, $expectedResult): void
+    public function testDeprecatedExcelError(callable $deprecatedMethod, mixed $expectedResult): void
     {
         $result = $deprecatedMethod();
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselITest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselITest.php
index a80954a36..ebf88d6a3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselITest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselITest.php
@@ -15,10 +15,8 @@ class BesselITest extends TestCase
 
     /**
      * @dataProvider providerBESSELI
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBESSELI($expectedResult, ...$args): void
+    public function testDirectCallToBESSELI(mixed $expectedResult, mixed ...$args): void
     {
         $result = BesselI::besselI(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, self::BESSEL_PRECISION);
@@ -26,10 +24,8 @@ class BesselITest extends TestCase
 
     /**
      * @dataProvider providerBESSELI
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELIAsFormula($expectedResult, ...$args): void
+    public function testBESSELIAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -42,10 +38,8 @@ class BesselITest extends TestCase
 
     /**
      * @dataProvider providerBESSELI
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELIInWorksheet($expectedResult, ...$args): void
+    public function testBESSELIInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -70,7 +64,7 @@ class BesselITest extends TestCase
     /**
      * @dataProvider providerUnhappyBESSELI
      */
-    public function testBESSELIUnhappyPath(string $expectedException, ...$args): void
+    public function testBESSELIUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselJTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselJTest.php
index 1698c8ad7..93ee38dbf 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselJTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselJTest.php
@@ -15,10 +15,8 @@ class BesselJTest extends TestCase
 
     /**
      * @dataProvider providerBESSELJ
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBESSELJ($expectedResult, ...$args): void
+    public function testDirectCallToBESSELJ(mixed $expectedResult, mixed ...$args): void
     {
         $result = BesselJ::besselJ(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, self::BESSEL_PRECISION);
@@ -26,10 +24,8 @@ class BesselJTest extends TestCase
 
     /**
      * @dataProvider providerBESSELJ
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELJAsFormula($expectedResult, ...$args): void
+    public function testBESSELJAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -42,10 +38,8 @@ class BesselJTest extends TestCase
 
     /**
      * @dataProvider providerBESSELJ
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELJInWorksheet($expectedResult, ...$args): void
+    public function testBESSELJInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -70,7 +64,7 @@ class BesselJTest extends TestCase
     /**
      * @dataProvider providerUnhappyBESSELJ
      */
-    public function testBESSELJUnhappyPath(string $expectedException, ...$args): void
+    public function testBESSELJUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselKTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselKTest.php
index 7716ab936..e1f8b60de 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselKTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselKTest.php
@@ -15,10 +15,8 @@ class BesselKTest extends TestCase
 
     /**
      * @dataProvider providerBESSELK
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBESSELK($expectedResult, ...$args): void
+    public function testDirectCallToBESSELK(mixed $expectedResult, mixed ...$args): void
     {
         $result = BesselK::besselK(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, self::BESSEL_PRECISION);
@@ -26,10 +24,8 @@ class BesselKTest extends TestCase
 
     /**
      * @dataProvider providerBESSELK
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELKAsFormula($expectedResult, ...$args): void
+    public function testBESSELKAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -42,10 +38,8 @@ class BesselKTest extends TestCase
 
     /**
      * @dataProvider providerBESSELK
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELKInWorksheet($expectedResult, ...$args): void
+    public function testBESSELKInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -70,7 +64,7 @@ class BesselKTest extends TestCase
     /**
      * @dataProvider providerUnhappyBESSELK
      */
-    public function testBESSELKUnhappyPath(string $expectedException, ...$args): void
+    public function testBESSELKUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselYTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselYTest.php
index 358ffe0a6..f4188173f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselYTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BesselYTest.php
@@ -15,10 +15,8 @@ class BesselYTest extends TestCase
 
     /**
      * @dataProvider providerBESSELY
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBESSELY($expectedResult, ...$args): void
+    public function testDirectCallToBESSELY(mixed $expectedResult, mixed ...$args): void
     {
         $result = BesselY::besselY(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, self::BESSEL_PRECISION);
@@ -26,10 +24,8 @@ class BesselYTest extends TestCase
 
     /**
      * @dataProvider providerBESSELY
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELYAsFormula($expectedResult, ...$args): void
+    public function testBESSELYAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -42,10 +38,8 @@ class BesselYTest extends TestCase
 
     /**
      * @dataProvider providerBESSELY
-     *
-     * @param mixed $expectedResult
      */
-    public function testBESSELYInWorksheet($expectedResult, ...$args): void
+    public function testBESSELYInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -70,7 +64,7 @@ class BesselYTest extends TestCase
     /**
      * @dataProvider providerUnhappyBESSELY
      */
-    public function testBESSELYUnhappyPath(string $expectedException, ...$args): void
+    public function testBESSELYUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php
index 1c096bd10..a79907fa8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2DecTest.php
@@ -30,10 +30,8 @@ class Bin2DecTest extends TestCase
 
     /**
      * @dataProvider providerBIN2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBIN2DEC($expectedResult, ...$args): void
+    public function testDirectCallToBIN2DEC(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertBinary::toDecimal(...$args);
@@ -47,10 +45,8 @@ class Bin2DecTest extends TestCase
 
     /**
      * @dataProvider providerBIN2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2DECAsFormula($expectedResult, ...$args): void
+    public function testBIN2DECAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Bin2DecTest extends TestCase
 
     /**
      * @dataProvider providerBIN2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2DECInWorksheet($expectedResult, ...$args): void
+    public function testBIN2DECInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Bin2DecTest extends TestCase
     /**
      * @dataProvider providerUnhappyBIN2DEC
      */
-    public function testBIN2DECUnhappyPath(string $expectedException, ...$args): void
+    public function testBIN2DECUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Bin2DecTest extends TestCase
 
     /**
      * @dataProvider providerBIN2DECOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2DECOds($expectedResult, ...$args): void
+    public function testBIN2DECOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php
index ecb40132c..ad2d8ac18 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2HexTest.php
@@ -30,10 +30,8 @@ class Bin2HexTest extends TestCase
 
     /**
      * @dataProvider providerBIN2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBIN2HEX($expectedResult, ...$args): void
+    public function testDirectCallToBIN2HEX(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertBinary::toHex(...$args);
@@ -47,10 +45,8 @@ class Bin2HexTest extends TestCase
 
     /**
      * @dataProvider providerBIN2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2HEXAsFormula($expectedResult, ...$args): void
+    public function testBIN2HEXAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Bin2HexTest extends TestCase
 
     /**
      * @dataProvider providerBIN2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2HEXInWorksheet($expectedResult, ...$args): void
+    public function testBIN2HEXInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Bin2HexTest extends TestCase
     /**
      * @dataProvider providerUnhappyBIN2HEX
      */
-    public function testBIN2HEXUnhappyPath(string $expectedException, ...$args): void
+    public function testBIN2HEXUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Bin2HexTest extends TestCase
 
     /**
      * @dataProvider providerBIN2HEXOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2HEXOds($expectedResult, ...$args): void
+    public function testBIN2HEXOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php
index 95d9bcaab..11e05eedb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Bin2OctTest.php
@@ -30,10 +30,8 @@ class Bin2OctTest extends TestCase
 
     /**
      * @dataProvider providerBIN2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBIN2OCT($expectedResult, ...$args): void
+    public function testDirectCallToBIN2OCT(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertBinary::toOctal(...$args);
@@ -47,10 +45,8 @@ class Bin2OctTest extends TestCase
 
     /**
      * @dataProvider providerBIN2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2OCTAsFormula($expectedResult, ...$args): void
+    public function testBIN2OCTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Bin2OctTest extends TestCase
 
     /**
      * @dataProvider providerBIN2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2OCTInWorksheet($expectedResult, ...$args): void
+    public function testBIN2OCTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Bin2OctTest extends TestCase
     /**
      * @dataProvider providerUnhappyBIN2OCT
      */
-    public function testBIN2OCTUnhappyPath(string $expectedException, ...$args): void
+    public function testBIN2OCTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Bin2OctTest extends TestCase
 
     /**
      * @dataProvider providerBIN2OCTOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testBIN2OCTOds($expectedResult, ...$args): void
+    public function testBIN2OCTOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitAndTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitAndTest.php
index 7af856644..40d864787 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitAndTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitAndTest.php
@@ -13,10 +13,8 @@ class BitAndTest extends TestCase
 {
     /**
      * @dataProvider providerBITAND
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBITAND($expectedResult, ...$args): void
+    public function testDirectCallToBITAND(mixed $expectedResult, mixed ...$args): void
     {
         $result = BitWise::BITAND(...$args);
         self::assertSame($expectedResult, $result);
@@ -24,10 +22,8 @@ class BitAndTest extends TestCase
 
     /**
      * @dataProvider providerBITAND
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITANDAsFormula($expectedResult, ...$args): void
+    public function testBITANDAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class BitAndTest extends TestCase
 
     /**
      * @dataProvider providerBITAND
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITANDInWorksheet($expectedResult, ...$args): void
+    public function testBITANDInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class BitAndTest extends TestCase
     /**
      * @dataProvider providerUnhappyBITAND
      */
-    public function testBITANDUnhappyPath(string $expectedException, ...$args): void
+    public function testBITANDUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitLShiftTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitLShiftTest.php
index c02ddad7e..8c3d0b25c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitLShiftTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitLShiftTest.php
@@ -13,10 +13,8 @@ class BitLShiftTest extends TestCase
 {
     /**
      * @dataProvider providerBITLSHIFT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBITLSHIFT($expectedResult, ...$args): void
+    public function testDirectCallToBITLSHIFT(mixed $expectedResult, mixed ...$args): void
     {
         $result = BitWise::BITLSHIFT(...$args);
         self::assertSame($expectedResult, $result);
@@ -24,10 +22,8 @@ class BitLShiftTest extends TestCase
 
     /**
      * @dataProvider providerBITLSHIFT
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITLSHIFTAsFormula($expectedResult, ...$args): void
+    public function testBITLSHIFTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class BitLShiftTest extends TestCase
 
     /**
      * @dataProvider providerBITLSHIFT
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITLSHIFTInWorksheet($expectedResult, ...$args): void
+    public function testBITLSHIFTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class BitLShiftTest extends TestCase
     /**
      * @dataProvider providerUnhappyBITLSHIFT
      */
-    public function testBITLSHIFTUnhappyPath(string $expectedException, ...$args): void
+    public function testBITLSHIFTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitOrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitOrTest.php
index 98b06adea..df5dcb92f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitOrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitOrTest.php
@@ -13,10 +13,8 @@ class BitOrTest extends TestCase
 {
     /**
      * @dataProvider providerBITOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBITOR($expectedResult, ...$args): void
+    public function testDirectCallToBITOR(mixed $expectedResult, mixed ...$args): void
     {
         $result = BitWise::BITOR(...$args);
         self::assertSame($expectedResult, $result);
@@ -24,10 +22,8 @@ class BitOrTest extends TestCase
 
     /**
      * @dataProvider providerBITOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITORAsFormula($expectedResult, ...$args): void
+    public function testBITORAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class BitOrTest extends TestCase
 
     /**
      * @dataProvider providerBITOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITORInWorksheet($expectedResult, ...$args): void
+    public function testBITORInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class BitOrTest extends TestCase
     /**
      * @dataProvider providerUnhappyBITOR
      */
-    public function testBITORUnhappyPath(string $expectedException, ...$args): void
+    public function testBITORUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitRShiftTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitRShiftTest.php
index 1f84b62c6..a300d6e7a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitRShiftTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitRShiftTest.php
@@ -13,10 +13,8 @@ class BitRShiftTest extends TestCase
 {
     /**
      * @dataProvider providerBITRSHIFT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBITRSHIFT($expectedResult, ...$args): void
+    public function testDirectCallToBITRSHIFT(mixed $expectedResult, mixed ...$args): void
     {
         $result = BitWise::BITRSHIFT(...$args);
         self::assertSame($expectedResult, $result);
@@ -24,10 +22,8 @@ class BitRShiftTest extends TestCase
 
     /**
      * @dataProvider providerBITRSHIFT
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITRSHIFTAsFormula($expectedResult, ...$args): void
+    public function testBITRSHIFTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class BitRShiftTest extends TestCase
 
     /**
      * @dataProvider providerBITRSHIFT
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITRSHIFTInWorksheet($expectedResult, ...$args): void
+    public function testBITRSHIFTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class BitRShiftTest extends TestCase
     /**
      * @dataProvider providerUnhappyBITRSHIFT
      */
-    public function testBITRSHIFTUnhappyPath(string $expectedException, ...$args): void
+    public function testBITRSHIFTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitXorTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitXorTest.php
index 747c44e7f..50db15fd3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitXorTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/BitXorTest.php
@@ -13,10 +13,8 @@ class BitXorTest extends TestCase
 {
     /**
      * @dataProvider providerBITXOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToBITXOR($expectedResult, ...$args): void
+    public function testDirectCallToBITXOR(mixed $expectedResult, mixed ...$args): void
     {
         $result = BitWise::BITXOR(...$args);
         self::assertSame($expectedResult, $result);
@@ -24,10 +22,8 @@ class BitXorTest extends TestCase
 
     /**
      * @dataProvider providerBITXOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITXORAsFormula($expectedResult, ...$args): void
+    public function testBITXORAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -40,10 +36,8 @@ class BitXorTest extends TestCase
 
     /**
      * @dataProvider providerBITXOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testBITXORInWorksheet($expectedResult, ...$args): void
+    public function testBITXORInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -68,7 +62,7 @@ class BitXorTest extends TestCase
     /**
      * @dataProvider providerUnhappyBITXOR
      */
-    public function testBITXORUnhappyPath(string $expectedException, ...$args): void
+    public function testBITXORUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ComplexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ComplexTest.php
index 647b63fa0..da93183f9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ComplexTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ComplexTest.php
@@ -12,10 +12,8 @@ class ComplexTest extends TestCase
 {
     /**
      * @dataProvider providerCOMPLEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToCOMPLEX($expectedResult, ...$args): void
+    public function testDirectCallToCOMPLEX(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Complex::complex(...$args);
@@ -29,10 +27,8 @@ class ComplexTest extends TestCase
 
     /**
      * @dataProvider providerCOMPLEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOMPLEXAsFormula($expectedResult, ...$args): void
+    public function testCOMPLEXAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -45,10 +41,8 @@ class ComplexTest extends TestCase
 
     /**
      * @dataProvider providerCOMPLEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOMPLEXInWorksheet($expectedResult, ...$args): void
+    public function testCOMPLEXInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php
index 0175b1327..a5f269107 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php
@@ -45,10 +45,8 @@ class ConvertUoMTest extends TestCase
 
     /**
      * @dataProvider providerCONVERTUOM
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToCONVERTUOM($expectedResult, ...$args): void
+    public function testDirectCallToCONVERTUOM(mixed $expectedResult, mixed ...$args): void
     {
         $result = ConvertUOM::convert(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, self::UOM_PRECISION);
@@ -56,10 +54,8 @@ class ConvertUoMTest extends TestCase
 
     /**
      * @dataProvider providerCONVERTUOM
-     *
-     * @param mixed $expectedResult
      */
-    public function testCONVERTUOMAsFormula($expectedResult, ...$args): void
+    public function testCONVERTUOMAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -72,10 +68,8 @@ class ConvertUoMTest extends TestCase
 
     /**
      * @dataProvider providerCONVERTUOM
-     *
-     * @param mixed $expectedResult
      */
-    public function testCONVERTUOMInWorksheet($expectedResult, ...$args): void
+    public function testCONVERTUOMInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -100,7 +94,7 @@ class ConvertUoMTest extends TestCase
     /**
      * @dataProvider providerUnhappyCONVERTUOM
      */
-    public function testCONVERTUOMUnhappyPath(string $expectedException, ...$args): void
+    public function testCONVERTUOMUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php
index c9f16d4ff..e9cc77dcb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2BinTest.php
@@ -29,10 +29,8 @@ class Dec2BinTest extends TestCase
 
     /**
      * @dataProvider providerDEC2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDEC2BIN($expectedResult, ...$args): void
+    public function testDirectCallToDEC2BIN(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertDecimal::toBinary(...$args);
@@ -46,10 +44,8 @@ class Dec2BinTest extends TestCase
 
     /**
      * @dataProvider providerDEC2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2BINAsFormula($expectedResult, ...$args): void
+    public function testDEC2BINAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -62,10 +58,8 @@ class Dec2BinTest extends TestCase
 
     /**
      * @dataProvider providerDEC2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2BINInWorksheet($expectedResult, ...$args): void
+    public function testDEC2BINInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -90,7 +84,7 @@ class Dec2BinTest extends TestCase
     /**
      * @dataProvider providerUnhappyDEC2BIN
      */
-    public function testDEC2BINUnhappyPath(string $expectedException, ...$args): void
+    public function testDEC2BINUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -117,10 +111,8 @@ class Dec2BinTest extends TestCase
 
     /**
      * @dataProvider providerDEC2BINOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2BINOds($expectedResult, ...$args): void
+    public function testDEC2BINOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php
index d2b5608f1..b7e905955 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2HexTest.php
@@ -29,10 +29,8 @@ class Dec2HexTest extends TestCase
 
     /**
      * @dataProvider providerDEC2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDEC2HEX($expectedResult, ...$args): void
+    public function testDirectCallToDEC2HEX(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertDecimal::toHex(...$args);
@@ -46,10 +44,8 @@ class Dec2HexTest extends TestCase
 
     /**
      * @dataProvider providerDEC2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2HEXAsFormula($expectedResult, ...$args): void
+    public function testDEC2HEXAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -62,10 +58,8 @@ class Dec2HexTest extends TestCase
 
     /**
      * @dataProvider providerDEC2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2HEXInWorksheet($expectedResult, ...$args): void
+    public function testDEC2HEXInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -90,7 +84,7 @@ class Dec2HexTest extends TestCase
     /**
      * @dataProvider providerUnhappyDEC2HEX
      */
-    public function testDEC2HEXUnhappyPath(string $expectedException, ...$args): void
+    public function testDEC2HEXUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -117,10 +111,8 @@ class Dec2HexTest extends TestCase
 
     /**
      * @dataProvider providerDEC2HEXOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2HEXOds($expectedResult, ...$args): void
+    public function testDEC2HEXOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php
index f5706a3fd..8b7bb59cc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Dec2OctTest.php
@@ -29,10 +29,8 @@ class Dec2OctTest extends TestCase
 
     /**
      * @dataProvider providerDEC2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDEC2OCT($expectedResult, ...$args): void
+    public function testDirectCallToDEC2OCT(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertDecimal::toOctal(...$args);
@@ -46,10 +44,8 @@ class Dec2OctTest extends TestCase
 
     /**
      * @dataProvider providerDEC2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2OCTAsFormula($expectedResult, ...$args): void
+    public function testDEC2OCTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -62,10 +58,8 @@ class Dec2OctTest extends TestCase
 
     /**
      * @dataProvider providerDEC2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2OCTInWorksheet($expectedResult, ...$args): void
+    public function testDEC2OCTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -90,7 +84,7 @@ class Dec2OctTest extends TestCase
     /**
      * @dataProvider providerUnhappyDEC2OCT
      */
-    public function testDEC2OCTUnhappyPath(string $expectedException, ...$args): void
+    public function testDEC2OCTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -117,10 +111,8 @@ class Dec2OctTest extends TestCase
 
     /**
      * @dataProvider providerDEC2OCTOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEC2OCTOds($expectedResult, ...$args): void
+    public function testDEC2OCTOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/DeltaTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/DeltaTest.php
index d2f211f03..9a9cdfe79 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/DeltaTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/DeltaTest.php
@@ -13,10 +13,8 @@ class DeltaTest extends TestCase
 {
     /**
      * @dataProvider providerDELTA
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToDELTA($expectedResult, ...$args): void
+    public function testDirectCallToDELTA(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Compare::delta(...$args);
@@ -25,10 +23,8 @@ class DeltaTest extends TestCase
 
     /**
      * @dataProvider providerDELTA
-     *
-     * @param mixed $expectedResult
      */
-    public function testDELTAAsFormula($expectedResult, ...$args): void
+    public function testDELTAAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -41,10 +37,8 @@ class DeltaTest extends TestCase
 
     /**
      * @dataProvider providerDELTA
-     *
-     * @param mixed $expectedResult
      */
-    public function testDELTAInWorksheet($expectedResult, ...$args): void
+    public function testDELTAInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -69,7 +63,7 @@ class DeltaTest extends TestCase
     /**
      * @dataProvider providerUnhappyDELTA
      */
-    public function testDELTAUnhappyPath(string $expectedException, ...$args): void
+    public function testDELTAUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php
index 834ad3d14..41f7cb923 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php
@@ -15,10 +15,8 @@ class ErfCTest extends TestCase
 
     /**
      * @dataProvider providerERFC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToERFC($expectedResult, ...$args): void
+    public function testDirectCallToERFC(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ErfC::ERFC(...$args);
@@ -27,10 +25,8 @@ class ErfCTest extends TestCase
 
     /**
      * @dataProvider providerERFC
-     *
-     * @param mixed $expectedResult
      */
-    public function testERFCAsFormula($expectedResult, ...$args): void
+    public function testERFCAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -43,10 +39,8 @@ class ErfCTest extends TestCase
 
     /**
      * @dataProvider providerERFC
-     *
-     * @param mixed $expectedResult
      */
-    public function testERFCInWorksheet($expectedResult, ...$args): void
+    public function testERFCInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -71,7 +65,7 @@ class ErfCTest extends TestCase
     /**
      * @dataProvider providerUnhappyERFC
      */
-    public function testERFCUnhappyPath(string $expectedException, ...$args): void
+    public function testERFCUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php
index 074f33d1a..e96240cfe 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php
@@ -14,10 +14,8 @@ class ErfPreciseTest extends TestCase
 
     /**
      * @dataProvider providerERFPRECISE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToERFPRECISE($expectedResult, ...$args): void
+    public function testDirectCallToERFPRECISE(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Erf::ERFPRECISE(...$args);
@@ -26,10 +24,8 @@ class ErfPreciseTest extends TestCase
 
     /**
      * @dataProvider providerERFPRECISE
-     *
-     * @param mixed $expectedResult
      */
-    public function testERFPRECISEAsFormula($expectedResult, ...$args): void
+    public function testERFPRECISEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -42,10 +38,8 @@ class ErfPreciseTest extends TestCase
 
     /**
      * @dataProvider providerERFPRECISE
-     *
-     * @param mixed $expectedResult
      */
-    public function testERFPRECISEInWorksheet($expectedResult, ...$args): void
+    public function testERFPRECISEInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php
index 19bc2fdb4..f20dfe842 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php
@@ -15,10 +15,8 @@ class ErfTest extends TestCase
 
     /**
      * @dataProvider providerERF
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToERF($expectedResult, ...$args): void
+    public function testDirectCallToERF(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Erf::erf(...$args);
@@ -27,10 +25,8 @@ class ErfTest extends TestCase
 
     /**
      * @dataProvider providerERF
-     *
-     * @param mixed $expectedResult
      */
-    public function testERFAsFormula($expectedResult, ...$args): void
+    public function testERFAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -43,10 +39,8 @@ class ErfTest extends TestCase
 
     /**
      * @dataProvider providerERF
-     *
-     * @param mixed $expectedResult
      */
-    public function testERFInWorksheet($expectedResult, ...$args): void
+    public function testERFInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -71,7 +65,7 @@ class ErfTest extends TestCase
     /**
      * @dataProvider providerUnhappyERF
      */
-    public function testERFUnhappyPath(string $expectedException, ...$args): void
+    public function testERFUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/GeStepTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/GeStepTest.php
index 2ccadb82f..8bef63ce2 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/GeStepTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/GeStepTest.php
@@ -13,10 +13,8 @@ class GeStepTest extends TestCase
 {
     /**
      * @dataProvider providerGESTEP
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToGESTEP($expectedResult, ...$args): void
+    public function testDirectCallToGESTEP(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Compare::geStep(...$args);
@@ -25,10 +23,8 @@ class GeStepTest extends TestCase
 
     /**
      * @dataProvider providerGESTEP
-     *
-     * @param mixed $expectedResult
      */
-    public function testGESTEPAsFormula($expectedResult, ...$args): void
+    public function testGESTEPAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -41,10 +37,8 @@ class GeStepTest extends TestCase
 
     /**
      * @dataProvider providerGESTEP
-     *
-     * @param mixed $expectedResult
      */
-    public function testGESTEPInWorksheet($expectedResult, ...$args): void
+    public function testGESTEPInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -69,7 +63,7 @@ class GeStepTest extends TestCase
     /**
      * @dataProvider providerUnhappyGESTEP
      */
-    public function testGESTEPUnhappyPath(string $expectedException, ...$args): void
+    public function testGESTEPUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php
index a145eb5ad..31fb3b20a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2BinTest.php
@@ -30,10 +30,8 @@ class Hex2BinTest extends TestCase
 
     /**
      * @dataProvider providerHEX2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToHEX2BIN($expectedResult, ...$args): void
+    public function testDirectCallToHEX2BIN(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertHex::toBinary(...$args);
@@ -47,10 +45,8 @@ class Hex2BinTest extends TestCase
 
     /**
      * @dataProvider providerHEX2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2BINAsFormula($expectedResult, ...$args): void
+    public function testHEX2BINAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Hex2BinTest extends TestCase
 
     /**
      * @dataProvider providerHEX2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2BINInWorksheet($expectedResult, ...$args): void
+    public function testHEX2BINInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Hex2BinTest extends TestCase
     /**
      * @dataProvider providerUnhappyHEX2BIN
      */
-    public function testHEX2BINUnhappyPath(string $expectedException, ...$args): void
+    public function testHEX2BINUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Hex2BinTest extends TestCase
 
     /**
      * @dataProvider providerHEX2BINOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2BINOds($expectedResult, ...$args): void
+    public function testHEX2BINOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php
index f115d9b61..27822dabe 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2DecTest.php
@@ -30,10 +30,8 @@ class Hex2DecTest extends TestCase
 
     /**
      * @dataProvider providerHEX2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToHEX2DEC($expectedResult, ...$args): void
+    public function testDirectCallToHEX2DEC(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertHex::toDecimal(...$args);
@@ -47,10 +45,8 @@ class Hex2DecTest extends TestCase
 
     /**
      * @dataProvider providerHEX2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2DECAsFormula($expectedResult, ...$args): void
+    public function testHEX2DECAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Hex2DecTest extends TestCase
 
     /**
      * @dataProvider providerHEX2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2DECInWorksheet($expectedResult, ...$args): void
+    public function testHEX2DECInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Hex2DecTest extends TestCase
     /**
      * @dataProvider providerUnhappyHEX2DEC
      */
-    public function testHEX2DECUnhappyPath(string $expectedException, ...$args): void
+    public function testHEX2DECUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Hex2DecTest extends TestCase
 
     /**
      * @dataProvider providerHEX2DECOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2DECOds($expectedResult, ...$args): void
+    public function testHEX2DECOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php
index 12ddf9a3d..5e2b5554d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Hex2OctTest.php
@@ -30,10 +30,8 @@ class Hex2OctTest extends TestCase
 
     /**
      * @dataProvider providerHEX2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToHEX2OCT($expectedResult, ...$args): void
+    public function testDirectCallToHEX2OCT(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertHex::toOctal(...$args);
@@ -47,10 +45,8 @@ class Hex2OctTest extends TestCase
 
     /**
      * @dataProvider providerHEX2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2OCTAsFormula($expectedResult, ...$args): void
+    public function testHEX2OCTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Hex2OctTest extends TestCase
 
     /**
      * @dataProvider providerHEX2OCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2OCTInWorksheet($expectedResult, ...$args): void
+    public function testHEX2OCTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Hex2OctTest extends TestCase
     /**
      * @dataProvider providerUnhappyHEX2OCT
      */
-    public function testHEX2OCTUnhappyPath(string $expectedException, ...$args): void
+    public function testHEX2OCTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Hex2OctTest extends TestCase
 
     /**
      * @dataProvider providerHEX2OCTOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testHEX2OCTOds($expectedResult, ...$args): void
+    public function testHEX2OCTOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImAbsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImAbsTest.php
index 959e0f164..b21c9e3e4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImAbsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImAbsTest.php
@@ -15,10 +15,8 @@ class ImAbsTest extends TestCase
 
     /**
      * @dataProvider providerIMABS
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMABS($expectedResult, ...$args): void
+    public function testDirectCallToIMABS(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMABS(...$args);
@@ -27,10 +25,8 @@ class ImAbsTest extends TestCase
 
     /**
      * @dataProvider providerIMABS
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMABSAsFormula($expectedResult, ...$args): void
+    public function testIMABSAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -43,10 +39,8 @@ class ImAbsTest extends TestCase
 
     /**
      * @dataProvider providerIMABS
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMABSInWorksheet($expectedResult, ...$args): void
+    public function testIMABSInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -71,7 +65,7 @@ class ImAbsTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMABS
      */
-    public function testIMABSUnhappyPath(string $expectedException, ...$args): void
+    public function testIMABSUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImArgumentTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImArgumentTest.php
index 78de3fec3..ef1c731e6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImArgumentTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImArgumentTest.php
@@ -21,10 +21,8 @@ class ImArgumentTest extends TestCase
 
     /**
      * @dataProvider providerIMARGUMENT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMARGUMENT($expectedResult, ...$args): void
+    public function testDirectCallToIMARGUMENT(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMARGUMENT(...$args);
@@ -33,10 +31,8 @@ class ImArgumentTest extends TestCase
 
     /**
      * @dataProvider providerIMARGUMENT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMARGUMENTAsFormula($expectedResult, ...$args): void
+    public function testIMARGUMENTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -49,10 +45,8 @@ class ImArgumentTest extends TestCase
 
     /**
      * @dataProvider providerIMARGUMENT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMARGUMENTInWorksheet($expectedResult, ...$args): void
+    public function testIMARGUMENTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -77,7 +71,7 @@ class ImArgumentTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMARGUMENT
      */
-    public function testIMARGUMENTUnhappyPath(string $expectedException, ...$args): void
+    public function testIMARGUMENTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php
index 7ae6f6c83..18003d11a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImConjugateTest.php
@@ -28,10 +28,8 @@ class ImConjugateTest extends TestCase
 
     /**
      * @dataProvider providerIMCONJUGATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMCONJUGATE($expectedResult, ...$args): void
+    public function testDirectCallToIMCONJUGATE(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMCONJUGATE(...$args);
@@ -48,10 +46,8 @@ class ImConjugateTest extends TestCase
 
     /**
      * @dataProvider providerIMCONJUGATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCONJUGATEAsFormula($expectedResult, ...$args): void
+    public function testIMCONJUGATEAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImConjugateTest extends TestCase
 
     /**
      * @dataProvider providerIMCONJUGATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCONJUGATEInWorksheet($expectedResult, ...$args): void
+    public function testIMCONJUGATEInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImConjugateTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMCONJUGATE
      */
-    public function testIMCONJUGATEUnhappyPath(string $expectedException, ...$args): void
+    public function testIMCONJUGATEUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php
index 926e7d810..ac77648dc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCosTest.php
@@ -28,10 +28,8 @@ class ImCosTest extends TestCase
 
     /**
      * @dataProvider providerIMCOS
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMCOS($expectedResult, ...$args): void
+    public function testDirectCallToIMCOS(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMCOS(...$args);
@@ -48,10 +46,8 @@ class ImCosTest extends TestCase
 
     /**
      * @dataProvider providerIMCOS
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCOSAsFormula($expectedResult, ...$args): void
+    public function testIMCOSAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImCosTest extends TestCase
 
     /**
      * @dataProvider providerIMCOS
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCOSInWorksheet($expectedResult, ...$args): void
+    public function testIMCOSInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImCosTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMCOS
      */
-    public function testIMCOSUnhappyPath(string $expectedException, ...$args): void
+    public function testIMCOSUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php
index 77ddef8ac..6e7c6004b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCoshTest.php
@@ -28,10 +28,8 @@ class ImCoshTest extends TestCase
 
     /**
      * @dataProvider providerIMCOSH
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMCOSH($expectedResult, ...$args): void
+    public function testDirectCallToIMCOSH(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMCOSH(...$args);
@@ -48,10 +46,8 @@ class ImCoshTest extends TestCase
 
     /**
      * @dataProvider providerIMCOSH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCOSHAsFormula($expectedResult, ...$args): void
+    public function testIMCOSHAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImCoshTest extends TestCase
 
     /**
      * @dataProvider providerIMCOSH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCOSHInWorksheet($expectedResult, ...$args): void
+    public function testIMCOSHInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImCoshTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMCOSH
      */
-    public function testIMCOSHUnhappyPath(string $expectedException, ...$args): void
+    public function testIMCOSHUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php
index 1ed3667a9..b907769e5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCotTest.php
@@ -28,10 +28,8 @@ class ImCotTest extends TestCase
 
     /**
      * @dataProvider providerIMCOT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMCOT($expectedResult, ...$args): void
+    public function testDirectCallToIMCOT(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMCOT(...$args);
@@ -48,10 +46,8 @@ class ImCotTest extends TestCase
 
     /**
      * @dataProvider providerIMCOT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCOTAsFormula($expectedResult, ...$args): void
+    public function testIMCOTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImCotTest extends TestCase
 
     /**
      * @dataProvider providerIMCOT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCOTInWorksheet($expectedResult, ...$args): void
+    public function testIMCOTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImCotTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMCOT
      */
-    public function testIMCOTUnhappyPath(string $expectedException, ...$args): void
+    public function testIMCOTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php
index 6029b104d..19d12ba1c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCscTest.php
@@ -28,10 +28,8 @@ class ImCscTest extends TestCase
 
     /**
      * @dataProvider providerIMCSC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMCSC($expectedResult, ...$args): void
+    public function testDirectCallToIMCSC(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMCSC(...$args);
@@ -48,10 +46,8 @@ class ImCscTest extends TestCase
 
     /**
      * @dataProvider providerIMCSC
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCSCAsFormula($expectedResult, ...$args): void
+    public function testIMCSCAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImCscTest extends TestCase
 
     /**
      * @dataProvider providerIMCSC
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCSCInWorksheet($expectedResult, ...$args): void
+    public function testIMCSCInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImCscTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMCSC
      */
-    public function testIMCSCUnhappyPath(string $expectedException, ...$args): void
+    public function testIMCSCUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php
index 565f3fbf0..07237fe9b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImCschTest.php
@@ -28,10 +28,8 @@ class ImCschTest extends TestCase
 
     /**
      * @dataProvider providerIMCSCH
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMCSCH($expectedResult, ...$args): void
+    public function testDirectCallToIMCSCH(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMCSCH(...$args);
@@ -48,10 +46,8 @@ class ImCschTest extends TestCase
 
     /**
      * @dataProvider providerIMCSCH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCSCHAsFormula($expectedResult, ...$args): void
+    public function testIMCSCHAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImCschTest extends TestCase
 
     /**
      * @dataProvider providerIMCSCH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMCSCHInWorksheet($expectedResult, ...$args): void
+    public function testIMCSCHInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImCschTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMCSCH
      */
-    public function testIMCSCHUnhappyPath(string $expectedException, ...$args): void
+    public function testIMCSCHUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php
index d42baa1f7..debbc5637 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImDivTest.php
@@ -28,10 +28,8 @@ class ImDivTest extends TestCase
 
     /**
      * @dataProvider providerIMDIV
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMDIV($expectedResult, ...$args): void
+    public function testDirectCallToIMDIV(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexOperations::IMDIV(...$args);
@@ -48,10 +46,8 @@ class ImDivTest extends TestCase
 
     /**
      * @dataProvider providerIMDIV
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMDIVAsFormula($expectedResult, ...$args): void
+    public function testIMDIVAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImDivTest extends TestCase
 
     /**
      * @dataProvider providerIMDIV
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMDIVInWorksheet($expectedResult, ...$args): void
+    public function testIMDIVInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImDivTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMDIV
      */
-    public function testIMDIVUnhappyPath(string $expectedException, ...$args): void
+    public function testIMDIVUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php
index 7a86ab471..c52b962d6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImExpTest.php
@@ -28,10 +28,8 @@ class ImExpTest extends TestCase
 
     /**
      * @dataProvider providerIMEXP
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMEXP($expectedResult, ...$args): void
+    public function testDirectCallToIMEXP(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMEXP(...$args);
@@ -48,10 +46,8 @@ class ImExpTest extends TestCase
 
     /**
      * @dataProvider providerIMEXP
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMEXPAsFormula($expectedResult, ...$args): void
+    public function testIMEXPAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImExpTest extends TestCase
 
     /**
      * @dataProvider providerIMEXP
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMEXPInWorksheet($expectedResult, ...$args): void
+    public function testIMEXPInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImExpTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMEXP
      */
-    public function testIMEXPUnhappyPath(string $expectedException, ...$args): void
+    public function testIMEXPUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php
index 1dc27ca72..0a98b0642 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLnTest.php
@@ -28,10 +28,8 @@ class ImLnTest extends TestCase
 
     /**
      * @dataProvider providerIMLN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMLN($expectedResult, ...$args): void
+    public function testDirectCallToIMLN(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMLN(...$args);
@@ -48,10 +46,8 @@ class ImLnTest extends TestCase
 
     /**
      * @dataProvider providerIMLN
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMLNAsFormula($expectedResult, ...$args): void
+    public function testIMLNAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImLnTest extends TestCase
 
     /**
      * @dataProvider providerIMLN
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMLNInWorksheet($expectedResult, ...$args): void
+    public function testIMLNInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImLnTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMLN
      */
-    public function testIMLNUnhappyPath(string $expectedException, ...$args): void
+    public function testIMLNUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php
index 77ec96337..abf9e9581 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog10Test.php
@@ -28,10 +28,8 @@ class ImLog10Test extends TestCase
 
     /**
      * @dataProvider providerIMLOG10
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMLOG10($expectedResult, ...$args): void
+    public function testDirectCallToIMLOG10(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMLOG10(...$args);
@@ -48,10 +46,8 @@ class ImLog10Test extends TestCase
 
     /**
      * @dataProvider providerIMLOG10
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMLOG10AsFormula($expectedResult, ...$args): void
+    public function testIMLOG10AsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImLog10Test extends TestCase
 
     /**
      * @dataProvider providerIMLOG10
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMLOG10InWorksheet($expectedResult, ...$args): void
+    public function testIMLOG10InWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImLog10Test extends TestCase
     /**
      * @dataProvider providerUnhappyIMLOG10
      */
-    public function testIMLOG10UnhappyPath(string $expectedException, ...$args): void
+    public function testIMLOG10UnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php
index 37313639f..623529a5f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImLog2Test.php
@@ -28,10 +28,8 @@ class ImLog2Test extends TestCase
 
     /**
      * @dataProvider providerIMLOG2
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMLOG2($expectedResult, ...$args): void
+    public function testDirectCallToIMLOG2(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMLOG2(...$args);
@@ -48,10 +46,8 @@ class ImLog2Test extends TestCase
 
     /**
      * @dataProvider providerIMLOG2
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMLOG2AsFormula($expectedResult, ...$args): void
+    public function testIMLOG2AsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImLog2Test extends TestCase
 
     /**
      * @dataProvider providerIMLOG2
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMLOG2InWorksheet($expectedResult, ...$args): void
+    public function testIMLOG2InWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImLog2Test extends TestCase
     /**
      * @dataProvider providerUnhappyIMLOG2
      */
-    public function testIMLOG2UnhappyPath(string $expectedException, ...$args): void
+    public function testIMLOG2UnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php
index 6a652c221..2291ee775 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImPowerTest.php
@@ -28,10 +28,8 @@ class ImPowerTest extends TestCase
 
     /**
      * @dataProvider providerIMPOWER
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMPOWER($expectedResult, ...$args): void
+    public function testDirectCallToIMPOWER(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMPOWER(...$args);
@@ -48,10 +46,8 @@ class ImPowerTest extends TestCase
 
     /**
      * @dataProvider providerIMPOWER
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMPOWERAsFormula($expectedResult, ...$args): void
+    public function testIMPOWERAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImPowerTest extends TestCase
 
     /**
      * @dataProvider providerIMPOWER
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMPOWERInWorksheet($expectedResult, ...$args): void
+    public function testIMPOWERInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImPowerTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMPOWER
      */
-    public function testIMPOWERUnhappyPath(string $expectedException, ...$args): void
+    public function testIMPOWERUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php
index 3c6462a25..3d42f13b0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImProductTest.php
@@ -28,10 +28,8 @@ class ImProductTest extends TestCase
 
     /**
      * @dataProvider providerIMPRODUCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMPRODUCT($expectedResult, ...$args): void
+    public function testDirectCallToIMPRODUCT(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexOperations::IMPRODUCT(...$args);
@@ -48,10 +46,8 @@ class ImProductTest extends TestCase
 
     /**
      * @dataProvider providerIMPRODUCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMPRODUCTAsFormula($expectedResult, ...$args): void
+    public function testIMPRODUCTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImProductTest extends TestCase
 
     /**
      * @dataProvider providerIMPRODUCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMPRODUCTInWorksheet($expectedResult, ...$args): void
+    public function testIMPRODUCTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImProductTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMPRODUCT
      */
-    public function testIMPRODUCTUnhappyPath(string $expectedException, ...$args): void
+    public function testIMPRODUCTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImRealTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImRealTest.php
index c4db9094c..af411c186 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImRealTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImRealTest.php
@@ -21,10 +21,8 @@ class ImRealTest extends TestCase
 
     /**
      * @dataProvider providerIMREAL
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMREAL($expectedResult, ...$args): void
+    public function testDirectCallToIMREAL(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Complex::IMREAL(...$args);
@@ -33,10 +31,8 @@ class ImRealTest extends TestCase
 
     /**
      * @dataProvider providerIMREAL
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMREALAsFormula($expectedResult, ...$args): void
+    public function testIMREALAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -49,10 +45,8 @@ class ImRealTest extends TestCase
 
     /**
      * @dataProvider providerIMREAL
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMREALInWorksheet($expectedResult, ...$args): void
+    public function testIMREALInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -77,7 +71,7 @@ class ImRealTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMREAL
      */
-    public function testIMREALUnhappyPath(string $expectedException, ...$args): void
+    public function testIMREALUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php
index aebbda5e2..191aeefdb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSecTest.php
@@ -28,10 +28,8 @@ class ImSecTest extends TestCase
 
     /**
      * @dataProvider providerIMSEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMSEC($expectedResult, ...$args): void
+    public function testDirectCallToIMSEC(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMSEC(...$args);
@@ -48,10 +46,8 @@ class ImSecTest extends TestCase
 
     /**
      * @dataProvider providerIMSEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSECAsFormula($expectedResult, ...$args): void
+    public function testIMSECAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImSecTest extends TestCase
 
     /**
      * @dataProvider providerIMSEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSECInWorksheet($expectedResult, ...$args): void
+    public function testIMSECInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImSecTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMSEC
      */
-    public function testIMSECUnhappyPath(string $expectedException, ...$args): void
+    public function testIMSECUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php
index 223a9a416..28066f95d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSechTest.php
@@ -28,10 +28,8 @@ class ImSechTest extends TestCase
 
     /**
      * @dataProvider providerIMSECH
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMSECH($expectedResult, ...$args): void
+    public function testDirectCallToIMSECH(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMSECH(...$args);
@@ -48,10 +46,8 @@ class ImSechTest extends TestCase
 
     /**
      * @dataProvider providerIMSECH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSECHAsFormula($expectedResult, ...$args): void
+    public function testIMSECHAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImSechTest extends TestCase
 
     /**
      * @dataProvider providerIMSECH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSECHInWorksheet($expectedResult, ...$args): void
+    public function testIMSECHInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImSechTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMSECH
      */
-    public function testIMSECHUnhappyPath(string $expectedException, ...$args): void
+    public function testIMSECHUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php
index 7dc5bfcd4..42e0825e8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinTest.php
@@ -28,10 +28,8 @@ class ImSinTest extends TestCase
 
     /**
      * @dataProvider providerIMSIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMSIN($expectedResult, ...$args): void
+    public function testDirectCallToIMSIN(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMSIN(...$args);
@@ -48,10 +46,8 @@ class ImSinTest extends TestCase
 
     /**
      * @dataProvider providerIMSIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSINAsFormula($expectedResult, ...$args): void
+    public function testIMSINAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImSinTest extends TestCase
 
     /**
      * @dataProvider providerIMSIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSINInWorksheet($expectedResult, ...$args): void
+    public function testIMSINInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImSinTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMSIN
      */
-    public function testIMSINUnhappyPath(string $expectedException, ...$args): void
+    public function testIMSINUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php
index f97f8fbad..62fc1fa6b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSinhTest.php
@@ -28,10 +28,8 @@ class ImSinhTest extends TestCase
 
     /**
      * @dataProvider providerIMSINH
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMSINH($expectedResult, ...$args): void
+    public function testDirectCallToIMSINH(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMSINH(...$args);
@@ -48,10 +46,8 @@ class ImSinhTest extends TestCase
 
     /**
      * @dataProvider providerIMSINH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSINHAsFormula($expectedResult, ...$args): void
+    public function testIMSINHAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImSinhTest extends TestCase
 
     /**
      * @dataProvider providerIMSINH
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSINHInWorksheet($expectedResult, ...$args): void
+    public function testIMSINHInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImSinhTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMSINH
      */
-    public function testIMSINHUnhappyPath(string $expectedException, ...$args): void
+    public function testIMSINHUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php
index 2901ee375..af6d5c8c8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSqrtTest.php
@@ -28,10 +28,8 @@ class ImSqrtTest extends TestCase
 
     /**
      * @dataProvider providerIMSQRT
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMSQRT($expectedResult, ...$args): void
+    public function testDirectCallToIMSQRT(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMSQRT(...$args);
@@ -48,10 +46,8 @@ class ImSqrtTest extends TestCase
 
     /**
      * @dataProvider providerIMSQRT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSQRTAsFormula($expectedResult, ...$args): void
+    public function testIMSQRTAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImSqrtTest extends TestCase
 
     /**
      * @dataProvider providerIMSQRT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSQRTInWorksheet($expectedResult, ...$args): void
+    public function testIMSQRTInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImSqrtTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMSQRT
      */
-    public function testIMSQRTUnhappyPath(string $expectedException, ...$args): void
+    public function testIMSQRTUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php
index 845becd08..bd25d9061 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSubTest.php
@@ -28,10 +28,8 @@ class ImSubTest extends TestCase
 
     /**
      * @dataProvider providerIMSUB
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMSUB($expectedResult, ...$args): void
+    public function testDirectCallToIMSUB(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexOperations::IMSUB(...$args);
@@ -48,10 +46,8 @@ class ImSubTest extends TestCase
 
     /**
      * @dataProvider providerIMSUB
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSUBAsFormula($expectedResult, ...$args): void
+    public function testIMSUBAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImSubTest extends TestCase
 
     /**
      * @dataProvider providerIMSUB
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSUBInWorksheet($expectedResult, ...$args): void
+    public function testIMSUBInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImSubTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMSUB
      */
-    public function testIMSUBUnhappyPath(string $expectedException, ...$args): void
+    public function testIMSUBUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php
index 6e874df44..135fd64ae 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImSumTest.php
@@ -28,10 +28,8 @@ class ImSumTest extends TestCase
 
     /**
      * @dataProvider providerIMSUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMSUM($expectedResult, ...$args): void
+    public function testDirectCallToIMSUM(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexOperations::IMSUM(...$args);
@@ -48,10 +46,8 @@ class ImSumTest extends TestCase
 
     /**
      * @dataProvider providerIMSUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSUMAsFormula($expectedResult, ...$args): void
+    public function testIMSUMAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImSumTest extends TestCase
 
     /**
      * @dataProvider providerIMSUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMSUMInWorksheet($expectedResult, ...$args): void
+    public function testIMSUMInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImSumTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMSUM
      */
-    public function testIMSUMUnhappyPath(string $expectedException, ...$args): void
+    public function testIMSUMUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php
index a1d2ec433..0f0814c89 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImTanTest.php
@@ -28,10 +28,8 @@ class ImTanTest extends TestCase
 
     /**
      * @dataProvider providerIMTAN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMTAN($expectedResult, ...$args): void
+    public function testDirectCallToIMTAN(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ComplexFunctions::IMTAN(...$args);
@@ -48,10 +46,8 @@ class ImTanTest extends TestCase
 
     /**
      * @dataProvider providerIMTAN
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMTANAsFormula($expectedResult, ...$args): void
+    public function testIMTANAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -67,10 +63,8 @@ class ImTanTest extends TestCase
 
     /**
      * @dataProvider providerIMTAN
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMTANInWorksheet($expectedResult, ...$args): void
+    public function testIMTANInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -98,7 +92,7 @@ class ImTanTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMTAN
      */
-    public function testIMTANUnhappyPath(string $expectedException, ...$args): void
+    public function testIMTANUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImaginaryTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImaginaryTest.php
index ac8f4eddb..948e6996d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImaginaryTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ImaginaryTest.php
@@ -21,10 +21,8 @@ class ImaginaryTest extends TestCase
 
     /**
      * @dataProvider providerIMAGINARY
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToIMAGINARY($expectedResult, ...$args): void
+    public function testDirectCallToIMAGINARY(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = Complex::IMAGINARY(...$args);
@@ -33,10 +31,8 @@ class ImaginaryTest extends TestCase
 
     /**
      * @dataProvider providerIMAGINARY
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMAGINARYAsFormula($expectedResult, ...$args): void
+    public function testIMAGINARYAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -49,10 +45,8 @@ class ImaginaryTest extends TestCase
 
     /**
      * @dataProvider providerIMAGINARY
-     *
-     * @param mixed $expectedResult
      */
-    public function testIMAGINARYInWorksheet($expectedResult, ...$args): void
+    public function testIMAGINARYInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -77,7 +71,7 @@ class ImaginaryTest extends TestCase
     /**
      * @dataProvider providerUnhappyIMAGINARY
      */
-    public function testIMAGINARYUnhappyPath(string $expectedException, ...$args): void
+    public function testIMAGINARYUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php
index 4046f9ec4..4a07ec67f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2BinTest.php
@@ -30,10 +30,8 @@ class Oct2BinTest extends TestCase
 
     /**
      * @dataProvider providerOCT2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToOCT2BIN($expectedResult, ...$args): void
+    public function testDirectCallToOCT2BIN(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertOctal::toBinary(...$args);
@@ -47,10 +45,8 @@ class Oct2BinTest extends TestCase
 
     /**
      * @dataProvider providerOCT2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2BINAsFormula($expectedResult, ...$args): void
+    public function testOCT2BINAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Oct2BinTest extends TestCase
 
     /**
      * @dataProvider providerOCT2BIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2BINInWorksheet($expectedResult, ...$args): void
+    public function testOCT2BINInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Oct2BinTest extends TestCase
     /**
      * @dataProvider providerUnhappyOCT2BIN
      */
-    public function testOCT2BINUnhappyPath(string $expectedException, ...$args): void
+    public function testOCT2BINUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Oct2BinTest extends TestCase
 
     /**
      * @dataProvider providerOCT2BINOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2BINOds($expectedResult, ...$args): void
+    public function testOCT2BINOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php
index b6872f950..4a03c2148 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2DecTest.php
@@ -30,10 +30,8 @@ class Oct2DecTest extends TestCase
 
     /**
      * @dataProvider providerOCT2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToOCT2DEC($expectedResult, ...$args): void
+    public function testDirectCallToOCT2DEC(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertOctal::toDecimal(...$args);
@@ -47,10 +45,8 @@ class Oct2DecTest extends TestCase
 
     /**
      * @dataProvider providerOCT2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2DECAsFormula($expectedResult, ...$args): void
+    public function testOCT2DECAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Oct2DecTest extends TestCase
 
     /**
      * @dataProvider providerOCT2DEC
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2DECInWorksheet($expectedResult, ...$args): void
+    public function testOCT2DECInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Oct2DecTest extends TestCase
     /**
      * @dataProvider providerUnhappyOCT2DEC
      */
-    public function testOCT2DECUnhappyPath(string $expectedException, ...$args): void
+    public function testOCT2DECUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Oct2DecTest extends TestCase
 
     /**
      * @dataProvider providerOCT2DECOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2DECOds($expectedResult, ...$args): void
+    public function testOCT2DECOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php
index b448e5b4e..7b2854b0a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/Oct2HexTest.php
@@ -30,10 +30,8 @@ class Oct2HexTest extends TestCase
 
     /**
      * @dataProvider providerOCT2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testDirectCallToOCT2HEX($expectedResult, ...$args): void
+    public function testDirectCallToOCT2HEX(mixed $expectedResult, mixed ...$args): void
     {
         /** @scrutinizer ignore-call */
         $result = ConvertOctal::toHex(...$args);
@@ -47,10 +45,8 @@ class Oct2HexTest extends TestCase
 
     /**
      * @dataProvider providerOCT2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2HEXAsFormula($expectedResult, ...$args): void
+    public function testOCT2HEXAsFormula(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -63,10 +59,8 @@ class Oct2HexTest extends TestCase
 
     /**
      * @dataProvider providerOCT2HEX
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2HEXInWorksheet($expectedResult, ...$args): void
+    public function testOCT2HEXInWorksheet(mixed $expectedResult, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -91,7 +85,7 @@ class Oct2HexTest extends TestCase
     /**
      * @dataProvider providerUnhappyOCT2HEX
      */
-    public function testOCT2HEXUnhappyPath(string $expectedException, ...$args): void
+    public function testOCT2HEXUnhappyPath(string $expectedException, mixed ...$args): void
     {
         $arguments = new FormulaArguments(...$args);
 
@@ -118,10 +112,8 @@ class Oct2HexTest extends TestCase
 
     /**
      * @dataProvider providerOCT2HEXOds
-     *
-     * @param mixed $expectedResult
      */
-    public function testOCT2HEXOds($expectedResult, ...$args): void
+    public function testOCT2HEXOds(mixed $expectedResult, mixed ...$args): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintMTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintMTest.php
index abc22e336..84925f778 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintMTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintMTest.php
@@ -6,10 +6,8 @@ class AccrintMTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerACCRINTM
-     *
-     * @param mixed $expectedResult
      */
-    public function testACCRINTM($expectedResult, ...$args): void
+    public function testACCRINTM(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('ACCRINTM', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintTest.php
index af87ddaef..949731e7f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AccrintTest.php
@@ -6,10 +6,8 @@ class AccrintTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerACCRINT
-     *
-     * @param mixed $expectedResult
      */
-    public function testACCRINT($expectedResult, ...$args): void
+    public function testACCRINT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('ACCRINT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php
index 12fafa0b2..f267df44f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AllSetupTeardown.php
@@ -51,20 +51,14 @@ class AllSetupTeardown extends TestCase
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_GNUMERIC);
     }
 
-    /**
-     * @param mixed $expectedResult
-     */
-    protected function mightHaveException($expectedResult): void
+    protected function mightHaveException(mixed $expectedResult): void
     {
         if ($expectedResult === 'exception') {
             $this->expectException(CalcException::class);
         }
     }
 
-    /**
-     * @param mixed $value
-     */
-    protected function setCell(string $cell, $value): void
+    protected function setCell(string $cell, mixed $value): void
     {
         if ($value !== null) {
             if (is_string($value) && is_numeric($value)) {
@@ -98,11 +92,8 @@ class AllSetupTeardown extends TestCase
     /**
      * Adjust result if it is close enough to expected by ratio
      *     rather than offset.
-     *
-     * @param mixed $result
-     * @param mixed $expectedResult
      */
-    protected function adjustResult(&$result, $expectedResult): void
+    protected function adjustResult(mixed &$result, mixed $expectedResult): void
     {
         if (is_numeric($result) && is_numeric($expectedResult)) {
             if ($expectedResult != 0) {
@@ -114,10 +105,7 @@ class AllSetupTeardown extends TestCase
         }
     }
 
-    /**
-     * @param mixed $expectedResult
-     */
-    public function runTestCase(string $functionName, $expectedResult, array $args): void
+    public function runTestCase(string $functionName, mixed $expectedResult, array $args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorDegRcTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorDegRcTest.php
index 279884442..276d4a9a2 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorDegRcTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorDegRcTest.php
@@ -6,10 +6,8 @@ class AmorDegRcTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAMORDEGRC
-     *
-     * @param mixed $expectedResult
      */
-    public function testAMORDEGRC($expectedResult, ...$args): void
+    public function testAMORDEGRC(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('AMORDEGRC', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorLincTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorLincTest.php
index ddd718643..b465cbd2f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorLincTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/AmorLincTest.php
@@ -6,10 +6,8 @@ class AmorLincTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAMORLINC
-     *
-     * @param mixed $expectedResult
      */
-    public function testAMORLINC($expectedResult, ...$args): void
+    public function testAMORLINC(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('AMORLINC', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDayBsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDayBsTest.php
index 6423b7a46..8dced87d4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDayBsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDayBsTest.php
@@ -6,10 +6,8 @@ class CoupDayBsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUPDAYBS
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUPDAYBS($expectedResult, ...$args): void
+    public function testCOUPDAYBS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('COUPDAYBS', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysNcTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysNcTest.php
index 83e9dbbb9..a6332e0b5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysNcTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysNcTest.php
@@ -6,10 +6,8 @@ class CoupDaysNcTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUPDAYSNC
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUPDAYSNC($expectedResult, ...$args): void
+    public function testCOUPDAYSNC(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('COUPDAYSNC', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysTest.php
index 2baed2429..71cf96211 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupDaysTest.php
@@ -6,10 +6,8 @@ class CoupDaysTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUPDAYS
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUPDAYS($expectedResult, ...$args): void
+    public function testCOUPDAYS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('COUPDAYS', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNcdTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNcdTest.php
index 6fa58197f..d46c55ce1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNcdTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNcdTest.php
@@ -6,10 +6,8 @@ class CoupNcdTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUPNCD
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUPNCD($expectedResult, ...$args): void
+    public function testCOUPNCD(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('COUPNCD', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNumTest.php
index a4d962af0..0de8e9562 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupNumTest.php
@@ -6,10 +6,8 @@ class CoupNumTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUPNUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUPNUM($expectedResult, ...$args): void
+    public function testCOUPNUM(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('COUPNUM', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupPcdTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupPcdTest.php
index e7d460f7b..4a2d6d627 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupPcdTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CoupPcdTest.php
@@ -6,10 +6,8 @@ class CoupPcdTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUPPCD
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUPPCD($expectedResult, ...$args): void
+    public function testCOUPPCD(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('COUPPCD', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumIpmtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumIpmtTest.php
index 26450faac..db99b0658 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumIpmtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumIpmtTest.php
@@ -6,10 +6,8 @@ class CumIpmtTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCUMIPMT
-     *
-     * @param mixed $expectedResult
      */
-    public function testCUMIPMT($expectedResult, ...$args): void
+    public function testCUMIPMT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('CUMIPMT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumPrincTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumPrincTest.php
index 2cc19fd69..9c590cd05 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumPrincTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/CumPrincTest.php
@@ -6,10 +6,8 @@ class CumPrincTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCUMPRINC
-     *
-     * @param mixed $expectedResult
      */
-    public function testCUMPRINC($expectedResult, ...$args): void
+    public function testCUMPRINC(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('CUMPRINC', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DbTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DbTest.php
index 2ac986e76..a28f1bcd1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DbTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DbTest.php
@@ -6,10 +6,8 @@ class DbTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDB
-     *
-     * @param mixed $expectedResult
      */
-    public function testDB($expectedResult, ...$args): void
+    public function testDB(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('DB', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DdbTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DdbTest.php
index b2ef69a92..8a744851d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DdbTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DdbTest.php
@@ -6,10 +6,8 @@ class DdbTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDDB
-     *
-     * @param mixed $expectedResult
      */
-    public function testDDB($expectedResult, ...$args): void
+    public function testDDB(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('DDB', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DiscTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DiscTest.php
index d983ad092..038b84084 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DiscTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DiscTest.php
@@ -6,10 +6,8 @@ class DiscTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDISC
-     *
-     * @param mixed $expectedResult
      */
-    public function testDISC($expectedResult, ...$args): void
+    public function testDISC(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('DISC', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarDeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarDeTest.php
index 56bb681a1..5f12331c0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarDeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarDeTest.php
@@ -8,10 +8,8 @@ class DollarDeTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDOLLARDE
-     *
-     * @param mixed $expectedResult
      */
-    public function testDOLLARDE($expectedResult, ...$args): void
+    public function testDOLLARDE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('DOLLARDE', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarFrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarFrTest.php
index adbbaea7a..e762bb7e7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarFrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/DollarFrTest.php
@@ -6,10 +6,8 @@ class DollarFrTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDOLLARFR
-     *
-     * @param mixed $expectedResult
      */
-    public function testDOLLARFR($expectedResult, ...$args): void
+    public function testDOLLARFR(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('DOLLARFR', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/EffectTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/EffectTest.php
index 249a5f112..be367b2a6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/EffectTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/EffectTest.php
@@ -6,10 +6,8 @@ class EffectTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerEFFECT
-     *
-     * @param mixed $expectedResult
      */
-    public function testEFFECT($expectedResult, ...$args): void
+    public function testEFFECT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('EFFECT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvScheduleTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvScheduleTest.php
index 9080a38ab..878e4986c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvScheduleTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvScheduleTest.php
@@ -6,11 +6,8 @@ class FvScheduleTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFVSCHEDULE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $principal
      */
-    public function testFVSCHEDULE($expectedResult, $principal = null, ?array $schedule = null): void
+    public function testFVSCHEDULE(mixed $expectedResult, mixed $principal = null, ?array $schedule = null): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvTest.php
index 5f221940c..9c67cbc41 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/FvTest.php
@@ -6,10 +6,8 @@ class FvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFV
-     *
-     * @param mixed $expectedResult
      */
-    public function testFV($expectedResult, array $args): void
+    public function testFV(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('FV', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/HelpersTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/HelpersTest.php
index ed132b7e2..7a7b3a0a9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/HelpersTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/HelpersTest.php
@@ -9,12 +9,8 @@ class HelpersTest extends TestCase
 {
     /**
      * @dataProvider providerDaysPerYear
-     *
-     * @param mixed $expectedResult
-     * @param mixed $year
-     * @param mixed $basis
      */
-    public function testDaysPerYear($expectedResult, $year, $basis): void
+    public function testDaysPerYear(mixed $expectedResult, mixed $year, mixed $basis): void
     {
         $result = Helpers::daysPerYear($year, $basis);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IPmtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IPmtTest.php
index 0af641ad1..ea2413043 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IPmtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IPmtTest.php
@@ -6,10 +6,8 @@ class IPmtTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerIPMT
-     *
-     * @param mixed $expectedResult
      */
-    public function testIPMT($expectedResult, array $args): void
+    public function testIPMT(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('IPMT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IntRateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IntRateTest.php
index 9827182f5..c9473823e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IntRateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IntRateTest.php
@@ -6,10 +6,8 @@ class IntRateTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerINTRATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testINTRATE($expectedResult, ...$args): void
+    public function testINTRATE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('INTRATE', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php
index 608d8d261..d49c21baf 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php
@@ -6,11 +6,8 @@ class IrrTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerIRR
-     *
-     * @param mixed $expectedResult
-     * @param mixed $values
      */
-    public function testIRR($expectedResult, $values = null): void
+    public function testIRR(mixed $expectedResult, mixed $values = null): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IsPmtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IsPmtTest.php
index cfb4a9efe..c39c15584 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IsPmtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IsPmtTest.php
@@ -6,10 +6,8 @@ class IsPmtTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerISPMT
-     *
-     * @param mixed $expectedResult
      */
-    public function testISPMT($expectedResult, ...$args): void
+    public function testISPMT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('ISPMT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/MirrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/MirrTest.php
index c2412b8e0..bf60f52d1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/MirrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/MirrTest.php
@@ -8,13 +8,8 @@ class MirrTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMIRR
-     *
-     * @param mixed $expectedResult
-     * @param mixed $values
-     * @param mixed $financeRate
-     * @param mixed $reinvestRate
      */
-    public function testMIRR($expectedResult, $values, $financeRate = null, $reinvestRate = null): void
+    public function testMIRR(mixed $expectedResult, mixed $values, mixed $financeRate = null, mixed $reinvestRate = null): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NPerTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NPerTest.php
index 1fb12ed49..96928c083 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NPerTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NPerTest.php
@@ -6,10 +6,8 @@ class NPerTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNPER
-     *
-     * @param mixed $expectedResult
      */
-    public function testNPER($expectedResult, array $args): void
+    public function testNPER(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('NPER', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NominalTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NominalTest.php
index fd6f5710b..136d11871 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NominalTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NominalTest.php
@@ -6,10 +6,8 @@ class NominalTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNOMINAL
-     *
-     * @param mixed $expectedResult
      */
-    public function testNOMINAL($expectedResult, ...$args): void
+    public function testNOMINAL(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('NOMINAL', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NpvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NpvTest.php
index ed3126ae5..94cfa569e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NpvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/NpvTest.php
@@ -6,10 +6,8 @@ class NpvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNPV
-     *
-     * @param mixed $expectedResult
      */
-    public function testNPV($expectedResult, ...$args): void
+    public function testNPV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('NPV', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PDurationTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PDurationTest.php
index 475ac3bfb..1a25096ed 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PDurationTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PDurationTest.php
@@ -6,10 +6,8 @@ class PDurationTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPDURATION
-     *
-     * @param mixed $expectedResult
      */
-    public function testPDURATION($expectedResult, array $args): void
+    public function testPDURATION(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('PDURATION', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PmtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PmtTest.php
index 2868b9dc3..41f788463 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PmtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PmtTest.php
@@ -6,10 +6,8 @@ class PmtTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPMT
-     *
-     * @param mixed $expectedResult
      */
-    public function testPMT($expectedResult, array $args): void
+    public function testPMT(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('PMT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PpmtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PpmtTest.php
index a373dab63..c8c1cb9eb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PpmtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PpmtTest.php
@@ -6,10 +6,8 @@ class PpmtTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPPMT
-     *
-     * @param mixed $expectedResult
      */
-    public function testPPMT($expectedResult, array $args): void
+    public function testPPMT(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('PPMT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceDiscTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceDiscTest.php
index ac6dca08d..480c6fc16 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceDiscTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceDiscTest.php
@@ -6,10 +6,8 @@ class PriceDiscTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPRICEDISC
-     *
-     * @param mixed $expectedResult
      */
-    public function testPRICEDISC($expectedResult, array $args): void
+    public function testPRICEDISC(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('PRICEDISC', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceMatTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceMatTest.php
index 23a063387..46ed4ef34 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceMatTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceMatTest.php
@@ -6,10 +6,8 @@ class PriceMatTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPRICEMAT
-     *
-     * @param mixed $expectedResult
      */
-    public function testPRICEMAT($expectedResult, ...$args): void
+    public function testPRICEMAT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('PRICEMAT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceTest.php
index 43f5b10c8..293bb6a19 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PriceTest.php
@@ -6,10 +6,8 @@ class PriceTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPRICE
-     *
-     * @param mixed $expectedResult
      */
-    public function testPRICE($expectedResult, ...$args): void
+    public function testPRICE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('PRICE', $expectedResult, $args);
     }
@@ -21,10 +19,8 @@ class PriceTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerPRICE3
-     *
-     * @param mixed $expectedResult
      */
-    public function testPRICE3($expectedResult, ...$args): void
+    public function testPRICE3(mixed $expectedResult, mixed ...$args): void
     {
         // These results (PRICE function with basis codes 2 and 3)
         // agree with published algorithm, LibreOffice, and Gnumeric.
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PvTest.php
index fdee2f9d5..599fee907 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/PvTest.php
@@ -6,10 +6,8 @@ class PvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPV
-     *
-     * @param mixed $expectedResult
      */
-    public function testPV($expectedResult, array $args): void
+    public function testPV(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('PV', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RateTest.php
index 4943aed0e..fb4360c9c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RateTest.php
@@ -6,10 +6,8 @@ class RateTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRATE
-     *
-     * @param mixed $expectedResult
      */
-    public function testRATE($expectedResult, ...$args): void
+    public function testRATE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('RATE', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/ReceivedTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/ReceivedTest.php
index 648c62a6b..c75d31999 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/ReceivedTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/ReceivedTest.php
@@ -6,10 +6,8 @@ class ReceivedTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRECEIVED
-     *
-     * @param mixed $expectedResult
      */
-    public function testRECEIVED($expectedResult, ...$args): void
+    public function testRECEIVED(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('RECEIVED', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RriTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RriTest.php
index 97175014e..0e162abb5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RriTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/RriTest.php
@@ -6,10 +6,8 @@ class RriTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRRI
-     *
-     * @param mixed $expectedResult
      */
-    public function testRRI($expectedResult, array $args): void
+    public function testRRI(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('RRI', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SlnTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SlnTest.php
index acce9b3de..59966a0a1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SlnTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SlnTest.php
@@ -6,10 +6,8 @@ class SlnTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSLN
-     *
-     * @param mixed $expectedResult
      */
-    public function testSLN($expectedResult, array $args): void
+    public function testSLN(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('SLN', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SydTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SydTest.php
index 3cc228b45..61b871855 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SydTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/SydTest.php
@@ -6,10 +6,8 @@ class SydTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSYD
-     *
-     * @param mixed $expectedResult
      */
-    public function testSYD($expectedResult, array $args): void
+    public function testSYD(mixed $expectedResult, array $args): void
     {
         $this->runTestCase('SYD', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillEqTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillEqTest.php
index bf1994785..9e04c6866 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillEqTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillEqTest.php
@@ -6,10 +6,8 @@ class TBillEqTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTBILLEQ
-     *
-     * @param mixed $expectedResult
      */
-    public function testTBILLEQ($expectedResult, ...$args): void
+    public function testTBILLEQ(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('TBILLEQ', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillPriceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillPriceTest.php
index 2beb00966..4506d430c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillPriceTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillPriceTest.php
@@ -6,10 +6,8 @@ class TBillPriceTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTBILLPRICE
-     *
-     * @param mixed $expectedResult
      */
-    public function testTBILLPRICE($expectedResult, ...$args): void
+    public function testTBILLPRICE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('TBILLPRICE', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillYieldTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillYieldTest.php
index bdfa5a5bb..37529c57b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillYieldTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/TBillYieldTest.php
@@ -6,10 +6,8 @@ class TBillYieldTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTBILLYIELD
-     *
-     * @param mixed $expectedResult
      */
-    public function testTBILLYIELD($expectedResult, ...$args): void
+    public function testTBILLYIELD(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('TBILLYIELD', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/UsDollarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/UsDollarTest.php
index 8eeb78fc9..f15adc1ff 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/UsDollarTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/UsDollarTest.php
@@ -6,10 +6,8 @@ class UsDollarTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerUSDOLLAR
-     *
-     * @param mixed $expectedResult
      */
-    public function testUSDOLLAR($expectedResult, ...$args): void
+    public function testUSDOLLAR(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('USDOLLAR', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XNpvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XNpvTest.php
index a147d71d4..c2a011696 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XNpvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XNpvTest.php
@@ -6,13 +6,8 @@ class XNpvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerXNPV
-     *
-     * @param mixed $expectedResult
-     * @param mixed $rate
-     * @param mixed $values
-     * @param mixed $dates
      */
-    public function testXNPV($expectedResult, $rate = null, $values = null, $dates = null): void
+    public function testXNPV(mixed $expectedResult, mixed $rate = null, mixed $values = null, mixed $dates = null): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XirrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XirrTest.php
index d454de37b..6df19e5b2 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XirrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/XirrTest.php
@@ -6,13 +6,8 @@ class XirrTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerXIRR
-     *
-     * @param mixed $expectedResult
-     * @param mixed $values
-     * @param mixed $dates
-     * @param mixed $guess
      */
-    public function testXIRR($expectedResult, $values = null, $dates = null, $guess = null): void
+    public function testXIRR(mixed $expectedResult, mixed $values = null, mixed $dates = null, mixed $guess = null): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldDiscTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldDiscTest.php
index ec3d96419..b051f8907 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldDiscTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldDiscTest.php
@@ -6,10 +6,8 @@ class YieldDiscTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerYIELDDISC
-     *
-     * @param mixed $expectedResult
      */
-    public function testYIELDDISC($expectedResult, ...$args): void
+    public function testYIELDDISC(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('YIELDDISC', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldMatTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldMatTest.php
index 89f9b891e..c6bc24fe9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldMatTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/YieldMatTest.php
@@ -6,10 +6,8 @@ class YieldMatTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerYIELDMAT
-     *
-     * @param mixed $expectedResult
      */
-    public function testYIELDMAT($expectedResult, ...$args): void
+    public function testYIELDMAT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('YIELDMAT', $expectedResult, $args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php b/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php
index a6b9bf811..ac2324e82 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/FormulaArguments.php
@@ -12,10 +12,7 @@ class FormulaArguments
      */
     protected array $args;
 
-    /**
-     * @param mixed ...$args
-     */
-    public function __construct(...$args)
+    public function __construct(mixed ...$args)
     {
         $this->args = $args;
     }
@@ -69,10 +66,7 @@ class FormulaArguments
         return implode(';', $matrix);
     }
 
-    /**
-     * @param mixed $value
-     */
-    private function stringify($value): string
+    private function stringify(mixed $value): string
     {
         if (is_array($value)) {
             return '{' . $this->makeMatrix($value) . '}';
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/ErrorTypeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/ErrorTypeTest.php
index d3e3c58bb..f20cd94f6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/ErrorTypeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/ErrorTypeTest.php
@@ -16,11 +16,8 @@ class ErrorTypeTest extends TestCase
 
     /**
      * @dataProvider providerErrorType
-     *
-     * @param int|string $expectedResult
-     * @param mixed $value
      */
-    public function testErrorType($expectedResult, $value): void
+    public function testErrorType(int|string $expectedResult, mixed $value): void
     {
         $result = ExcelError::type($value);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsBlankTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsBlankTest.php
index 0713e9ed0..f14ea6b1a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsBlankTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsBlankTest.php
@@ -16,10 +16,8 @@ class IsBlankTest extends TestCase
 
     /**
      * @dataProvider providerIsBlank
-     *
-     * @param mixed $value
      */
-    public function testIsBlank(bool $expectedResult, $value): void
+    public function testIsBlank(bool $expectedResult, mixed $value): void
     {
         $result = Value::isBlank($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrTest.php
index aff619414..00d5384b6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrTest.php
@@ -16,10 +16,8 @@ class IsErrTest extends TestCase
 
     /**
      * @dataProvider providerIsErr
-     *
-     * @param mixed $value
      */
-    public function testIsErr(bool $expectedResult, $value): void
+    public function testIsErr(bool $expectedResult, mixed $value): void
     {
         $result = ErrorValue::isErr($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrorTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrorTest.php
index ff7f48176..20eb04a9e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrorTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsErrorTest.php
@@ -16,10 +16,8 @@ class IsErrorTest extends TestCase
 
     /**
      * @dataProvider providerIsError
-     *
-     * @param mixed $value
      */
-    public function testIsError(bool $expectedResult, $value): void
+    public function testIsError(bool $expectedResult, mixed $value): void
     {
         $result = ErrorValue::isError($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsEvenTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsEvenTest.php
index 685a909ec..dd3871694 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsEvenTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsEvenTest.php
@@ -17,11 +17,8 @@ class IsEvenTest extends TestCase
 
     /**
      * @dataProvider providerIsEven
-     *
-     * @param bool|string $expectedResult
-     * @param mixed $value
      */
-    public function testIsEven($expectedResult, $value): void
+    public function testIsEven(bool|string $expectedResult, mixed $value): void
     {
         $result = Value::isEven($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsLogicalTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsLogicalTest.php
index 8dd2abb08..7b82440d0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsLogicalTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsLogicalTest.php
@@ -16,10 +16,8 @@ class IsLogicalTest extends TestCase
 
     /**
      * @dataProvider providerIsLogical
-     *
-     * @param mixed $value
      */
-    public function testIsLogical(bool $expectedResult, $value): void
+    public function testIsLogical(bool $expectedResult, mixed $value): void
     {
         $result = Value::isLogical($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNaTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNaTest.php
index 56bc49fe5..51305209b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNaTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNaTest.php
@@ -16,10 +16,8 @@ class IsNaTest extends TestCase
 
     /**
      * @dataProvider providerIsNa
-     *
-     * @param mixed $value
      */
-    public function testIsNa(bool $expectedResult, $value): void
+    public function testIsNa(bool $expectedResult, mixed $value): void
     {
         $result = ErrorValue::isNa($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNonTextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNonTextTest.php
index 20a8c2c61..46513970e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNonTextTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNonTextTest.php
@@ -16,10 +16,8 @@ class IsNonTextTest extends TestCase
 
     /**
      * @dataProvider providerIsNonText
-     *
-     * @param mixed $value
      */
-    public function testIsNonText(bool $expectedResult, $value): void
+    public function testIsNonText(bool $expectedResult, mixed $value): void
     {
         $result = Value::isNonText($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNumberTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNumberTest.php
index f7341acc0..860ccbf4a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNumberTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsNumberTest.php
@@ -16,10 +16,8 @@ class IsNumberTest extends TestCase
 
     /**
      * @dataProvider providerIsNumber
-     *
-     * @param mixed $value
      */
-    public function testIsNumber(bool $expectedResult, $value): void
+    public function testIsNumber(bool $expectedResult, mixed $value): void
     {
         $result = Value::isNumber($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsOddTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsOddTest.php
index 4510de66f..401f249f5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsOddTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsOddTest.php
@@ -17,11 +17,8 @@ class IsOddTest extends TestCase
 
     /**
      * @dataProvider providerIsOdd
-     *
-     * @param bool|string $expectedResult
-     * @param mixed $value
      */
-    public function testIsOdd($expectedResult, $value): void
+    public function testIsOdd(bool|string $expectedResult, mixed $value): void
     {
         $result = Value::isOdd($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsTextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsTextTest.php
index f40d9013d..ec2663816 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsTextTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/IsTextTest.php
@@ -16,10 +16,8 @@ class IsTextTest extends TestCase
 
     /**
      * @dataProvider providerIsText
-     *
-     * @param mixed $value
      */
-    public function testIsText(bool $expectedResult, $value): void
+    public function testIsText(bool $expectedResult, mixed $value): void
     {
         $result = Value::isText($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/NTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/NTest.php
index 13d50412d..5aed21c4f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/NTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/NTest.php
@@ -15,11 +15,8 @@ class NTest extends TestCase
 
     /**
      * @dataProvider providerN
-     *
-     * @param mixed $expectedResult
-     * @param number|string $value
      */
-    public function testN($expectedResult, $value): void
+    public function testN(mixed $expectedResult, mixed $value): void
     {
         $result = Value::asNumber($value);
         self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/TypeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/TypeTest.php
index f3022712c..817abb4d8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Information/TypeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Information/TypeTest.php
@@ -15,10 +15,8 @@ class TypeTest extends TestCase
 
     /**
      * @dataProvider providerTYPE
-     *
-     * @param mixed $value
      */
-    public function testTYPE(int $expectedResult, $value): void
+    public function testTYPE(int $expectedResult, mixed $value): void
     {
         $result = Value::type($value);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php
index 34432c6a1..1a14244df 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AllSetupTeardown.php
@@ -51,20 +51,14 @@ class AllSetupTeardown extends TestCase
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_GNUMERIC);
     }
 
-    /**
-     * @param mixed $expectedResult
-     */
-    protected function mightHaveException($expectedResult): void
+    protected function mightHaveException(mixed $expectedResult): void
     {
         if ($expectedResult === 'exception') {
             $this->expectException(CalcException::class);
         }
     }
 
-    /**
-     * @param mixed $value
-     */
-    protected function setCell(string $cell, $value): void
+    protected function setCell(string $cell, mixed $value): void
     {
         if ($value !== null) {
             if (is_string($value) && is_numeric($value)) {
@@ -95,11 +89,7 @@ class AllSetupTeardown extends TestCase
         return $this->sheet;
     }
 
-    /**
-     * @param mixed $expectedResult
-     * @param array $args
-     */
-    protected function runTestCase(string $functionName, $expectedResult, ...$args): void
+    protected function runTestCase(string $functionName, mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AndTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AndTest.php
index b9ad5bbe1..ccc68c0ab 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AndTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/AndTest.php
@@ -6,10 +6,8 @@ class AndTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAND
-     *
-     * @param mixed $expectedResult
      */
-    public function testAND($expectedResult, ...$args): void
+    public function testAND(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('AND', $expectedResult, ...$args);
     }
@@ -21,11 +19,8 @@ class AndTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerANDLiteral
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testANDLiteral($expectedResult, $formula): void
+    public function testANDLiteral(mixed $expectedResult, mixed $formula): void
     {
         $sheet = $this->getSheet();
         $sheet->getCell('A1')->setValue("=AND($formula)");
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfErrorTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfErrorTest.php
index cf0651df1..eae346775 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfErrorTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfErrorTest.php
@@ -8,10 +8,8 @@ class IfErrorTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerIFERROR
-     *
-     * @param mixed $expectedResult
      */
-    public function testIFERROR($expectedResult, ...$args): void
+    public function testIFERROR(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('IFERROR', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfNaTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfNaTest.php
index eab941038..e31c9531b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfNaTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfNaTest.php
@@ -8,10 +8,8 @@ class IfNaTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerIFNA
-     *
-     * @param mixed $expectedResult
      */
-    public function testIFNA($expectedResult, ...$args): void
+    public function testIFNA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('IFNA', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfTest.php
index 914f50fd7..bb9de92bc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfTest.php
@@ -6,10 +6,8 @@ class IfTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerIF
-     *
-     * @param mixed $expectedResult
      */
-    public function testIF($expectedResult, ...$args): void
+    public function testIF(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('IF', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php
index a1ca9a265..d52504643 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php
@@ -8,11 +8,8 @@ class IfsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerIFS
-     *
-     * @param mixed $expectedResult
-     * @param mixed $args
      */
-    public function testIFS($expectedResult, ...$args): void
+    public function testIFS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('IFS', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/NotTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/NotTest.php
index 0d408ff7f..9e2b825f2 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/NotTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/NotTest.php
@@ -8,10 +8,8 @@ class NotTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNOT
-     *
-     * @param mixed $expectedResult
      */
-    public function testNOT($expectedResult, ...$args): void
+    public function testNOT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('NOT', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/OrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/OrTest.php
index 4b6368358..8b7a48f18 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/OrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/OrTest.php
@@ -6,10 +6,8 @@ class OrTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testOR($expectedResult, ...$args): void
+    public function testOR(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('OR', $expectedResult, ...$args);
     }
@@ -21,11 +19,8 @@ class OrTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerORLiteral
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testORLiteral($expectedResult, $formula): void
+    public function testORLiteral(mixed $expectedResult, mixed $formula): void
     {
         $sheet = $this->getSheet();
         $sheet->getCell('A1')->setValue("=OR($formula)");
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/SwitchTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/SwitchTest.php
index 7b9c92df5..2e923825c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/SwitchTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/SwitchTest.php
@@ -8,10 +8,8 @@ class SwitchTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSwitch
-     *
-     * @param mixed $expectedResult
      */
-    public function testSWITCH($expectedResult, ...$args): void
+    public function testSWITCH(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('SWITCH', $expectedResult, ...$args);
     }
@@ -23,12 +21,8 @@ class SwitchTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerSwitchArray
-     *
-     * @param mixed $expression
-     * @param mixed $value1
-     * @param mixed $value2
      */
-    public function testIfsArray(array $expectedResult, $expression, $value1, string $result1, $value2, string $result2, string $default): void
+    public function testIfsArray(array $expectedResult, mixed $expression, mixed $value1, string $result1, mixed $value2, string $result2, string $default): void
     {
         $calculation = Calculation::getInstance();
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/XorTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/XorTest.php
index 922bd02bb..a41666987 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/XorTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/XorTest.php
@@ -6,10 +6,8 @@ class XorTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerXOR
-     *
-     * @param mixed $expectedResult
      */
-    public function testXOR($expectedResult, ...$args): void
+    public function testXOR(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCase('XOR', $expectedResult, ...$args);
     }
@@ -21,11 +19,8 @@ class XorTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerXORLiteral
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function xtestXORLiteral($expectedResult, $formula): void
+    public function xtestXORLiteral(mixed $expectedResult, string $formula): void
     {
         $sheet = $this->getSheet();
         $sheet->getCell('A1')->setValue("=XOR($formula)");
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php
index 73e0d5c9c..aec33583b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php
@@ -10,10 +10,8 @@ class AddressTest extends TestCase
 {
     /**
      * @dataProvider providerADDRESS
-     *
-     * @param mixed $expectedResult
      */
-    public function testADDRESS($expectedResult, ...$args): void
+    public function testADDRESS(mixed $expectedResult, mixed ...$args): void
     {
         $result = LookupRef\Address::cell(...$args);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php
index 52f561e11..a6b500747 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AllSetupTeardown.php
@@ -51,20 +51,14 @@ class AllSetupTeardown extends TestCase
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_GNUMERIC);
     }
 
-    /**
-     * @param mixed $expectedResult
-     */
-    protected function mightHaveException($expectedResult): void
+    protected function mightHaveException(mixed $expectedResult): void
     {
         if ($expectedResult === 'exception') {
             $this->expectException(CalcException::class);
         }
     }
 
-    /**
-     * @param mixed $value
-     */
-    protected function setCell(string $cell, $value): void
+    protected function setCell(string $cell, mixed $value): void
     {
         if ($value !== null) {
             if (is_string($value) && is_numeric($value)) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ChooseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ChooseTest.php
index 76421f252..22dc2626a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ChooseTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ChooseTest.php
@@ -10,10 +10,8 @@ class ChooseTest extends TestCase
 {
     /**
      * @dataProvider providerCHOOSE
-     *
-     * @param mixed $expectedResult
      */
-    public function testCHOOSE($expectedResult, ...$args): void
+    public function testCHOOSE(mixed $expectedResult, mixed ...$args): void
     {
         $result = LookupRef\Selection::choose(...$args);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnOnSpreadsheetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnOnSpreadsheetTest.php
index 6ba99f016..29f49bc3a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnOnSpreadsheetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnOnSpreadsheetTest.php
@@ -8,11 +8,8 @@ class ColumnOnSpreadsheetTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOLUMNonSpreadsheet
-     *
-     * @param mixed $expectedResult
-     * @param string $cellReference
      */
-    public function testColumnOnSpreadsheet($expectedResult, $cellReference = 'omitted'): void
+    public function testColumnOnSpreadsheet(mixed $expectedResult, string $cellReference = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnTest.php
index 75e7a4ed2..d5e2c3ecc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnTest.php
@@ -8,11 +8,8 @@ class ColumnTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOLUMN
-     *
-     * @param mixed $expectedResult
-     * @param null|array|string $cellReference
      */
-    public function testCOLUMN($expectedResult, $cellReference = null): void
+    public function testCOLUMN(mixed $expectedResult, null|array|string $cellReference = null): void
     {
         $result = LookupRef\RowColumnInformation::COLUMN($cellReference);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsOnSpreadsheetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsOnSpreadsheetTest.php
index 2ff070c6f..e1a80bcb3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsOnSpreadsheetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsOnSpreadsheetTest.php
@@ -8,11 +8,8 @@ class ColumnsOnSpreadsheetTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOLUMNSonSpreadsheet
-     *
-     * @param mixed $expectedResult
-     * @param string $cellReference
      */
-    public function testColumnsOnSpreadsheet($expectedResult, $cellReference = 'omitted'): void
+    public function testColumnsOnSpreadsheet(mixed $expectedResult, string $cellReference = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php
index c3bdad29e..6ac932c85 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php
@@ -10,11 +10,8 @@ class ColumnsTest extends TestCase
 {
     /**
      * @dataProvider providerCOLUMNS
-     *
-     * @param mixed $expectedResult
-     * @param null|array|string $arg
      */
-    public function testCOLUMNS($expectedResult, $arg): void
+    public function testCOLUMNS(mixed $expectedResult, null|array|string $arg): void
     {
         $result = LookupRef\RowColumnInformation::COLUMNS($arg);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php
index e024e0430..cc1712e51 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php
@@ -10,11 +10,9 @@ use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Formula;
 class FormulaTextTest extends AllSetupTeardown
 {
     /**
-     * @param mixed $value
-     *
      * @dataProvider providerFormulaText
      */
-    public function testFormulaText(string $expectedResult, $value): void
+    public function testFormulaText(string $expectedResult, mixed $value): void
     {
         $sheet = $this->getSheet();
         $reference = 'A1';
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php
index 57c7caf50..0b04ca861 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php
@@ -12,12 +12,8 @@ class HLookupTest extends TestCase
 {
     /**
      * @dataProvider providerHLOOKUP
-     *
-     * @param mixed $expectedResult
-     * @param mixed $lookup
-     * @param mixed $rowIndex
      */
-    public function testHLOOKUP($expectedResult, $lookup, array $values, $rowIndex, ?bool $rangeLookup = null): void
+    public function testHLOOKUP(mixed $expectedResult, mixed $lookup, array $values, mixed $rowIndex, ?bool $rangeLookup = null): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HyperlinkTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HyperlinkTest.php
index 6ebd05384..ab50f84e8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HyperlinkTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HyperlinkTest.php
@@ -12,10 +12,8 @@ class HyperlinkTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerHYPERLINK
-     *
-     * @param array|string $expectedResult
      */
-    public function testHYPERLINK($expectedResult, ?string $linkUrl, ?string $description): void
+    public function testHYPERLINK(array|string $expectedResult, ?string $linkUrl, ?string $description): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -42,10 +40,8 @@ class HyperlinkTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerHYPERLINK
-     *
-     * @param array|string $expectedResult
      */
-    public function testHYPERLINKcellRef($expectedResult, ?string $linkUrl, ?string $description): void
+    public function testHYPERLINKcellRef(array|string $expectedResult, ?string $linkUrl, ?string $description): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexOnSpreadsheetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexOnSpreadsheetTest.php
index abae76d18..651986932 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexOnSpreadsheetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexOnSpreadsheetTest.php
@@ -6,12 +6,8 @@ class IndexOnSpreadsheetTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerINDEXonSpreadsheet
-     *
-     * @param mixed $expectedResult
-     * @param null|int|string $rowNum
-     * @param null|int|string $colNum
      */
-    public function testIndexOnSpreadsheet($expectedResult, array $matrix, $rowNum = null, $colNum = null): void
+    public function testIndexOnSpreadsheet(mixed $expectedResult, array $matrix, null|int|string $rowNum = null, null|int|string $colNum = null): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php
index 6d2ee6bad..9c9a675bb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php
@@ -11,13 +11,8 @@ class IndexTest extends TestCase
 {
     /**
      * @dataProvider providerINDEX
-     *
-     * @param mixed $expectedResult
-     * @param mixed $matrix
-     * @param mixed $rowNum
-     * @param mixed $colNum
      */
-    public function testINDEX($expectedResult, $matrix, $rowNum = null, $colNum = null): void
+    public function testINDEX(mixed $expectedResult, mixed $matrix, mixed $rowNum = null, mixed $colNum = null): void
     {
         if ($rowNum === null) {
             $result = Matrix::index($matrix);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php
index 8f0727e0c..39a3debcb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php
@@ -10,12 +10,8 @@ class IndirectTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerINDIRECT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $cellReference
-     * @param mixed $a1
      */
-    public function testINDIRECT($expectedResult, $cellReference = 'omitted', $a1 = 'omitted'): void
+    public function testINDIRECT(mixed $expectedResult, mixed $cellReference = 'omitted', mixed $a1 = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -135,11 +131,9 @@ class IndirectTest extends AllSetupTeardown
     }
 
     /**
-     * @param null|int|string $expectedResult
-     *
      * @dataProvider providerRelative
      */
-    public function testR1C1Relative($expectedResult, string $address): void
+    public function testR1C1Relative(string|int|null $expectedResult, string $address): void
     {
         $sheet = $this->getSheet();
         $sheet->fromArray([
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/LookupTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/LookupTest.php
index fbc593f10..d0e56110a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/LookupTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/LookupTest.php
@@ -11,10 +11,8 @@ class LookupTest extends TestCase
 {
     /**
      * @dataProvider providerLOOKUP
-     *
-     * @param mixed $expectedResult
      */
-    public function testLOOKUP($expectedResult, ...$args): void
+    public function testLOOKUP(mixed $expectedResult, mixed ...$args): void
     {
         $result = LookupRef\Lookup::lookup(...$args);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/MatchTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/MatchTest.php
index 3ab4eaf56..f9c6ee13f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/MatchTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/MatchTest.php
@@ -8,12 +8,8 @@ class MatchTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMATCH
-     *
-     * @param mixed $expectedResult
-     * @param mixed $input
-     * @param mixed $type
      */
-    public function testMATCH($expectedResult, $input, array $array, $type = null): void
+    public function testMATCH(mixed $expectedResult, mixed $input, array $array, mixed $type = null): void
     {
         if (is_array($expectedResult)) {
             $expectedResult = $expectedResult[0];
@@ -43,12 +39,8 @@ class MatchTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerMATCH
-     *
-     * @param mixed $expectedResult
-     * @param mixed $input
-     * @param mixed $type
      */
-    public function testMATCHLibre($expectedResult, $input, array $array, $type = null): void
+    public function testMATCHLibre(mixed $expectedResult, mixed $input, array $array, mixed $type = null): void
     {
         $this->setOpenOffice();
         if (is_array($expectedResult)) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php
index 781bf9dbe..4c644a489 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php
@@ -9,11 +9,8 @@ class OffsetTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerOFFSET
-     *
-     * @param mixed $expectedResult
-     * @param null|string $cellReference
      */
-    public function testOFFSET($expectedResult, $cellReference = null): void
+    public function testOFFSET(mixed $expectedResult, null|string $cellReference = null): void
     {
         $result = LookupRef\Offset::OFFSET($cellReference);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowOnSpreadsheetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowOnSpreadsheetTest.php
index c7101674b..2216049fb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowOnSpreadsheetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowOnSpreadsheetTest.php
@@ -8,11 +8,8 @@ class RowOnSpreadsheetTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerROWonSpreadsheet
-     *
-     * @param mixed $expectedResult
-     * @param string $cellReference
      */
-    public function testRowOnSpreadsheet($expectedResult, $cellReference = 'omitted'): void
+    public function testRowOnSpreadsheet(mixed $expectedResult, string $cellReference = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowTest.php
index 48d6cf08c..5c00cd821 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowTest.php
@@ -8,11 +8,8 @@ class RowTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerROW
-     *
-     * @param mixed $expectedResult
-     * @param null|array|string $cellReference
      */
-    public function testROW($expectedResult, $cellReference = null): void
+    public function testROW(mixed $expectedResult, null|array|string $cellReference = null): void
     {
         $result = LookupRef\RowColumnInformation::ROW($cellReference);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsOnSpreadsheetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsOnSpreadsheetTest.php
index 36dec5111..96c3304b7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsOnSpreadsheetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsOnSpreadsheetTest.php
@@ -8,11 +8,8 @@ class RowsOnSpreadsheetTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerROWSonSpreadsheet
-     *
-     * @param mixed $expectedResult
-     * @param string $cellReference
      */
-    public function testRowsOnSpreadsheet($expectedResult, $cellReference = 'omitted'): void
+    public function testRowsOnSpreadsheet(mixed $expectedResult, string $cellReference = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php
index 74dcb9c6b..7acbbdbbb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php
@@ -10,11 +10,8 @@ class RowsTest extends TestCase
 {
     /**
      * @dataProvider providerROWS
-     *
-     * @param mixed $expectedResult
-     * @param null|array|string $arg
      */
-    public function testROWS($expectedResult, $arg): void
+    public function testROWS(mixed $expectedResult, null|array|string $arg): void
     {
         $result = LookupRef\RowColumnInformation::ROWS($arg);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortByTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortByTest.php
index a2eb006d5..cad598e0b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortByTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortByTest.php
@@ -18,11 +18,8 @@ class SortByTest extends TestCase
 
     /**
      * @dataProvider providerSortWithScalarArgumentErrorReturns
-     *
-     * @param mixed $sortIndex
-     * @param mixed $sortOrder
      */
-    public function testSortByWithArgumentErrorReturns($sortIndex, $sortOrder = 1): void
+    public function testSortByWithArgumentErrorReturns(mixed $sortIndex, mixed $sortOrder = 1): void
     {
         $value = [[1, 2], [3, 4], [5, 6]];
 
@@ -45,7 +42,7 @@ class SortByTest extends TestCase
     /**
      * @dataProvider providerSortByRow
      */
-    public function testSortByRow(array $expectedResult, array $matrix, ...$args): void
+    public function testSortByRow(array $expectedResult, array $matrix, mixed ...$args): void
     {
         $result = Sort::sortBy($matrix, ...$args);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortTest.php
index 3145cfd3e..e57fee260 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/SortTest.php
@@ -18,11 +18,8 @@ class SortTest extends TestCase
 
     /**
      * @dataProvider providerSortWithScalarArgumentErrorReturns
-     *
-     * @param mixed $sortIndex
-     * @param mixed $sortOrder
      */
-    public function testSortWithScalarArgumentErrorReturns($sortIndex, $sortOrder = 1): void
+    public function testSortWithScalarArgumentErrorReturns(mixed $sortIndex, mixed $sortOrder = 1): void
     {
         $value = [[1, 2], [3, 4], [5, 6]];
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/TransposeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/TransposeTest.php
index acb9e110f..0c206f5d8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/TransposeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/TransposeTest.php
@@ -15,11 +15,8 @@ class TransposeTest extends TestCase
 
     /**
      * @dataProvider providerTRANSPOSE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $matrix
      */
-    public function testTRANSPOSE($expectedResult, $matrix): void
+    public function testTRANSPOSE(mixed $expectedResult, mixed $matrix): void
     {
         $result = LookupRef\Matrix::transpose($matrix);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/VLookupTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/VLookupTest.php
index 54e350d3c..66357d681 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/VLookupTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/VLookupTest.php
@@ -10,13 +10,8 @@ class VLookupTest extends TestCase
 {
     /**
      * @dataProvider providerVLOOKUP
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
-     * @param mixed $table
-     * @param mixed $index
      */
-    public function testVLOOKUP($expectedResult, $value, $table, $index, ?bool $lookup = null): void
+    public function testVLOOKUP(mixed $expectedResult, mixed $value, mixed $table, mixed $index, ?bool $lookup = null): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AbsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AbsTest.php
index 411131713..98e95611f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AbsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AbsTest.php
@@ -8,11 +8,8 @@ class AbsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAbs
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testAbs($expectedResult, $number = 'omitted'): void
+    public function testAbs(mixed $expectedResult, mixed $number = 'omitted'): void
     {
         $sheet = $this->getSheet();
         $this->mightHaveException($expectedResult);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcosTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcosTest.php
index e94580178..36f7bd9cf 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcosTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcosTest.php
@@ -8,10 +8,8 @@ class AcosTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAcos
-     *
-     * @param mixed $expectedResult
      */
-    public function testAcos($expectedResult, string $formula): void
+    public function testAcos(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcoshTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcoshTest.php
index b4bbacf0b..0dbe6ec7c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcoshTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcoshTest.php
@@ -8,10 +8,8 @@ class AcoshTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAcosh
-     *
-     * @param mixed $expectedResult
      */
-    public function testAcosh($expectedResult, string $formula): void
+    public function testAcosh(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcotTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcotTest.php
index 326ec400d..8f1b9a969 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcotTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcotTest.php
@@ -8,11 +8,8 @@ class AcotTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerACOT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testACOT($expectedResult, $number): void
+    public function testACOT(mixed $expectedResult, mixed $number): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcothTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcothTest.php
index def904eac..5823945df 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcothTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AcothTest.php
@@ -8,11 +8,8 @@ class AcothTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerACOTH
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testACOTH($expectedResult, $number): void
+    public function testACOTH(mixed $expectedResult, mixed $number): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php
index f54ecaad9..ddd9c827e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AllSetupTeardown.php
@@ -51,20 +51,14 @@ class AllSetupTeardown extends TestCase
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_GNUMERIC);
     }
 
-    /**
-     * @param mixed $expectedResult
-     */
-    protected function mightHaveException($expectedResult): void
+    protected function mightHaveException(mixed $expectedResult): void
     {
         if ($expectedResult === 'exception') {
             $this->expectException(CalcException::class);
         }
     }
 
-    /**
-     * @param mixed $value
-     */
-    protected function setCell(string $cell, $value): void
+    protected function setCell(string $cell, mixed $value): void
     {
         if ($value !== null) {
             if (is_string($value) && is_numeric($value)) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ArabicTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ArabicTest.php
index 2c80a07e4..a2621e817 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ArabicTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ArabicTest.php
@@ -8,11 +8,8 @@ class ArabicTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerARABIC
-     *
-     * @param mixed $expectedResult
-     * @param string $romanNumeral
      */
-    public function testARABIC($expectedResult, $romanNumeral): void
+    public function testARABIC(mixed $expectedResult, string $romanNumeral): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinTest.php
index 98f66957d..d0fde4a34 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinTest.php
@@ -8,10 +8,8 @@ class AsinTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAsin
-     *
-     * @param mixed $expectedResult
      */
-    public function testAsin($expectedResult, string $formula): void
+    public function testAsin(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinhTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinhTest.php
index 53b9777aa..908aa31fb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinhTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AsinhTest.php
@@ -8,10 +8,8 @@ class AsinhTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAsinh
-     *
-     * @param mixed $expectedResult
      */
-    public function testAsinh($expectedResult, string $formula): void
+    public function testAsinh(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Atan2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Atan2Test.php
index 2fb7c0f5c..b08dcf63d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Atan2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Atan2Test.php
@@ -8,10 +8,8 @@ class Atan2Test extends AllSetupTeardown
 {
     /**
      * @dataProvider providerATAN2
-     *
-     * @param mixed $expectedResult
      */
-    public function testATAN2($expectedResult, string $formula): void
+    public function testATAN2(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanTest.php
index 3de5f1ab6..0cd7d7e10 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanTest.php
@@ -8,10 +8,8 @@ class AtanTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAtan
-     *
-     * @param mixed $expectedResult
      */
-    public function testAtan($expectedResult, string $formula): void
+    public function testAtan(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanhTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanhTest.php
index 3e7cdb2ab..74d877902 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanhTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/AtanhTest.php
@@ -8,10 +8,8 @@ class AtanhTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAtanh
-     *
-     * @param mixed $expectedResult
      */
-    public function testAtanh($expectedResult, string $formula): void
+    public function testAtanh(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/BaseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/BaseTest.php
index 90360305f..4be5c6f56 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/BaseTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/BaseTest.php
@@ -8,13 +8,8 @@ class BaseTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerBASE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $arg1
-     * @param mixed $arg2
-     * @param mixed $arg3
      */
-    public function testBASE($expectedResult, $arg1 = 'omitted', $arg2 = 'omitted', $arg3 = 'omitted'): void
+    public function testBASE(mixed $expectedResult, mixed $arg1 = 'omitted', mixed $arg2 = 'omitted', mixed $arg3 = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingMathTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingMathTest.php
index 1ae3c83e9..79b2f6385 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingMathTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingMathTest.php
@@ -8,11 +8,8 @@ class CeilingMathTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCEILINGMATH
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testCEILINGMATH($expectedResult, $formula): void
+    public function testCEILINGMATH(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingPreciseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingPreciseTest.php
index 00bb6e1b1..7b6f0ef5c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingPreciseTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingPreciseTest.php
@@ -8,11 +8,8 @@ class CeilingPreciseTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFLOORPRECISE
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testCEILINGPRECISE($expectedResult, $formula): void
+    public function testCEILINGPRECISE(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingTest.php
index c12040cc8..f193f91eb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CeilingTest.php
@@ -8,11 +8,8 @@ class CeilingTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCEILING
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testCEILING($expectedResult, $formula): void
+    public function testCEILING(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinATest.php
index 260d6d20e..7a615e97f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinATest.php
@@ -8,12 +8,8 @@ class CombinATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOMBINA
-     *
-     * @param mixed $expectedResult
-     * @param mixed $numObjs
-     * @param mixed $numInSet
      */
-    public function testCOMBINA($expectedResult, $numObjs, $numInSet): void
+    public function testCOMBINA(mixed $expectedResult, mixed $numObjs, mixed $numInSet): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinTest.php
index f7fcfed74..b622f96c5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CombinTest.php
@@ -8,12 +8,8 @@ class CombinTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOMBIN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $numObjs
-     * @param mixed $numInSet
      */
-    public function testCOMBIN($expectedResult, $numObjs, $numInSet): void
+    public function testCOMBIN(mixed $expectedResult, mixed $numObjs, mixed $numInSet): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CosTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CosTest.php
index 4f0732017..57275814c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CosTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CosTest.php
@@ -8,10 +8,8 @@ class CosTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCos
-     *
-     * @param mixed $expectedResult
      */
-    public function testCos($expectedResult, string $formula): void
+    public function testCos(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CoshTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CoshTest.php
index caabfdd76..c4f34b334 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CoshTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CoshTest.php
@@ -8,10 +8,8 @@ class CoshTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCosh
-     *
-     * @param mixed $expectedResult
      */
-    public function testCosh($expectedResult, string $formula): void
+    public function testCosh(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CotTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CotTest.php
index 5fd56b0b1..6550f76c1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CotTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CotTest.php
@@ -8,11 +8,8 @@ class CotTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $angle
      */
-    public function testCOT($expectedResult, $angle): void
+    public function testCOT(mixed $expectedResult, mixed $angle): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CothTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CothTest.php
index a14f9b40f..501a9caee 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CothTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CothTest.php
@@ -8,11 +8,8 @@ class CothTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOTH
-     *
-     * @param mixed $expectedResult
-     * @param mixed $angle
      */
-    public function testCOTH($expectedResult, $angle): void
+    public function testCOTH(mixed $expectedResult, mixed $angle): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CscTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CscTest.php
index f64cef3a5..76cb8e3f0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CscTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CscTest.php
@@ -8,11 +8,8 @@ class CscTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCSC
-     *
-     * @param mixed $expectedResult
-     * @param mixed $angle
      */
-    public function testCSC($expectedResult, $angle): void
+    public function testCSC(mixed $expectedResult, mixed $angle): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CschTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CschTest.php
index b6d029766..901f317ef 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CschTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/CschTest.php
@@ -8,11 +8,8 @@ class CschTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCSCH
-     *
-     * @param mixed $expectedResult
-     * @param mixed $angle
      */
-    public function testCSCH($expectedResult, $angle): void
+    public function testCSCH(mixed $expectedResult, mixed $angle): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/DegreesTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/DegreesTest.php
index 42bdc1702..878fb832b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/DegreesTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/DegreesTest.php
@@ -8,11 +8,8 @@ class DegreesTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDEGREES
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testDegrees($expectedResult, $number = 'omitted'): void
+    public function testDegrees(mixed $expectedResult, mixed $number = 'omitted'): void
     {
         $sheet = $this->getSheet();
         $this->mightHaveException($expectedResult);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/EvenTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/EvenTest.php
index 275c8f4ef..ba7eb29af 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/EvenTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/EvenTest.php
@@ -8,11 +8,8 @@ class EvenTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerEVEN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testEVEN($expectedResult, $value): void
+    public function testEVEN(mixed $expectedResult, mixed $value): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ExpTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ExpTest.php
index 38c9e88ab..433281f9d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ExpTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ExpTest.php
@@ -8,11 +8,8 @@ class ExpTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerEXP
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testEXP($expectedResult, $number = 'omitted'): void
+    public function testEXP(mixed $expectedResult, mixed $number = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactDoubleTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactDoubleTest.php
index 441579ba2..e2707de4b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactDoubleTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactDoubleTest.php
@@ -8,11 +8,8 @@ class FactDoubleTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFACTDOUBLE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testFACTDOUBLE($expectedResult, $value): void
+    public function testFACTDOUBLE(mixed $expectedResult, mixed $value): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php
index 69cefc4d4..470a55491 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php
@@ -10,11 +10,8 @@ class FactTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerFACT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $arg1
      */
-    public function testFACT($expectedResult, $arg1): void
+    public function testFACT(mixed $expectedResult, mixed $arg1): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -37,11 +34,8 @@ class FactTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerFACTGnumeric
-     *
-     * @param mixed $expectedResult
-     * @param mixed $arg1
      */
-    public function testFACTGnumeric($expectedResult, $arg1): void
+    public function testFACTGnumeric(mixed $expectedResult, mixed $arg1): void
     {
         $this->mightHaveException($expectedResult);
         self::setGnumeric();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorMathTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorMathTest.php
index e37023e92..7ade15040 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorMathTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorMathTest.php
@@ -8,11 +8,8 @@ class FloorMathTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFLOORMATH
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testFLOORMATH($expectedResult, $formula): void
+    public function testFLOORMATH(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorPreciseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorPreciseTest.php
index 8573af868..7f1fee280 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorPreciseTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorPreciseTest.php
@@ -8,11 +8,8 @@ class FloorPreciseTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFLOORPRECISE
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testFLOORPRECISE($expectedResult, $formula): void
+    public function testFLOORPRECISE(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorTest.php
index f4d552958..5ebadea1d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FloorTest.php
@@ -8,11 +8,8 @@ class FloorTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFLOOR
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testFLOOR($expectedResult, $formula): void
+    public function testFLOOR(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/GcdTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/GcdTest.php
index 01f2b21f0..31f3c1ce7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/GcdTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/GcdTest.php
@@ -6,10 +6,8 @@ class GcdTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerGCD
-     *
-     * @param mixed $expectedResult
      */
-    public function testGCD($expectedResult, ...$args): void
+    public function testGCD(mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/IntTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/IntTest.php
index a861ac80e..7c8ad7e50 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/IntTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/IntTest.php
@@ -8,11 +8,8 @@ class IntTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerINT
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testINT($expectedResult, $formula): void
+    public function testINT(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LcmTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LcmTest.php
index a798ce2a1..ed5585a18 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LcmTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LcmTest.php
@@ -6,10 +6,8 @@ class LcmTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLCM
-     *
-     * @param mixed $expectedResult
      */
-    public function testLCM($expectedResult, ...$args): void
+    public function testLCM(mixed $expectedResult, mixed ...$args): void
     {
         $sheet = $this->getSheet();
         $row = 0;
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LnTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LnTest.php
index 49305d143..f362744b3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LnTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LnTest.php
@@ -8,11 +8,8 @@ class LnTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testLN($expectedResult, $number = 'omitted'): void
+    public function testLN(mixed $expectedResult, mixed $number = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Log10Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Log10Test.php
index 442456547..27d1fb98b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Log10Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/Log10Test.php
@@ -8,11 +8,8 @@ class Log10Test extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLOG10
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testLOG10($expectedResult, $number = 'omitted'): void
+    public function testLOG10(mixed $expectedResult, mixed $number = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LogTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LogTest.php
index f4baf1b72..5f13f5b7f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LogTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/LogTest.php
@@ -8,12 +8,8 @@ class LogTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLOG
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
-     * @param mixed $base
      */
-    public function testLOG($expectedResult, $number = 'omitted', $base = 'omitted'): void
+    public function testLOG(mixed $expectedResult, mixed $number = 'omitted', mixed $base = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MInverseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MInverseTest.php
index b704bc5f8..c3ccea802 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MInverseTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MInverseTest.php
@@ -8,10 +8,8 @@ class MInverseTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMINVERSE
-     *
-     * @param mixed $expectedResult
      */
-    public function testMINVERSE($expectedResult, array $args): void
+    public function testMINVERSE(mixed $expectedResult, array $args): void
     {
         $result = MathTrig\MatrixFunctions::inverse($args);
         self::assertEqualsWithDelta($expectedResult, $result, 1E-8);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MMultTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MMultTest.php
index eb7ed81da..1df9323de 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MMultTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MMultTest.php
@@ -8,10 +8,8 @@ class MMultTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMMULT
-     *
-     * @param mixed $expectedResult
      */
-    public function testMMULT($expectedResult, ...$args): void
+    public function testMMULT(mixed $expectedResult, mixed ...$args): void
     {
         $result = MathTrig\MatrixFunctions::multiply(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, 1E-8);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MRoundTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MRoundTest.php
index 34894c81a..ec22dfa18 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MRoundTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MRoundTest.php
@@ -8,11 +8,8 @@ class MRoundTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMROUND
-     *
-     * @param mixed $expectedResult
-     * @param mixed $formula
      */
-    public function testMROUND($expectedResult, $formula): void
+    public function testMROUND(mixed $expectedResult, mixed $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MdeTermTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MdeTermTest.php
index 01c6899b7..4e98e3026 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MdeTermTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MdeTermTest.php
@@ -6,11 +6,8 @@ class MdeTermTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMDETERM
-     *
-     * @param mixed $expectedResult
-     * @param mixed $matrix expect a matrix
      */
-    public function testMDETERM2($expectedResult, $matrix): void
+    public function testMDETERM2(mixed $expectedResult, mixed $matrix): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ModTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ModTest.php
index f1fc1ea25..526d7f241 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ModTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ModTest.php
@@ -8,12 +8,8 @@ class ModTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMOD
-     *
-     * @param mixed $expectedResult
-     * @param mixed $dividend
-     * @param mixed $divisor
      */
-    public function testMOD($expectedResult, $dividend = 'omitted', $divisor = 'omitted'): void
+    public function testMOD(mixed $expectedResult, mixed $dividend = 'omitted', mixed $divisor = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MultinomialTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MultinomialTest.php
index ffb66ef32..0cd8e7036 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MultinomialTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MultinomialTest.php
@@ -6,10 +6,8 @@ class MultinomialTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMULTINOMIAL
-     *
-     * @param mixed $expectedResult
      */
-    public function testMULTINOMIAL($expectedResult, ...$args): void
+    public function testMULTINOMIAL(mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/OddTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/OddTest.php
index 7b3a4ab85..7c9b26a49 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/OddTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/OddTest.php
@@ -8,11 +8,8 @@ class OddTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerODD
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testODD($expectedResult, $value): void
+    public function testODD(mixed $expectedResult, mixed $value): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/PowerTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/PowerTest.php
index db3411f52..71021c58d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/PowerTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/PowerTest.php
@@ -8,12 +8,8 @@ class PowerTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPOWER
-     *
-     * @param mixed $expectedResult
-     * @param mixed $base
-     * @param mixed $exponent
      */
-    public function testPOWER($expectedResult, $base = 'omitted', $exponent = 'omitted'): void
+    public function testPOWER(mixed $expectedResult, mixed $base = 'omitted', mixed $exponent = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ProductTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ProductTest.php
index fb6444633..5803fa237 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ProductTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/ProductTest.php
@@ -6,10 +6,8 @@ class ProductTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPRODUCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testPRODUCT($expectedResult, ...$args): void
+    public function testPRODUCT(mixed $expectedResult, mixed ...$args): void
     {
         $sheet = $this->getSheet();
         $row = 0;
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/QuotientTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/QuotientTest.php
index 90878696b..90478e6a0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/QuotientTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/QuotientTest.php
@@ -8,12 +8,8 @@ class QuotientTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerQUOTIENT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $arg1
-     * @param mixed $arg2
      */
-    public function testQUOTIENT($expectedResult, $arg1 = 'omitted', $arg2 = 'omitted'): void
+    public function testQUOTIENT(mixed $expectedResult, mixed $arg1 = 'omitted', mixed $arg2 = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RadiansTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RadiansTest.php
index d39c3615b..4f9cca253 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RadiansTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RadiansTest.php
@@ -8,11 +8,8 @@ class RadiansTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRADIANS
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testRADIANS($expectedResult, $number = 'omitted'): void
+    public function testRADIANS(mixed $expectedResult, mixed $number = 'omitted'): void
     {
         $sheet = $this->getSheet();
         $this->mightHaveException($expectedResult);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php
index 7e8cc327f..15184d3b8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php
@@ -8,12 +8,8 @@ class RandBetweenTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRANDBETWEEN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $min
-     * @param mixed $max
      */
-    public function testRANDBETWEEN($expectedResult, $min = 'omitted', $max = 'omitted'): void
+    public function testRANDBETWEEN(mixed $expectedResult, mixed $min = 'omitted', mixed $max = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RomanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RomanTest.php
index 5b6de348e..bbef39aae 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RomanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RomanTest.php
@@ -8,11 +8,8 @@ class RomanTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerROMAN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $formula
      */
-    public function testROMAN($expectedResult, $formula): void
+    public function testROMAN(mixed $expectedResult, mixed $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundDownTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundDownTest.php
index 1d9d2b602..6ba8ce3e0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundDownTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundDownTest.php
@@ -8,11 +8,8 @@ class RoundDownTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRoundDown
-     *
-     * @param mixed $expectedResult
-     * @param mixed $formula
      */
-    public function testRoundDown($expectedResult, $formula): void
+    public function testRoundDown(mixed $expectedResult, mixed $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundTest.php
index dbea38efc..8a64fd764 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundTest.php
@@ -8,11 +8,8 @@ class RoundTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRound
-     *
-     * @param mixed $expectedResult
-     * @param mixed $formula
      */
-    public function testRound($expectedResult, $formula): void
+    public function testRound(mixed $expectedResult, mixed $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundUpTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundUpTest.php
index f360c2ee4..df2c76035 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundUpTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RoundUpTest.php
@@ -8,11 +8,8 @@ class RoundUpTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRoundUp
-     *
-     * @param mixed $expectedResult
-     * @param mixed $formula
      */
-    public function testRoundUp($expectedResult, $formula): void
+    public function testRoundUp(mixed $expectedResult, mixed $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SecTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SecTest.php
index 4cd608c7e..755c91485 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SecTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SecTest.php
@@ -8,11 +8,8 @@ class SecTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSEC
-     *
-     * @param mixed $expectedResult
-     * @param mixed $angle
      */
-    public function testSEC($expectedResult, $angle): void
+    public function testSEC(mixed $expectedResult, mixed $angle): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SechTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SechTest.php
index 926017941..62245abc8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SechTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SechTest.php
@@ -8,11 +8,8 @@ class SechTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSECH
-     *
-     * @param mixed $expectedResult
-     * @param mixed $angle
      */
-    public function testSECH($expectedResult, $angle): void
+    public function testSECH(mixed $expectedResult, mixed $angle): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SeriesSumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SeriesSumTest.php
index 4a6d4411b..2affa033a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SeriesSumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SeriesSumTest.php
@@ -9,13 +9,8 @@ class SeriesSumTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSERIESSUM
-     *
-     * @param mixed $expectedResult
-     * @param mixed $arg1
-     * @param mixed $arg2
-     * @param mixed $arg3
      */
-    public function testSERIESSUM($expectedResult, $arg1, $arg2, $arg3, ...$args): void
+    public function testSERIESSUM(mixed $expectedResult, mixed $arg1, mixed $arg2, mixed $arg3, mixed ...$args): void
     {
         $sheet = $this->getSheet();
         if ($arg1 !== null) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SignTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SignTest.php
index a62804681..ed0721c59 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SignTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SignTest.php
@@ -8,11 +8,8 @@ class SignTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSIGN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testSIGN($expectedResult, $value): void
+    public function testSIGN(mixed $expectedResult, mixed $value): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinTest.php
index 62f035591..ff19bc421 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinTest.php
@@ -8,10 +8,8 @@ class SinTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSin
-     *
-     * @param mixed $expectedResult
      */
-    public function testSin($expectedResult, string $formula): void
+    public function testSin(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinhTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinhTest.php
index 045d32768..03841b92b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinhTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SinhTest.php
@@ -8,10 +8,8 @@ class SinhTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCosh
-     *
-     * @param mixed $expectedResult
      */
-    public function testSinh($expectedResult, string $formula): void
+    public function testSinh(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtPiTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtPiTest.php
index b04b512f3..ecad7bc3b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtPiTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtPiTest.php
@@ -8,11 +8,8 @@ class SqrtPiTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSQRTPI
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testSQRTPI($expectedResult, $number): void
+    public function testSQRTPI(mixed $expectedResult, mixed $number): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtTest.php
index 6dc39d6cc..495d2f9bf 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SqrtTest.php
@@ -8,11 +8,8 @@ class SqrtTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSQRT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
      */
-    public function testSQRT($expectedResult, $number = 'omitted'): void
+    public function testSQRT(mixed $expectedResult, mixed $number = 'omitted'): void
     {
         $sheet = $this->getSheet();
         $this->mightHaveException($expectedResult);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SubTotalTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SubTotalTest.php
index 7ac398c41..c03bc1edf 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SubTotalTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SubTotalTest.php
@@ -6,11 +6,8 @@ class SubTotalTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUBTOTAL
-     *
-     * @param mixed $expectedResult
-     * @param mixed $type expect an integer
      */
-    public function testSubtotal($expectedResult, $type): void
+    public function testSubtotal(mixed $expectedResult, mixed $type): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -29,11 +26,8 @@ class SubTotalTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerSUBTOTAL
-     *
-     * @param mixed $expectedResult
-     * @param mixed $type expect an integer
      */
-    public function testSubtotalColumnHidden($expectedResult, $type): void
+    public function testSubtotalColumnHidden(mixed $expectedResult, mixed $type): void
     {
         // Hidden columns don't affect calculation, only hidden rows
         $this->mightHaveException($expectedResult);
@@ -66,11 +60,8 @@ class SubTotalTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerSUBTOTALHIDDEN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $type expect an integer
      */
-    public function testSubtotalRowHidden($expectedResult, $type): void
+    public function testSubtotalRowHidden(mixed $expectedResult, mixed $type): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfTest.php
index a42153ad4..64f6795e6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfTest.php
@@ -6,11 +6,8 @@ class SumIfTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUMIF
-     *
-     * @param mixed $expectedResult
-     * @param mixed $condition
      */
-    public function testSUMIF2($expectedResult, array $array1, $condition, ?array $array2 = null): void
+    public function testSUMIF2(mixed $expectedResult, array $array1, mixed $condition, ?array $array2 = null): void
     {
         $this->mightHaveException($expectedResult);
         if ($expectedResult === 'incomplete') {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfsTest.php
index aecb77771..42a7d7b93 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumIfsTest.php
@@ -8,10 +8,8 @@ class SumIfsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUMIFS
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUMIFS($expectedResult, ...$args): void
+    public function testSUMIFS(mixed $expectedResult, mixed ...$args): void
     {
         $result = Statistical\Conditional::SUMIFS(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumProductTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumProductTest.php
index dd7dcc852..24d3b3706 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumProductTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumProductTest.php
@@ -8,10 +8,8 @@ class SumProductTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUMPRODUCT
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUMPRODUCT($expectedResult, ...$args): void
+    public function testSUMPRODUCT(mixed $expectedResult, mixed ...$args): void
     {
         $sheet = $this->getSheet();
         $row = 0;
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumSqTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumSqTest.php
index 2b8ed93e8..24754675b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumSqTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumSqTest.php
@@ -6,10 +6,8 @@ class SumSqTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUMSQ
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUMSQ($expectedResult, ...$args): void
+    public function testSUMSQ(mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $maxRow = 0;
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
index e51662f98..761555d70 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
@@ -8,10 +8,8 @@ class SumTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUM
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUM($expectedResult, ...$args): void
+    public function testSUM(mixed $expectedResult, mixed ...$args): void
     {
         $sheet = $this->getSheet();
         $row = 0;
@@ -31,10 +29,8 @@ class SumTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerSUMLiterals
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUMLiterals($expectedResult, string $args): void
+    public function testSUMLiterals(mixed $expectedResult, string $args): void
     {
         $sheet = $this->getSheet();
         $sheet->getCell('B1')->setValue("=SUM($args)");
@@ -49,10 +45,8 @@ class SumTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerSUMWITHINDEXMATCH
-     *
-     * @param mixed $expectedResult
      */
-    public function testSumWithIndexMatch($expectedResult, string $formula): void
+    public function testSumWithIndexMatch(mixed $expectedResult, string $formula): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet1 = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2MY2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2MY2Test.php
index 2872f734d..d69697240 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2MY2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2MY2Test.php
@@ -8,10 +8,8 @@ class SumX2MY2Test extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUMX2MY2
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUMX2MY2($expectedResult, array $matrixData1, array $matrixData2): void
+    public function testSUMX2MY2(mixed $expectedResult, array $matrixData1, array $matrixData2): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2PY2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2PY2Test.php
index 08f30dfb3..32a9d5776 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2PY2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumX2PY2Test.php
@@ -8,10 +8,8 @@ class SumX2PY2Test extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUMX2PY2
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUMX2PY2($expectedResult, array $matrixData1, array $matrixData2): void
+    public function testSUMX2PY2(mixed $expectedResult, array $matrixData1, array $matrixData2): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumXMY2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumXMY2Test.php
index 3e5c31dc8..f3fee91cb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumXMY2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumXMY2Test.php
@@ -8,10 +8,8 @@ class SumXMY2Test extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUMXMY2
-     *
-     * @param mixed $expectedResult
      */
-    public function testSUMXMY2($expectedResult, array $matrixData1, array $matrixData2): void
+    public function testSUMXMY2(mixed $expectedResult, array $matrixData1, array $matrixData2): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanTest.php
index f20aa5c24..aae1cf233 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanTest.php
@@ -8,10 +8,8 @@ class TanTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTan
-     *
-     * @param mixed $expectedResult
      */
-    public function testTan($expectedResult, string $formula): void
+    public function testTan(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanhTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanhTest.php
index e2c4f5611..9c151b515 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanhTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TanhTest.php
@@ -8,10 +8,8 @@ class TanhTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTanh
-     *
-     * @param mixed $expectedResult
      */
-    public function testTanh($expectedResult, string $formula): void
+    public function testTanh(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TruncTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TruncTest.php
index 445e3ae94..cc5cd5891 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TruncTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/TruncTest.php
@@ -8,11 +8,8 @@ class TruncTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTRUNC
-     *
-     * @param mixed $expectedResult
-     * @param string $formula
      */
-    public function testTRUNC($expectedResult, $formula): void
+    public function testTRUNC(mixed $expectedResult, string $formula): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php
index f5186c631..49ad9da70 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AllSetupTeardown.php
@@ -51,20 +51,14 @@ class AllSetupTeardown extends TestCase
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_GNUMERIC);
     }
 
-    /**
-     * @param mixed $expectedResult
-     */
-    protected function mightHaveException($expectedResult): void
+    protected function mightHaveException(mixed $expectedResult): void
     {
         if ($expectedResult === 'exception') {
             $this->expectException(CalcException::class);
         }
     }
 
-    /**
-     * @param mixed $value
-     */
-    protected function setCell(string $cell, $value): void
+    protected function setCell(string $cell, mixed $value): void
     {
         if ($value !== null) {
             if (is_string($value) && is_numeric($value)) {
@@ -99,11 +93,8 @@ class AllSetupTeardown extends TestCase
      * Excel handles text/logical/empty cells differently when
      * passed directly as arguments as opposed to cell references or arrays.
      * This function will test both approaches.
-     *
-     * @param mixed $expectedResult
-     * @param array $args
      */
-    protected function runTestCases(string $functionName, $expectedResult, ...$args): void
+    protected function runTestCases(string $functionName, mixed $expectedResult, mixed ...$args): void
     {
         if (is_array($expectedResult)) {
             $this->runTestCaseReference($functionName, $expectedResult[0], ...$args);
@@ -118,11 +109,8 @@ class AllSetupTeardown extends TestCase
      * Excel handles text/logical/empty cells differently when
      * passed directly as arguments as opposed to cell references or arrays.
      * This functions tests passing as arrays.
-     *
-     * @param mixed $expectedResult
-     * @param array $args
      */
-    protected function runTestCaseReference(string $functionName, $expectedResult, ...$args): void
+    protected function runTestCaseReference(string $functionName, mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -142,7 +130,7 @@ class AllSetupTeardown extends TestCase
                 $arrayArg .= '}';
                 $formula .= "$comma$arrayArg";
                 $comma = ',';
-            } else { // @phpstan-ignore-line
+            } else {
                 $cellId = "A$row";
                 $formula .= "$comma$cellId";
                 $comma = ',';
@@ -158,11 +146,8 @@ class AllSetupTeardown extends TestCase
      * Excel handles text/logical/empty cells differently when
      * passed directly as arguments as opposed to cell references or arrays.
      * This functions tests passing as direct arguments.
-     *
-     * @param mixed $expectedResult
-     * @param array $args
      */
-    protected function runTestCaseDirect(string $functionName, $expectedResult, ...$args): void
+    protected function runTestCaseDirect(string $functionName, mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -175,7 +160,7 @@ class AllSetupTeardown extends TestCase
                     $comma = ',';
                     $formula .= $this->convertToString($arrayItem);
                 }
-            } else { // @phpstan-ignore-line
+            } else {
                 $formula .= $comma;
                 $comma = ',';
                 $formula .= $this->convertToString($arg);
@@ -189,11 +174,8 @@ class AllSetupTeardown extends TestCase
     /**
      * Excel seems to reject bracket notation for literal arrays
      * for some functions.
-     *
-     * @param mixed $expectedResult
-     * @param array $args
      */
-    protected function runTestCaseNoBracket(string $functionName, $expectedResult, ...$args): void
+    protected function runTestCaseNoBracket(string $functionName, mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -213,7 +195,7 @@ class AllSetupTeardown extends TestCase
                 }
                 $formula .= "$comma$arrayRange";
                 $comma = ',';
-            } else { // @phpstan-ignore-line
+            } else {
                 $cellId = "A$row";
                 $formula .= "$comma$cellId";
                 $comma = ',';
@@ -229,10 +211,7 @@ class AllSetupTeardown extends TestCase
         self::assertEqualsWithDelta($expectedResult, $sheet->getCell('Z99')->getCalculatedValue(), 1.0e-8, 'arguments supplied as ranges');
     }
 
-    /**
-     * @param mixed $arg
-     */
-    private function convertToString($arg): string
+    private function convertToString(mixed $arg): string
     {
         if (is_string($arg)) {
             return '"' . $arg . '"';
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AveDevTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AveDevTest.php
index 37a06626b..159799c9b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AveDevTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AveDevTest.php
@@ -6,10 +6,8 @@ class AveDevTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAVEDEV
-     *
-     * @param mixed $expectedResult
      */
-    public function testAVEDEV($expectedResult, ...$args): void
+    public function testAVEDEV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('AVEDEV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageATest.php
index 8a0f35442..3d0f38618 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageATest.php
@@ -6,10 +6,8 @@ class AverageATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAVERAGEA
-     *
-     * @param mixed $expectedResult
      */
-    public function testAVERAGEA($expectedResult, ...$args): void
+    public function testAVERAGEA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('AVERAGEA', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfTest.php
index bb91aead1..558741245 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfTest.php
@@ -8,10 +8,8 @@ class AverageIfTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAVERAGEIF
-     *
-     * @param mixed $expectedResult
      */
-    public function testAVERAGEIF($expectedResult, ...$args): void
+    public function testAVERAGEIF(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('AVERAGEIF', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfsTest.php
index 10a466b62..d69622112 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfsTest.php
@@ -8,10 +8,8 @@ class AverageIfsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAVERAGEIFS
-     *
-     * @param mixed $expectedResult
      */
-    public function testAVERAGEIFS($expectedResult, ...$args): void
+    public function testAVERAGEIFS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('AVERAGEIFS', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageTest.php
index f8c8e4185..d5d313367 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageTest.php
@@ -6,10 +6,8 @@ class AverageTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerAVERAGE
-     *
-     * @param mixed $expectedResult
      */
-    public function testAVERAGE($expectedResult, ...$args): void
+    public function testAVERAGE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('AVERAGE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaDistTest.php
index b34dc5ee0..986fd3d84 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaDistTest.php
@@ -8,10 +8,8 @@ class BetaDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerBETADIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testBETADIST($expectedResult, ...$args): void
+    public function testBETADIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('BETADIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaInvTest.php
index b035abd6d..284758543 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaInvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaInvTest.php
@@ -8,10 +8,8 @@ class BetaInvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerBETAINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testBETAINV($expectedResult, ...$args): void
+    public function testBETAINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('BETAINV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistRangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistRangeTest.php
index 3970b0266..2b4bfe241 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistRangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistRangeTest.php
@@ -8,10 +8,8 @@ class BinomDistRangeTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerBINOMDISTRANGE
-     *
-     * @param mixed $expectedResult
      */
-    public function testBINOMDISTRANGE($expectedResult, ...$args): void
+    public function testBINOMDISTRANGE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('BINOM.DIST.RANGE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistTest.php
index 9d89628ea..09179d31b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistTest.php
@@ -8,10 +8,8 @@ class BinomDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerBINOMDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testBINOMDIST($expectedResult, ...$args): void
+    public function testBINOMDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('BINOMDIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomInvTest.php
index cd15517df..01f4aea68 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomInvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomInvTest.php
@@ -8,10 +8,8 @@ class BinomInvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerBINOMINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testBINOMINV($expectedResult, ...$args): void
+    public function testBINOMINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('BINOM.INV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistLeftTailTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistLeftTailTest.php
index 81db209da..f8865d6d9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistLeftTailTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistLeftTailTest.php
@@ -8,10 +8,8 @@ class ChiDistLeftTailTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCHIDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testCHIDIST($expectedResult, ...$args): void
+    public function testCHIDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('CHISQ.DIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistRightTailTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistRightTailTest.php
index 06ba2d3de..f4c52b116 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistRightTailTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistRightTailTest.php
@@ -8,10 +8,8 @@ class ChiDistRightTailTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCHIDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testCHIDIST($expectedResult, ...$args): void
+    public function testCHIDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('CHISQ.DIST.RT', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvLeftTailTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvLeftTailTest.php
index 858cfa3ff..4afea84ca 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvLeftTailTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvLeftTailTest.php
@@ -8,10 +8,8 @@ class ChiInvLeftTailTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCHIINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testCHIINV($expectedResult, ...$args): void
+    public function testCHIINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('CHISQ.INV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvRightTailTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvRightTailTest.php
index 79c853123..1125a8cac 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvRightTailTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvRightTailTest.php
@@ -8,10 +8,8 @@ class ChiInvRightTailTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCHIINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testCHIINV($expectedResult, ...$args): void
+    public function testCHIINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('CHISQ.INV.RT', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiTestTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiTestTest.php
index 7f9ea55a7..1a0be2d1b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiTestTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiTestTest.php
@@ -10,12 +10,8 @@ class ChiTestTest extends TestCase
 {
     /**
      * @dataProvider providerCHITEST
-     *
-     * @param mixed $expectedResult
-     * @param mixed $actual
-     * @param mixed $expected
      */
-    public function testCHITEST($expectedResult, $actual, $expected): void
+    public function testCHITEST(mixed $expectedResult, mixed $actual, mixed $expected): void
     {
         $result = Statistical\Distributions\ChiSquared::test($actual, $expected);
         self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ConfidenceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ConfidenceTest.php
index 43d0ee8ba..bd8a09b3b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ConfidenceTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ConfidenceTest.php
@@ -8,10 +8,8 @@ class ConfidenceTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCONFIDENCE
-     *
-     * @param mixed $expectedResult
      */
-    public function testCONFIDENCE($expectedResult, ...$args): void
+    public function testCONFIDENCE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('CONFIDENCE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
index 204cf34d7..3ed3b1f49 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
@@ -9,12 +9,8 @@ class CorrelTest extends TestCase
 {
     /**
      * @dataProvider providerCORREL
-     *
-     * @param mixed $expectedResult
-     * @param mixed $xargs
-     * @param mixed $yargs
      */
-    public function testCORREL($expectedResult, $xargs, $yargs): void
+    public function testCORREL(mixed $expectedResult, mixed $xargs, mixed $yargs): void
     {
         $result = Statistical\Trends::CORREL($xargs, $yargs);
         self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountATest.php
index 2519789e1..241693c17 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountATest.php
@@ -6,10 +6,8 @@ class CountATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUNTA
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUNTA($expectedResult, ...$args): void
+    public function testCOUNTA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('COUNTA', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountBlankTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountBlankTest.php
index ec266a896..fecc23eaa 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountBlankTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountBlankTest.php
@@ -8,10 +8,8 @@ class CountBlankTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUNTBLANK
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUNTBLANK($expectedResult, ...$args): void
+    public function testCOUNTBLANK(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('COUNTBLANK', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfTest.php
index dbfb5faca..45ab58d73 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfTest.php
@@ -6,10 +6,8 @@ class CountIfTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUNTIF
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUNTIF($expectedResult, ...$args): void
+    public function testCOUNTIF(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('COUNTIF', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfsTest.php
index 382e8a6fd..f8b3d20a6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfsTest.php
@@ -7,10 +7,8 @@ class CountIfsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOUNTIFS
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOUNTIFS($expectedResult, ...$args): void
+    public function testCOUNTIFS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('COUNTIFS', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
index b8a775a2a..91ef6e2d4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
@@ -6,10 +6,8 @@ class CountTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerBasicCOUNT
-     *
-     * @param mixed $expectedResult
      */
-    public function testBasicCOUNT($expectedResult, ...$args): void
+    public function testBasicCOUNT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('COUNT', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class CountTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerExcelCOUNT
-     *
-     * @param mixed $expectedResult
      */
-    public function testExcelCOUNT($expectedResult, ...$args): void
+    public function testExcelCOUNT(mixed $expectedResult, mixed ...$args): void
     {
         if (is_array($args[0])) {
             $this->runTestCaseNoBracket('COUNT', $expectedResult, ...$args);
@@ -40,10 +36,8 @@ class CountTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOpenOfficeCOUNT
-     *
-     * @param mixed $expectedResult
      */
-    public function testOpenOfficeCOUNT($expectedResult, ...$args): void
+    public function testOpenOfficeCOUNT(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         if (is_array($args[0])) {
@@ -60,10 +54,8 @@ class CountTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerGnumericCOUNT
-     *
-     * @param mixed $expectedResult
      */
-    public function testGnumericCOUNT($expectedResult, ...$args): void
+    public function testGnumericCOUNT(mixed $expectedResult, mixed ...$args): void
     {
         $this->setGnumeric();
         $this->runTestCaseNoBracket('COUNT', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CovarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CovarTest.php
index 4c04f8679..02adef256 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CovarTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CovarTest.php
@@ -6,10 +6,8 @@ class CovarTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCOVAR
-     *
-     * @param mixed $expectedResult
      */
-    public function testCOVAR($expectedResult, ...$args): void
+    public function testCOVAR(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('COVAR', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/DevSqTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/DevSqTest.php
index 8f2b282d0..28c01d68b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/DevSqTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/DevSqTest.php
@@ -6,10 +6,8 @@ class DevSqTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDEVSQ
-     *
-     * @param mixed $expectedResult
      */
-    public function testDEVSQ($expectedResult, ...$args): void
+    public function testDEVSQ(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('DEVSQ', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ExponDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ExponDistTest.php
index 018eee002..f44235589 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ExponDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ExponDistTest.php
@@ -8,10 +8,8 @@ class ExponDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerEXPONDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testEXPONDIST($expectedResult, ...$args): void
+    public function testEXPONDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('EXPONDIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDistTest.php
index 2a1db8993..c77b22a05 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDistTest.php
@@ -8,10 +8,8 @@ class FDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testFDIST($expectedResult, ...$args): void
+    public function testFDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('F.DIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherInvTest.php
index 875724efa..e036f4841 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherInvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherInvTest.php
@@ -8,10 +8,8 @@ class FisherInvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFISHERINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testFISHERINV($expectedResult, ...$args): void
+    public function testFISHERINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('FISHERINV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherTest.php
index de20c2d44..144498023 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FisherTest.php
@@ -8,10 +8,8 @@ class FisherTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFISHER
-     *
-     * @param mixed $expectedResult
      */
-    public function testFISHER($expectedResult, ...$args): void
+    public function testFISHER(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('FISHER', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ForecastTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ForecastTest.php
index c8d944cbf..5286f2dd9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ForecastTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ForecastTest.php
@@ -12,10 +12,8 @@ class ForecastTest extends TestCase
 {
     /**
      * @dataProvider providerFORECAST
-     *
-     * @param mixed $expectedResult
      */
-    public function testFORECAST($expectedResult, ...$args): void
+    public function testFORECAST(mixed $expectedResult, mixed ...$args): void
     {
         $result = Statistical\Trends::FORECAST(...$args);
         self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaDistTest.php
index 7c5f9fdab..95cf51f5c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaDistTest.php
@@ -8,10 +8,8 @@ class GammaDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerGAMMADIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testGAMMADIST($expectedResult, ...$args): void
+    public function testGAMMADIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('GAMMA.DIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaInvTest.php
index dcddf82cd..6a1700e0e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaInvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaInvTest.php
@@ -8,10 +8,8 @@ class GammaInvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerGAMMAINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testGAMMAINV($expectedResult, ...$args): void
+    public function testGAMMAINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('GAMMA.INV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaLnTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaLnTest.php
index e30aaa37b..16285b54a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaLnTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaLnTest.php
@@ -8,10 +8,8 @@ class GammaLnTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerGAMMALN
-     *
-     * @param mixed $expectedResult
      */
-    public function testGAMMALN($expectedResult, ...$args): void
+    public function testGAMMALN(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('GAMMALN', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php
index 412133fdc..ead69416f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php
@@ -8,10 +8,8 @@ class GammaTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerGAMMA
-     *
-     * @param mixed $expectedResult
      */
-    public function testGAMMA($expectedResult, ...$args): void
+    public function testGAMMA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('GAMMA', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php
index 57d1afd43..ceffa9795 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php
@@ -8,10 +8,8 @@ class GaussTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerGAUSS
-     *
-     * @param mixed $expectedResult
      */
-    public function testGAUSS($expectedResult, ...$args): void
+    public function testGAUSS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('GAUSS', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GeoMeanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GeoMeanTest.php
index ead0233f5..dc58c2bb1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GeoMeanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GeoMeanTest.php
@@ -6,10 +6,8 @@ class GeoMeanTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerGEOMEAN
-     *
-     * @param mixed $expectedResult
      */
-    public function testGEOMEAN($expectedResult, ...$args): void
+    public function testGEOMEAN(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('GEOMEAN', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GrowthTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GrowthTest.php
index ea7a64e4f..7db793bbb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GrowthTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GrowthTest.php
@@ -10,10 +10,8 @@ class GrowthTest extends TestCase
 {
     /**
      * @dataProvider providerGROWTH
-     *
-     * @param mixed $expectedResult
      */
-    public function testGROWTH($expectedResult, array $yValues, array $xValues, ?array $newValues = null, ?bool $const = null): void
+    public function testGROWTH(mixed $expectedResult, array $yValues, array $xValues, ?array $newValues = null, ?bool $const = null): void
     {
         if ($newValues === null) {
             $result = Statistical\Trends::GROWTH($yValues, $xValues);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HarMeanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HarMeanTest.php
index 40f3f0c7e..80dc768df 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HarMeanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HarMeanTest.php
@@ -6,10 +6,8 @@ class HarMeanTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerHARMEAN
-     *
-     * @param mixed $expectedResult
      */
-    public function testHARMEAN($expectedResult, ...$args): void
+    public function testHARMEAN(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('HARMEAN', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php
index 34d8b1921..b2ef0eb48 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php
@@ -8,10 +8,8 @@ class HypGeomDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerHYPGEOMDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testHYPGEOMDIST($expectedResult, ...$args): void
+    public function testHYPGEOMDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('HYPGEOMDIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/InterceptTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/InterceptTest.php
index d50a6836b..5ebdbeabd 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/InterceptTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/InterceptTest.php
@@ -6,10 +6,8 @@ class InterceptTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerINTERCEPT
-     *
-     * @param mixed $expectedResult
      */
-    public function testINTERCEPT($expectedResult, ...$args): void
+    public function testINTERCEPT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('INTERCEPT', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php
index 95776acf9..c1604647c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php
@@ -6,10 +6,8 @@ class KurtTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerKURT
-     *
-     * @param mixed $expectedResult
      */
-    public function testKURT($expectedResult, ...$args): void
+    public function testKURT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('KURT', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php
index 848b4b761..0586e066b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php
@@ -6,10 +6,8 @@ class LargeTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLARGE
-     *
-     * @param mixed $expectedResult
      */
-    public function testLARGE($expectedResult, ...$args): void
+    public function testLARGE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('LARGE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php
index 485857aef..6b61dfd74 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php
@@ -10,13 +10,8 @@ class LinEstTest extends TestCase
 {
     /**
      * @dataProvider providerLINEST
-     *
-     * @param mixed $xValues
-     * @param mixed $yValues
-     * @param mixed $const
-     * @param mixed $stats
      */
-    public function testLINEST(array $expectedResult, $yValues, $xValues, $const, $stats): void
+    public function testLINEST(array $expectedResult, mixed $yValues, mixed $xValues, mixed $const, mixed $stats): void
     {
         $result = Statistical\Trends::LINEST($yValues, $xValues, $const, $stats);
         self::assertIsArray($result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php
index ca931d8fc..3a5939681 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php
@@ -10,13 +10,8 @@ class LogEstTest extends TestCase
 {
     /**
      * @dataProvider providerLOGEST
-     *
-     * @param mixed $xValues
-     * @param mixed $yValues
-     * @param mixed $const
-     * @param mixed $stats
      */
-    public function testLOGEST(array $expectedResult, $yValues, $xValues, $const, $stats): void
+    public function testLOGEST(array $expectedResult, mixed $yValues, mixed $xValues, mixed $const, mixed $stats): void
     {
         $result = Statistical\Trends::LOGEST($yValues, $xValues, $const, $stats);
         self::assertIsArray($result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php
index 996195c8f..893235e3f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php
@@ -8,10 +8,8 @@ class LogInvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLOGINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testLOGINV($expectedResult, ...$args): void
+    public function testLOGINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('LOGINV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php
index 6238540f3..265685caa 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php
@@ -8,10 +8,8 @@ class LogNormDist2Test extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLOGNORMDIST2
-     *
-     * @param mixed $expectedResult
      */
-    public function testLOGNORMDIST2($expectedResult, ...$args): void
+    public function testLOGNORMDIST2(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('LOGNORM.DIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php
index 89f04b089..9f1770d7c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php
@@ -8,10 +8,8 @@ class LogNormDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLOGNORMDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testLOGNORMDIST($expectedResult, ...$args): void
+    public function testLOGNORMDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('LOGNORMDIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php
index ea7af4a1f..d923d208e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php
@@ -6,10 +6,8 @@ class MaxATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMAXA
-     *
-     * @param mixed $expectedResult
      */
-    public function testMAXA($expectedResult, ...$args): void
+    public function testMAXA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('MAXA', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxIfsTest.php
index 86944471e..8f77cb612 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxIfsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxIfsTest.php
@@ -6,10 +6,8 @@ class MaxIfsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMAXIFS
-     *
-     * @param mixed $expectedResult
      */
-    public function testMAXIFS($expectedResult, ...$args): void
+    public function testMAXIFS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('MAXIFS', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php
index bf7db628e..9c0cf948f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php
@@ -6,10 +6,8 @@ class MaxTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMAX
-     *
-     * @param mixed $expectedResult
      */
-    public function testMAX($expectedResult, ...$args): void
+    public function testMAX(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('MAX', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MedianTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MedianTest.php
index aa568fdcc..01d21c6ba 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MedianTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MedianTest.php
@@ -6,10 +6,8 @@ class MedianTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMEDIAN
-     *
-     * @param mixed $expectedResult
      */
-    public function testMEDIAN($expectedResult, ...$args): void
+    public function testMEDIAN(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('MEDIAN', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php
index 7daa15619..5701e6784 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php
@@ -6,10 +6,8 @@ class MinATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMINA
-     *
-     * @param mixed $expectedResult
      */
-    public function testMINA($expectedResult, ...$args): void
+    public function testMINA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('MINA', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinIfsTest.php
index d3dda839e..7de8a723e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinIfsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinIfsTest.php
@@ -6,10 +6,8 @@ class MinIfsTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMINIFS
-     *
-     * @param mixed $expectedResult
      */
-    public function testMINIFS($expectedResult, ...$args): void
+    public function testMINIFS(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('MINIFS', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php
index 03493c21e..1f32bf466 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php
@@ -6,10 +6,8 @@ class MinTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerMIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testMIN($expectedResult, ...$args): void
+    public function testMIN(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('MIN', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ModeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ModeTest.php
index aed9188e4..e4dd6bf84 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ModeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ModeTest.php
@@ -9,10 +9,8 @@ class ModeTest extends TestCase
 {
     /**
      * @dataProvider providerMODE
-     *
-     * @param mixed $expectedResult
      */
-    public function testMODE($expectedResult, string $str): void
+    public function testMODE(mixed $expectedResult, string $str): void
     {
         $workbook = new Spreadsheet();
         $sheet = $workbook->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NegBinomDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NegBinomDistTest.php
index 6bd286fb6..5768b331b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NegBinomDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NegBinomDistTest.php
@@ -8,10 +8,8 @@ class NegBinomDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNEGBINOMDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testNEGBINOMDIST($expectedResult, ...$args): void
+    public function testNEGBINOMDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('NEGBINOMDIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php
index 590a2b425..6afe6c28a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php
@@ -8,10 +8,8 @@ class NormDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNORMDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testNORMDIST($expectedResult, ...$args): void
+    public function testNORMDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('NORMDIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php
index a287d6684..decd67665 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php
@@ -8,10 +8,8 @@ class NormInvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNORMINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testNORMINV($expectedResult, ...$args): void
+    public function testNORMINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('NORMINV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php
index b3c9df24f..c4ae83155 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php
@@ -8,10 +8,8 @@ class NormSDist2Test extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNORMSDIST2
-     *
-     * @param mixed $expectedResult
      */
-    public function testNORMSDIST2($expectedResult, ...$args): void
+    public function testNORMSDIST2(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('NORM.S.DIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php
index 4306e862e..df900c088 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php
@@ -8,10 +8,8 @@ class NormSDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNORMSDIST
-     *
-     * @param mixed $expectedResult
      */
-    public function testNORMSDIST($expectedResult, ...$args): void
+    public function testNORMSDIST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('NORMSDIST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php
index 131a7b8e5..c10eb1a14 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php
@@ -8,10 +8,8 @@ class NormSInvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerNORMSINV
-     *
-     * @param mixed $expectedResult
      */
-    public function testNORMSINV($expectedResult, ...$args): void
+    public function testNORMSINV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('NORMSINV', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentRankTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentRankTest.php
index 200f88e9b..f5b8c2356 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentRankTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentRankTest.php
@@ -7,12 +7,9 @@ class PercentRankTest extends AllSetupTeardown
     /**
      * @dataProvider providerPERCENTRANK
      *
-     * @param mixed $expectedResult
      * @param mixed[] $valueSet
-     * @param mixed $value
-     * @param mixed $digits
      */
-    public function testPERCENTRANK($expectedResult, $valueSet, $value, $digits = null): void
+    public function testPERCENTRANK(mixed $expectedResult, $valueSet, mixed $value, mixed $digits = null): void
     {
         if ($digits === null) {
             $this->runTestCaseReference('PERCENTRANK', $expectedResult, $valueSet, $value);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentileTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentileTest.php
index 35dd35849..3d51e5323 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentileTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PercentileTest.php
@@ -6,10 +6,8 @@ class PercentileTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPERCENTILE
-     *
-     * @param mixed $expectedResult
      */
-    public function testPERCENTILE($expectedResult, ...$args): void
+    public function testPERCENTILE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('PERCENTILE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutTest.php
index d680a5a2b..6fcbf499f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutTest.php
@@ -8,10 +8,8 @@ class PermutTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPERMUT
-     *
-     * @param mixed $expectedResult
      */
-    public function testPERMUT($expectedResult, ...$args): void
+    public function testPERMUT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('PERMUT', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutationATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutationATest.php
index 29533d1e5..2ae147bda 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutationATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutationATest.php
@@ -8,10 +8,8 @@ class PermutationATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPERMUT
-     *
-     * @param mixed $expectedResult
      */
-    public function testPERMUT($expectedResult, ...$args): void
+    public function testPERMUT(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('PERMUTATIONA', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PoissonTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PoissonTest.php
index 74ae8a614..1b114c88d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PoissonTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PoissonTest.php
@@ -8,10 +8,8 @@ class PoissonTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPOISSON
-     *
-     * @param mixed $expectedResult
      */
-    public function testPOISSON($expectedResult, ...$args): void
+    public function testPOISSON(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('POISSON', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/QuartileTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/QuartileTest.php
index 343ac8eb4..5216aec16 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/QuartileTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/QuartileTest.php
@@ -6,10 +6,8 @@ class QuartileTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerQUARTILE
-     *
-     * @param mixed $expectedResult
      */
-    public function testQUARTILE($expectedResult, ...$args): void
+    public function testQUARTILE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('QUARTILE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RankTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RankTest.php
index c3f8bb2b4..6b0103420 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RankTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RankTest.php
@@ -7,12 +7,9 @@ class RankTest extends AllSetupTeardown
     /**
      * @dataProvider providerRANK
      *
-     * @param mixed $expectedResult
-     * @param mixed $value
      * @param mixed[] $valueSet
-     * @param mixed $order
      */
-    public function testRANK($expectedResult, $value, $valueSet, $order = null): void
+    public function testRANK(mixed $expectedResult, mixed $value, $valueSet, mixed $order = null): void
     {
         if ($order === null) {
             $this->runTestCaseReference('RANK', $expectedResult, $value, $valueSet);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RsqTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RsqTest.php
index 51ce4ee18..7195c425f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RsqTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RsqTest.php
@@ -6,10 +6,8 @@ class RsqTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerRSQ
-     *
-     * @param mixed $expectedResult
      */
-    public function testRSQ($expectedResult, ...$args): void
+    public function testRSQ(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('RSQ', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SkewTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SkewTest.php
index 264d29de1..11ff5abf6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SkewTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SkewTest.php
@@ -6,10 +6,8 @@ class SkewTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSKEW
-     *
-     * @param mixed $expectedResult
      */
-    public function testSKEW($expectedResult, array $args): void
+    public function testSKEW(mixed $expectedResult, array $args): void
     {
         $this->runTestCaseReference('SKEW', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SlopeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SlopeTest.php
index 0d7fe282b..0c99e6e6e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SlopeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SlopeTest.php
@@ -6,10 +6,8 @@ class SlopeTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSLOPE
-     *
-     * @param mixed $expectedResult
      */
-    public function testSLOPE($expectedResult, ...$args): void
+    public function testSLOPE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseNoBracket('SLOPE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php
index 86dbc481d..5b7e10877 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php
@@ -6,12 +6,8 @@ class SmallTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSMALL
-     *
-     * @param mixed $expectedResult
-     * @param mixed $values
-     * @param mixed $position
      */
-    public function testSMALL($expectedResult, $values, $position): void
+    public function testSMALL(mixed $expectedResult, mixed $values, mixed $position): void
     {
         $this->runTestCaseReference('SMALL', $expectedResult, $values, $position);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevATest.php
index 1268d4403..12d5c1b47 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevATest.php
@@ -6,10 +6,8 @@ class StDevATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSTDEVA
-     *
-     * @param mixed $expectedResult
      */
-    public function testSTDEVA($expectedResult, ...$args): void
+    public function testSTDEVA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('STDEVA', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class StDevATest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsSTDEVA
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsSTDEVA($expectedResult, ...$args): void
+    public function testOdsSTDEVA(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCaseReference('STDEVA', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPATest.php
index 9d5389ed1..b99842b78 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPATest.php
@@ -6,10 +6,8 @@ class StDevPATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSTDEVPA
-     *
-     * @param mixed $expectedResult
      */
-    public function testSTDEVPA($expectedResult, ...$args): void
+    public function testSTDEVPA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('STDEVPA', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class StDevPATest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsSTDEVPA
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsSTDEVPA($expectedResult, ...$args): void
+    public function testOdsSTDEVPA(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCaseReference('STDEVPA', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPTest.php
index 60057d218..3f4b7e595 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevPTest.php
@@ -6,10 +6,8 @@ class StDevPTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSTDEVP
-     *
-     * @param mixed $expectedResult
      */
-    public function testSTDEVP($expectedResult, ...$args): void
+    public function testSTDEVP(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('STDEVP', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class StDevPTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsSTDEVP
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsSTDEVP($expectedResult, ...$args): void
+    public function testOdsSTDEVP(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCaseReference('STDEVP', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevTest.php
index eb607d828..7b01080f4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StDevTest.php
@@ -6,10 +6,8 @@ class StDevTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSTDEV
-     *
-     * @param mixed $expectedResult
      */
-    public function testSTDEV($expectedResult, ...$args): void
+    public function testSTDEV(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('STDEV', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class StDevTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsSTDEV
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsSTDEV($expectedResult, ...$args): void
+    public function testOdsSTDEV(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCaseReference('STDEV', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php
index 3a36ddfbb..8614edad4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php
@@ -8,10 +8,8 @@ class StandardizeTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSTANDARDIZE
-     *
-     * @param mixed $expectedResult
      */
-    public function testSTANDARDIZE($expectedResult, ...$args): void
+    public function testSTANDARDIZE(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('STANDARDIZE', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SteyxTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SteyxTest.php
index 5971aaf8e..1e491f206 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SteyxTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SteyxTest.php
@@ -6,10 +6,8 @@ class SteyxTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSTEYX
-     *
-     * @param mixed $expectedResult
      */
-    public function testSTEYX($expectedResult, array $xargs, array $yargs): void
+    public function testSTEYX(mixed $expectedResult, array $xargs, array $yargs): void
     {
         //$result = Statistical\Trends::STEYX($xargs, $yargs);
         //self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TDistTest.php
index 704b4d4ae..fe12559d7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TDistTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TDistTest.php
@@ -8,13 +8,8 @@ class TDistTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTDIST
-     *
-     * @param mixed $expectedResult
-     * @param mixed $degrees
-     * @param mixed $value
-     * @param mixed $tails
      */
-    public function testTDIST($expectedResult, $value, $degrees, $tails): void
+    public function testTDIST(mixed $expectedResult, mixed $value, mixed $degrees, mixed $tails): void
     {
         $this->runTestCaseReference('TDIST', $expectedResult, $value, $degrees, $tails);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TinvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TinvTest.php
index ebe4abc6a..dce482a86 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TinvTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TinvTest.php
@@ -8,12 +8,8 @@ class TinvTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTINV
-     *
-     * @param mixed $expectedResult
-     * @param mixed $probability
-     * @param mixed $degrees
      */
-    public function testTINV($expectedResult, $probability, $degrees): void
+    public function testTINV(mixed $expectedResult, mixed $probability, mixed $degrees): void
     {
         $this->runTestCaseReference('TINV', $expectedResult, $probability, $degrees);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrendTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrendTest.php
index 5aa32bda3..3a054b471 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrendTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrendTest.php
@@ -10,10 +10,8 @@ class TrendTest extends TestCase
 {
     /**
      * @dataProvider providerGROWTH
-     *
-     * @param mixed $expectedResult
      */
-    public function testTREND($expectedResult, array $yValues, array $xValues, ?array $newValues = null, ?bool $const = null): void
+    public function testTREND(mixed $expectedResult, array $yValues, array $xValues, ?array $newValues = null, ?bool $const = null): void
     {
         if ($newValues === null) {
             $result = Statistical\Trends::TREND($yValues, $xValues);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrimMeanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrimMeanTest.php
index c867ff82a..72135e55d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrimMeanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/TrimMeanTest.php
@@ -6,11 +6,8 @@ class TrimMeanTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTRIMMEAN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $percentage
      */
-    public function testTRIMMEAN($expectedResult, array $args, $percentage): void
+    public function testTRIMMEAN(mixed $expectedResult, array $args, mixed $percentage): void
     {
         $this->runTestCaseReference('TRIMMEAN', $expectedResult, $args, $percentage);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarATest.php
index 487231083..5dfb9cdd3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarATest.php
@@ -6,10 +6,8 @@ class VarATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerVARA
-     *
-     * @param mixed $expectedResult
      */
-    public function testVARA($expectedResult, ...$args): void
+    public function testVARA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('VARA', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class VarATest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsVARA
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsVARA($expectedResult, ...$args): void
+    public function testOdsVARA(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCases('VARA', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPATest.php
index 7c128b6f9..ecad925da 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPATest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPATest.php
@@ -6,10 +6,8 @@ class VarPATest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerVARPA
-     *
-     * @param mixed $expectedResult
      */
-    public function testVARPA($expectedResult, ...$args): void
+    public function testVARPA(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('VARPA', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class VarPATest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsVARPA
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsVARPA($expectedResult, ...$args): void
+    public function testOdsVARPA(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCases('VARPA', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPTest.php
index 5ab6e6095..9b68c3765 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarPTest.php
@@ -6,10 +6,8 @@ class VarPTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerVARP
-     *
-     * @param mixed $expectedResult
      */
-    public function testVARP($expectedResult, ...$args): void
+    public function testVARP(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('VARP', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class VarPTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsVARP
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsVARP($expectedResult, ...$args): void
+    public function testOdsVARP(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCases('VARP', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarTest.php
index 088fd4bae..0441df8ee 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/VarTest.php
@@ -6,10 +6,8 @@ class VarTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerVAR
-     *
-     * @param mixed $expectedResult
      */
-    public function testVAR($expectedResult, ...$args): void
+    public function testVAR(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('VAR', $expectedResult, ...$args);
     }
@@ -21,10 +19,8 @@ class VarTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerOdsVAR
-     *
-     * @param mixed $expectedResult
      */
-    public function testOdsVAR($expectedResult, ...$args): void
+    public function testOdsVAR(mixed $expectedResult, mixed ...$args): void
     {
         $this->setOpenOffice();
         $this->runTestCases('VAR', $expectedResult, ...$args);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/WeibullTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/WeibullTest.php
index 3c6f8116b..8e415f5d8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/WeibullTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/WeibullTest.php
@@ -8,10 +8,8 @@ class WeibullTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerWEIBULL
-     *
-     * @param mixed $expectedResult
      */
-    public function testWEIBULL($expectedResult, ...$args): void
+    public function testWEIBULL(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCases('WEIBULL', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ZTestTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ZTestTest.php
index 492fdd860..cf00346e5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ZTestTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ZTestTest.php
@@ -8,10 +8,8 @@ class ZTestTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerZTEST
-     *
-     * @param mixed $expectedResult
      */
-    public function testZTEST($expectedResult, ...$args): void
+    public function testZTEST(mixed $expectedResult, mixed ...$args): void
     {
         $this->runTestCaseReference('ZTEST', $expectedResult, ...$args);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php
index e0343b2b8..80de252b4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/AllSetupTeardown.php
@@ -59,20 +59,14 @@ class AllSetupTeardown extends TestCase
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_GNUMERIC);
     }
 
-    /**
-     * @param mixed $expectedResult
-     */
-    protected function mightHaveException($expectedResult): void
+    protected function mightHaveException(mixed $expectedResult): void
     {
         if ($expectedResult === 'exception') {
             $this->expectException(CalcException::class);
         }
     }
 
-    /**
-     * @param mixed $value
-     */
-    protected function setCell(string $cell, $value): void
+    protected function setCell(string $cell, mixed $value): void
     {
         if ($value !== null) {
             if (is_string($value) && is_numeric($value)) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php
index df51f6530..7cd7e056b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php
@@ -8,11 +8,8 @@ class CharTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCHAR
-     *
-     * @param mixed $expectedResult
-     * @param mixed $character
      */
-    public function testCHAR($expectedResult, $character = 'omitted'): void
+    public function testCHAR(mixed $expectedResult, mixed $character = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php
index 3162a6baa..cf03876a4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php
@@ -8,11 +8,8 @@ class CleanTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCLEAN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testCLEAN($expectedResult, $value = 'omitted'): void
+    public function testCLEAN(mixed $expectedResult, mixed $value = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php
index 001ad6075..d753e78fc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php
@@ -8,11 +8,8 @@ class CodeTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCODE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $character
      */
-    public function testCODE($expectedResult, $character = 'omitted'): void
+    public function testCODE(mixed $expectedResult, mixed $character = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
index b5eeda7b6..9e9198e71 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
@@ -8,11 +8,8 @@ class ConcatenateTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerCONCATENATE
-     *
-     * @param mixed $expectedResult
-     * @param array $args
      */
-    public function testCONCATENATE($expectedResult, ...$args): void
+    public function testCONCATENATE(mixed $expectedResult, mixed ...$args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php
index a4a1c6972..822dfbe5f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php
@@ -8,12 +8,8 @@ class DollarTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerDOLLAR
-     *
-     * @param mixed $expectedResult
-     * @param mixed $amount
-     * @param mixed $decimals
      */
-    public function testDOLLAR($expectedResult, $amount = 'omitted', $decimals = 'omitted'): void
+    public function testDOLLAR(mixed $expectedResult, mixed $amount = 'omitted', mixed $decimals = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php
index 20293f1ed..4257f6da4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php
@@ -8,12 +8,8 @@ class ExactTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerEXACT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $string1
-     * @param mixed $string2
      */
-    public function testEXACT($expectedResult, $string1 = 'omitted', $string2 = 'omitted'): void
+    public function testEXACT(mixed $expectedResult, mixed $string1 = 'omitted', mixed $string2 = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php
index d64930837..08f3bcfc9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php
@@ -8,13 +8,8 @@ class FindTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFIND
-     *
-     * @param mixed $expectedResult
-     * @param mixed $string1
-     * @param mixed $string2
-     * @param mixed $start
      */
-    public function testFIND($expectedResult, $string1 = 'omitted', $string2 = 'omitted', $start = 'omitted'): void
+    public function testFIND(mixed $expectedResult, mixed $string1 = 'omitted', mixed $string2 = 'omitted', mixed $start = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php
index a820299da..0a0242448 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php
@@ -8,13 +8,8 @@ class FixedTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerFIXED
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
-     * @param mixed $decimals
-     * @param mixed $noCommas
      */
-    public function testFIXED($expectedResult, $number = 'omitted', $decimals = 'omitted', $noCommas = 'omitted'): void
+    public function testFIXED(mixed $expectedResult, mixed $number = 'omitted', mixed $decimals = 'omitted', mixed $noCommas = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php
index 496eb0af9..c467b1cd6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php
@@ -11,11 +11,10 @@ class LeftTest extends AllSetupTeardown
     /**
      * @dataProvider providerLEFT
      *
-     * @param mixed $expectedResult
      * @param mixed $str string from which to extract
      * @param mixed $cnt number of characters to extract
      */
-    public function testLEFT($expectedResult, $str = 'omitted', $cnt = 'omitted'): void
+    public function testLEFT(mixed $expectedResult, mixed $str = 'omitted', mixed $cnt = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -40,13 +39,8 @@ class LeftTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerLocaleLEFT
-     *
-     * @param string $expectedResult
-     * @param mixed $value
-     * @param mixed $locale
-     * @param mixed $characters
      */
-    public function testLowerWithLocaleBoolean($expectedResult, $locale, $value, $characters): void
+    public function testLowerWithLocaleBoolean(string $expectedResult, mixed $locale, mixed $value, mixed $characters): void
     {
         $newLocale = Settings::setLocale($locale);
         if ($newLocale === false) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php
index c22f40b6c..9f8bd05fa 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php
@@ -8,11 +8,8 @@ class LenTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLEN
-     *
-     * @param mixed $expectedResult
-     * @param mixed $str
      */
-    public function testLEN($expectedResult, $str = 'omitted'): void
+    public function testLEN(mixed $expectedResult, mixed $str = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php
index 1ea6ac9f7..2873c58dc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php
@@ -9,11 +9,8 @@ class LowerTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerLOWER
-     *
-     * @param mixed $expectedResult
-     * @param mixed $str
      */
-    public function testLOWER($expectedResult, $str = 'omitted'): void
+    public function testLOWER(mixed $expectedResult, mixed $str = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -34,12 +31,8 @@ class LowerTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerLocaleLOWER
-     *
-     * @param string $expectedResult
-     * @param mixed $value
-     * @param mixed $locale
      */
-    public function testLowerWithLocaleBoolean($expectedResult, $locale, $value): void
+    public function testLowerWithLocaleBoolean(string $expectedResult, mixed $locale, mixed $value): void
     {
         $newLocale = Settings::setLocale($locale);
         if ($newLocale === false) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php
index 78f8273a4..f8336ea6c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php
@@ -11,12 +11,11 @@ class MidTest extends AllSetupTeardown
     /**
      * @dataProvider providerMID
      *
-     * @param mixed $expectedResult
      * @param mixed $str string from which to extract
      * @param mixed $start position at which to start
      * @param mixed $cnt number of characters to extract
      */
-    public function testMID($expectedResult, $str = 'omitted', $start = 'omitted', $cnt = 'omitted'): void
+    public function testMID(mixed $expectedResult, mixed $str = 'omitted', mixed $start = 'omitted', mixed $cnt = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -46,14 +45,8 @@ class MidTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerLocaleMID
-     *
-     * @param string $expectedResult
-     * @param mixed $value
-     * @param mixed $locale
-     * @param mixed $offset
-     * @param mixed $characters
      */
-    public function testMiddleWithLocaleBoolean($expectedResult, $locale, $value, $offset, $characters): void
+    public function testMiddleWithLocaleBoolean(string $expectedResult, mixed $locale, mixed $value, mixed $offset, mixed $characters): void
     {
         $newLocale = Settings::setLocale($locale);
         if ($newLocale === false) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
index 3b410cbd7..935ea0659 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
@@ -10,13 +10,8 @@ class NumberValueTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerNUMBERVALUE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $number
-     * @param mixed $decimal
-     * @param mixed $group
      */
-    public function testNUMBERVALUE($expectedResult, $number = 'omitted', $decimal = 'omitted', $group = 'omitted'): void
+    public function testNUMBERVALUE(mixed $expectedResult, mixed $number = 'omitted', mixed $decimal = 'omitted', mixed $group = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/OpenOfficeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/OpenOfficeTest.php
index 64e02e50b..afc8bf499 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/OpenOfficeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/OpenOfficeTest.php
@@ -6,10 +6,8 @@ class OpenOfficeTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerOpenOffice
-     *
-     * @param mixed $expectedResult
      */
-    public function testOpenOffice($expectedResult, string $formula): void
+    public function testOpenOffice(mixed $expectedResult, string $formula): void
     {
         $this->setOpenOffice();
         $this->mightHaveException($expectedResult);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php
index 9f6e6f7b7..75e7c5a96 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php
@@ -9,11 +9,8 @@ class ProperTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerPROPER
-     *
-     * @param mixed $expectedResult
-     * @param mixed $str
      */
-    public function testPROPER($expectedResult, $str = 'omitted'): void
+    public function testPROPER(mixed $expectedResult, mixed $str = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -34,12 +31,8 @@ class ProperTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerLocaleLOWER
-     *
-     * @param string $expectedResult
-     * @param mixed $value
-     * @param mixed $locale
      */
-    public function testLowerWithLocaleBoolean($expectedResult, $locale, $value): void
+    public function testLowerWithLocaleBoolean(string $expectedResult, mixed $locale, mixed $value): void
     {
         $newLocale = Settings::setLocale($locale);
         if ($newLocale === false) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php
index 64e38d796..b3554f423 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php
@@ -8,14 +8,8 @@ class ReplaceTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerREPLACE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $oldText
-     * @param mixed $start
-     * @param mixed $count
-     * @param mixed $newText
      */
-    public function testREPLACE($expectedResult, $oldText = 'omitted', $start = 'omitted', $count = 'omitted', $newText = 'omitted'): void
+    public function testREPLACE(mixed $expectedResult, mixed $oldText = 'omitted', mixed $start = 'omitted', mixed $count = 'omitted', mixed $newText = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReptTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReptTest.php
index 09355c71e..f483e4607 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReptTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReptTest.php
@@ -8,12 +8,8 @@ class ReptTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerREPT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $val
-     * @param mixed $rpt
      */
-    public function testReptThroughEngine($expectedResult, $val = 'omitted', $rpt = 'omitted'): void
+    public function testReptThroughEngine(mixed $expectedResult, mixed $val = 'omitted', mixed $rpt = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php
index 4c9210d66..d3f5d212c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php
@@ -11,11 +11,10 @@ class RightTest extends AllSetupTeardown
     /**
      * @dataProvider providerRIGHT
      *
-     * @param mixed $expectedResult
      * @param mixed $str string from which to extract
      * @param mixed $cnt number of characters to extract
      */
-    public function testRIGHT($expectedResult, $str = 'omitted', $cnt = 'omitted'): void
+    public function testRIGHT(mixed $expectedResult, mixed $str = 'omitted', mixed $cnt = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -40,13 +39,8 @@ class RightTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerLocaleRIGHT
-     *
-     * @param string $expectedResult
-     * @param mixed $value
-     * @param mixed $locale
-     * @param mixed $characters
      */
-    public function testLowerWithLocaleBoolean($expectedResult, $locale, $value, $characters): void
+    public function testLowerWithLocaleBoolean(string $expectedResult, mixed $locale, mixed $value, mixed $characters): void
     {
         $newLocale = Settings::setLocale($locale);
         if ($newLocale === false) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php
index aa08787cb..cb0e627f0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php
@@ -8,13 +8,8 @@ class SearchTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSEARCH
-     *
-     * @param mixed $expectedResult
-     * @param mixed $findText
-     * @param mixed $withinText
-     * @param mixed $start
      */
-    public function testSEARCH($expectedResult, $findText = 'omitted', $withinText = 'omitted', $start = 'omitted'): void
+    public function testSEARCH(mixed $expectedResult, mixed $findText = 'omitted', mixed $withinText = 'omitted', mixed $start = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php
index ced6cb00e..7c00c6229 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php
@@ -8,14 +8,8 @@ class SubstituteTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerSUBSTITUTE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $text
-     * @param mixed $oldText
-     * @param mixed $newText
-     * @param mixed $instance
      */
-    public function testSUBSTITUTE($expectedResult, $text = 'omitted', $oldText = 'omitted', $newText = 'omitted', $instance = 'omitted'): void
+    public function testSUBSTITUTE(mixed $expectedResult, mixed $text = 'omitted', mixed $oldText = 'omitted', mixed $newText = 'omitted', mixed $instance = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php
index 991b6d9bc..bf184d6b6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php
@@ -8,11 +8,8 @@ class TTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testT($expectedResult, $value = 'no arguments'): void
+    public function testT(mixed $expectedResult, mixed $value = 'no arguments'): void
     {
         $this->mightHaveException($expectedResult);
         if ($value === 'no arguments') {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php
index 200020213..0a4de8420 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php
@@ -8,10 +8,8 @@ class TextJoinTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTEXTJOIN
-     *
-     * @param mixed $expectedResult
      */
-    public function testTEXTJOIN($expectedResult, array $args): void
+    public function testTEXTJOIN(mixed $expectedResult, array $args): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php
index c32f2f062..e6c366770 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php
@@ -12,10 +12,7 @@ class TextSplitTest extends AllSetupTeardown
         return '{' . $column . implode(',' . $column, range(1, count($argument))) . '}';
     }
 
-    /**
-     * @param array|string $argument
-     */
-    private function setDelimiterValues(Worksheet $worksheet, string $column, $argument): void
+    private function setDelimiterValues(Worksheet $worksheet, string $column, array|string $argument): void
     {
         if (is_array($argument)) {
             foreach ($argument as $index => $value) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php
index f0a7e120f..9c0cd97e9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php
@@ -8,12 +8,8 @@ class TextTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTEXT
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
-     * @param mixed $format
      */
-    public function testTEXT($expectedResult, $value = 'omitted', $format = 'omitted'): void
+    public function testTEXT(mixed $expectedResult, mixed $value = 'omitted', mixed $format = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php
index 45ae5374a..c4e2b7d6a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php
@@ -8,11 +8,8 @@ class TrimTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerTRIM
-     *
-     * @param mixed $expectedResult
-     * @param mixed $character
      */
-    public function testTRIM($expectedResult, $character = 'omitted'): void
+    public function testTRIM(mixed $expectedResult, mixed $character = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php
index dd5c82a79..2ac7c9979 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php
@@ -9,11 +9,8 @@ class UpperTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerUPPER
-     *
-     * @param mixed $expectedResult
-     * @param mixed $str
      */
-    public function testUPPER($expectedResult, $str = 'omitted'): void
+    public function testUPPER(mixed $expectedResult, mixed $str = 'omitted'): void
     {
         $this->mightHaveException($expectedResult);
         $sheet = $this->getSheet();
@@ -34,12 +31,8 @@ class UpperTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerLocaleLOWER
-     *
-     * @param string $expectedResult
-     * @param mixed $value
-     * @param mixed $locale
      */
-    public function testLowerWithLocaleBoolean($expectedResult, $locale, $value): void
+    public function testLowerWithLocaleBoolean(string $expectedResult, mixed $locale, mixed $value): void
     {
         $newLocale = Settings::setLocale($locale);
         if ($newLocale === false) {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php
index 900af7dd7..b503846b7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php
@@ -40,11 +40,8 @@ class ValueTest extends AllSetupTeardown
 
     /**
      * @dataProvider providerVALUE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testVALUE($expectedResult, $value = 'omitted'): void
+    public function testVALUE(mixed $expectedResult, mixed $value = 'omitted'): void
     {
         StringHelper::setDecimalSeparator('.');
         StringHelper::setThousandsSeparator(' ');
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php
index 6642bc650..ef6c41e97 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php
@@ -9,12 +9,8 @@ class ValueToTextTest extends AllSetupTeardown
 {
     /**
      * @dataProvider providerVALUE
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
-     * @param mixed $format
      */
-    public function testVALUETOTEXT($expectedResult, $value, $format): void
+    public function testVALUETOTEXT(mixed $expectedResult, mixed $value, mixed $format): void
     {
         $sheet = $this->getSheet();
         $this->setCell('A1', $value);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Web/UrlEncodeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/UrlEncodeTest.php
index 82f60ef98..ea83d4369 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Web/UrlEncodeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/UrlEncodeTest.php
@@ -9,11 +9,8 @@ class UrlEncodeTest extends TestCase
 {
     /**
      * @dataProvider providerURLENCODE
-     *
-     * @param string $expectedResult
-     * @param mixed $text
      */
-    public function testURLENCODE($expectedResult, $text): void
+    public function testURLENCODE(string $expectedResult, mixed $text): void
     {
         $result = Service::urlEncode($text);
         self::assertSame($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/MergedCellTest.php b/tests/PhpSpreadsheetTests/Calculation/MergedCellTest.php
index 5e9944e93..036849295 100644
--- a/tests/PhpSpreadsheetTests/Calculation/MergedCellTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/MergedCellTest.php
@@ -11,11 +11,9 @@ use PHPUnit\Framework\TestCase;
 class MergedCellTest extends TestCase
 {
     /**
-     * @param mixed $expectedResult
-     *
      * @dataProvider providerWorksheetFormulaeColumns
      */
-    public function testMergedCellColumns(string $formula, $expectedResult): void
+    public function testMergedCellColumns(string $formula, mixed $expectedResult): void
     {
         $spreadSheet = new Spreadsheet();
 
@@ -53,11 +51,9 @@ class MergedCellTest extends TestCase
     }
 
     /**
-     * @param mixed $expectedResult
-     *
      * @dataProvider providerWorksheetFormulaeRows
      */
-    public function testMergedCellRows(string $formula, $expectedResult): void
+    public function testMergedCellRows(string $formula, mixed $expectedResult): void
     {
         $spreadSheet = new Spreadsheet();
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/RefErrorTest.php b/tests/PhpSpreadsheetTests/Calculation/RefErrorTest.php
index e9f45104c..78db701c1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/RefErrorTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/RefErrorTest.php
@@ -8,11 +8,9 @@ use PHPUnit\Framework\TestCase;
 class RefErrorTest extends TestCase
 {
     /**
-     * @param mixed $expected
-     *
      * @dataProvider providerRefError
      */
-    public function testRefError($expected, string $formula): void
+    public function testRefError(mixed $expected, string $formula): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet1 = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php b/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
index cb60213e7..279699484 100644
--- a/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
@@ -92,14 +92,8 @@ class AdvancedValueBinderTest extends TestCase
 
     /**
      * @dataProvider currencyProvider
-     *
-     * @param mixed $value
-     * @param mixed $valueBinded
-     * @param mixed $thousandsSeparator
-     * @param mixed $decimalSeparator
-     * @param mixed $currencyCode
      */
-    public function testCurrency($value, $valueBinded, $thousandsSeparator, $decimalSeparator, $currencyCode): void
+    public function testCurrency(mixed $value, mixed $valueBinded, mixed $thousandsSeparator, mixed $decimalSeparator, mixed $currencyCode): void
     {
         StringHelper::setCurrencyCode($currencyCode);
         StringHelper::setDecimalSeparator($decimalSeparator);
@@ -135,11 +129,8 @@ class AdvancedValueBinderTest extends TestCase
 
     /**
      * @dataProvider fractionProvider
-     *
-     * @param mixed $value
-     * @param mixed $valueBinded
      */
-    public function testFractions($value, $valueBinded): void
+    public function testFractions(mixed $value, mixed $valueBinded): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
@@ -171,11 +162,8 @@ class AdvancedValueBinderTest extends TestCase
 
     /**
      * @dataProvider percentageProvider
-     *
-     * @param mixed $value
-     * @param mixed $valueBinded
      */
-    public function testPercentages($value, $valueBinded): void
+    public function testPercentages(mixed $value, mixed $valueBinded): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
@@ -201,11 +189,8 @@ class AdvancedValueBinderTest extends TestCase
 
     /**
      * @dataProvider timeProvider
-     *
-     * @param mixed $value
-     * @param mixed $valueBinded
      */
-    public function testTimes($value, $valueBinded): void
+    public function testTimes(mixed $value, mixed $valueBinded): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Cell/CellAddressTest.php b/tests/PhpSpreadsheetTests/Cell/CellAddressTest.php
index eb8e68027..46a1b3f84 100644
--- a/tests/PhpSpreadsheetTests/Cell/CellAddressTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CellAddressTest.php
@@ -38,10 +38,8 @@ class CellAddressTest extends TestCase
 
     /**
      * @dataProvider providerCreateFromCellAddressException
-     *
-     * @param mixed $cellAddress
      */
-    public function testCreateFromCellAddressException($cellAddress): void
+    public function testCreateFromCellAddressException(mixed $cellAddress): void
     {
         $this->expectException(Exception::class);
         $this->expectExceptionMessage(
@@ -84,11 +82,8 @@ class CellAddressTest extends TestCase
 
     /**
      * @dataProvider providerCreateFromColumnRowException
-     *
-     * @param mixed $columnId
-     * @param mixed $rowId
      */
-    public function testCreateFromColumnRowException($columnId, $rowId): void
+    public function testCreateFromColumnRowException(mixed $columnId, mixed $rowId): void
     {
         $this->expectException(Exception::class);
         $this->expectExceptionMessage('Row and Column Ids must be positive integer values');
@@ -135,11 +130,8 @@ class CellAddressTest extends TestCase
 
     /**
      * @dataProvider providerCreateFromColumnRowException
-     *
-     * @param mixed $columnId
-     * @param mixed $rowId
      */
-    public function testCreateFromColumnRowArrayException($columnId, $rowId): void
+    public function testCreateFromColumnRowArrayException(mixed $columnId, mixed $rowId): void
     {
         $this->expectException(Exception::class);
         $this->expectExceptionMessage('Row and Column Ids must be positive integer values');
diff --git a/tests/PhpSpreadsheetTests/Cell/CellTest.php b/tests/PhpSpreadsheetTests/Cell/CellTest.php
index ef5f28eb7..76a14255a 100644
--- a/tests/PhpSpreadsheetTests/Cell/CellTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CellTest.php
@@ -72,11 +72,8 @@ class CellTest extends TestCase
 
     /**
      * @dataProvider providerSetValueExplicit
-     *
-     * @param mixed $expected
-     * @param mixed $value
      */
-    public function testSetValueExplicit($expected, $value, string $dataType): void
+    public function testSetValueExplicit(mixed $expected, mixed $value, string $dataType): void
     {
         $spreadsheet = new Spreadsheet();
         $cell = $spreadsheet->getActiveSheet()->getCell('A1');
@@ -106,10 +103,8 @@ class CellTest extends TestCase
 
     /**
      * @dataProvider providerSetValueExplicitException
-     *
-     * @param mixed $value
      */
-    public function testSetValueExplicitException($value, string $dataType): void
+    public function testSetValueExplicitException(mixed $value, string $dataType): void
     {
         $this->expectException(Exception::class);
 
diff --git a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php
index 62eeba1a0..5229a9cec 100644
--- a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php
@@ -11,11 +11,8 @@ class CoordinateTest extends TestCase
 {
     /**
      * @dataProvider providerColumnString
-     *
-     * @param mixed $expectedResult
-     * @param mixed $string
      */
-    public function testColumnIndexFromString($expectedResult, $string): void
+    public function testColumnIndexFromString(mixed $expectedResult, mixed $string): void
     {
         $columnIndex = Coordinate::columnIndexFromString($string);
         self::assertEquals($expectedResult, $columnIndex);
@@ -61,11 +58,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerColumnIndex
-     *
-     * @param mixed $expectedResult
-     * @param int $columnIndex
      */
-    public function testStringFromColumnIndex($expectedResult, $columnIndex): void
+    public function testStringFromColumnIndex(mixed $expectedResult, int $columnIndex): void
     {
         $string = Coordinate::stringFromColumnIndex($columnIndex);
         self::assertEquals($expectedResult, $string);
@@ -81,11 +75,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerCoordinates
-     *
-     * @param mixed $expectedResult
-     * @param string $rangeSet
      */
-    public function testCoordinateFromString($expectedResult, $rangeSet): void
+    public function testCoordinateFromString(mixed $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::coordinateFromString($rangeSet);
         self::assertEquals($expectedResult, $result);
@@ -157,11 +148,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerAbsoluteCoordinates
-     *
-     * @param string $expectedResult
-     * @param string $rangeSet
      */
-    public function testAbsoluteCoordinateFromString($expectedResult, $rangeSet): void
+    public function testAbsoluteCoordinateFromString(string $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::absoluteCoordinate($rangeSet);
         self::assertEquals($expectedResult, $result);
@@ -189,11 +177,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerAbsoluteReferences
-     *
-     * @param mixed $expectedResult
-     * @param string $rangeSet
      */
-    public function testAbsoluteReferenceFromString($expectedResult, $rangeSet): void
+    public function testAbsoluteReferenceFromString(mixed $expectedResult, mixed $rangeSet): void
     {
         $result = Coordinate::absoluteReference($rangeSet);
         self::assertEquals($expectedResult, $result);
@@ -221,11 +206,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerSplitRange
-     *
-     * @param mixed $expectedResult
-     * @param string $rangeSet
      */
-    public function testSplitRange($expectedResult, $rangeSet): void
+    public function testSplitRange(mixed $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::splitRange($rangeSet);
         foreach ($result as $key => $split) {
@@ -244,11 +226,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerBuildRange
-     *
-     * @param mixed $expectedResult
-     * @param mixed $rangeSets
      */
-    public function testBuildRange($expectedResult, $rangeSets): void
+    public function testBuildRange(mixed $expectedResult, mixed $rangeSets): void
     {
         $result = Coordinate::buildRange($rangeSets);
         self::assertEquals($expectedResult, $result);
@@ -279,11 +258,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerRangeBoundaries
-     *
-     * @param mixed $expectedResult
-     * @param string $rangeSet
      */
-    public function testRangeBoundaries($expectedResult, $rangeSet): void
+    public function testRangeBoundaries(mixed $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::rangeBoundaries($rangeSet);
         self::assertEquals($expectedResult, $result);
@@ -296,11 +272,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerRangeDimension
-     *
-     * @param mixed $expectedResult
-     * @param string $rangeSet
      */
-    public function testRangeDimension($expectedResult, $rangeSet): void
+    public function testRangeDimension(mixed $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::rangeDimension($rangeSet);
         self::assertEquals($expectedResult, $result);
@@ -313,11 +286,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerGetRangeBoundaries
-     *
-     * @param mixed $expectedResult
-     * @param string $rangeSet
      */
-    public function testGetRangeBoundaries($expectedResult, $rangeSet): void
+    public function testGetRangeBoundaries(mixed $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::getRangeBoundaries($rangeSet);
         self::assertEquals($expectedResult, $result);
@@ -330,11 +300,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerExtractAllCellReferencesInRange
-     *
-     * @param array $expectedResult
-     * @param string $rangeSet
      */
-    public function testExtractAllCellReferencesInRange($expectedResult, $rangeSet): void
+    public function testExtractAllCellReferencesInRange(array $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::extractAllCellReferencesInRange($rangeSet);
         self::assertEquals($expectedResult, $result);
@@ -347,10 +314,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerInvalidRange
-     *
-     * @param string $range
      */
-    public function testExtractAllCellReferencesInRangeInvalidRange($range): void
+    public function testExtractAllCellReferencesInRangeInvalidRange(string $range): void
     {
         $this->expectException(Exception::class);
         $this->expectExceptionMessage('Invalid range: "' . $range . '"');
@@ -365,11 +330,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerMergeRangesInCollection
-     *
-     * @param mixed $expectedResult
-     * @param mixed $rangeSets
      */
-    public function testMergeRangesInCollection($expectedResult, $rangeSets): void
+    public function testMergeRangesInCollection(mixed $expectedResult, mixed $rangeSets): void
     {
         $result = Coordinate::mergeRangesInCollection($rangeSets);
         self::assertEquals($expectedResult, $result);
@@ -382,11 +344,8 @@ class CoordinateTest extends TestCase
 
     /**
      * @dataProvider providerCoordinateIsRange
-     *
-     * @param mixed $expectedResult
-     * @param string $rangeSet
      */
-    public function testCoordinateIsRange($expectedResult, $rangeSet): void
+    public function testCoordinateIsRange(mixed $expectedResult, string $rangeSet): void
     {
         $result = Coordinate::coordinateIsRange($rangeSet);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Cell/DefaultValueBinderTest.php b/tests/PhpSpreadsheetTests/Cell/DefaultValueBinderTest.php
index 426ce8cf6..7e4332669 100644
--- a/tests/PhpSpreadsheetTests/Cell/DefaultValueBinderTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/DefaultValueBinderTest.php
@@ -14,10 +14,8 @@ class DefaultValueBinderTest extends TestCase
 {
     /**
      * @dataProvider binderProvider
-     *
-     * @param mixed $value
      */
-    public function testBindValue($value): void
+    public function testBindValue(null|string|bool|int|float|DateTime|DateTimeImmutable $value): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
@@ -50,11 +48,8 @@ class DefaultValueBinderTest extends TestCase
 
     /**
      * @dataProvider providerDataTypeForValue
-     *
-     * @param mixed $expectedResult
-     * @param mixed $value
      */
-    public function testDataTypeForValue($expectedResult, $value): void
+    public function testDataTypeForValue(mixed $expectedResult, mixed $value): void
     {
         $result = DefaultValueBinder::dataTypeForValue($value);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php b/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php
index 3ebc09d7d..6d6886484 100644
--- a/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/StringValueBinderTest.php
@@ -31,13 +31,10 @@ class StringValueBinderTest extends TestCase
 
     /**
      * @dataProvider providerDataValuesDefault
-     *
-     * @param mixed $value
-     * @param mixed $expectedValue
      */
     public function testStringValueBinderDefaultBehaviour(
-        $value,
-        $expectedValue,
+        mixed $value,
+        mixed $expectedValue,
         string $expectedDataType
     ): void {
         Cell::setValueBinder(new StringValueBinder());
@@ -80,13 +77,10 @@ class StringValueBinderTest extends TestCase
 
     /**
      * @dataProvider providerDataValuesSuppressNullConversion
-     *
-     * @param mixed $value
-     * @param mixed $expectedValue
      */
     public function testStringValueBinderSuppressNullConversion(
-        $value,
-        $expectedValue,
+        mixed $value,
+        mixed $expectedValue,
         string $expectedDataType
     ): void {
         $binder = new StringValueBinder();
@@ -112,13 +106,10 @@ class StringValueBinderTest extends TestCase
 
     /**
      * @dataProvider providerDataValuesSuppressBooleanConversion
-     *
-     * @param mixed $value
-     * @param mixed $expectedValue
      */
     public function testStringValueBinderSuppressBooleanConversion(
-        $value,
-        $expectedValue,
+        mixed $value,
+        mixed $expectedValue,
         string $expectedDataType
     ): void {
         $binder = new StringValueBinder();
@@ -145,13 +136,10 @@ class StringValueBinderTest extends TestCase
 
     /**
      * @dataProvider providerDataValuesSuppressNumericConversion
-     *
-     * @param mixed $value
-     * @param mixed $expectedValue
      */
     public function testStringValueBinderSuppressNumericConversion(
-        $value,
-        $expectedValue,
+        mixed $value,
+        mixed $expectedValue,
         string $expectedDataType
     ): void {
         $binder = new StringValueBinder();
@@ -185,13 +173,10 @@ class StringValueBinderTest extends TestCase
 
     /**
      * @dataProvider providerDataValuesSuppressFormulaConversion
-     *
-     * @param mixed $value
-     * @param mixed $expectedValue
      */
     public function testStringValueBinderSuppressFormulaConversion(
-        $value,
-        $expectedValue,
+        mixed $value,
+        mixed $expectedValue,
         string $expectedDataType
     ): void {
         $binder = new StringValueBinder();
@@ -215,13 +200,10 @@ class StringValueBinderTest extends TestCase
 
     /**
      * @dataProvider providerDataValuesSuppressAllConversion
-     *
-     * @param mixed $value
-     * @param mixed $expectedValue
      */
     public function testStringValueBinderSuppressAllConversion(
-        $value,
-        $expectedValue,
+        mixed $value,
+        mixed $expectedValue,
         string $expectedDataType
     ): void {
         $binder = new StringValueBinder();
diff --git a/tests/PhpSpreadsheetTests/Custom/ComplexAssert.php b/tests/PhpSpreadsheetTests/Custom/ComplexAssert.php
index 2b3600b43..fac233c8e 100644
--- a/tests/PhpSpreadsheetTests/Custom/ComplexAssert.php
+++ b/tests/PhpSpreadsheetTests/Custom/ComplexAssert.php
@@ -52,11 +52,7 @@ class ComplexAssert extends TestCase
         return $this;
     }
 
-    /**
-     * @param mixed $expected
-     * @param mixed $actual
-     */
-    public function assertComplexEquals($expected, $actual, ?float $delta = null): bool
+    public function assertComplexEquals(mixed $expected, mixed $actual, ?float $delta = null): bool
     {
         if ($expected === INF || (is_string($expected) && $expected[0] === '#')) {
             return $this->testExpectedExceptions($expected, $actual);
@@ -96,11 +92,7 @@ class ComplexAssert extends TestCase
         return $this->errorMessage;
     }
 
-    /**
-     * @param mixed $expected
-     * @param mixed $actual
-     */
-    public function runAssertComplexEquals($expected, $actual, ?float $delta = null): void
+    public function runAssertComplexEquals(mixed $expected, mixed $actual, ?float $delta = null): void
     {
         self::assertTrue($this->assertComplexEquals($expected, $actual, $delta), $this->getErrorMessage());
     }
diff --git a/tests/PhpSpreadsheetTests/Document/PropertiesTest.php b/tests/PhpSpreadsheetTests/Document/PropertiesTest.php
index 56931b392..5b8604973 100644
--- a/tests/PhpSpreadsheetTests/Document/PropertiesTest.php
+++ b/tests/PhpSpreadsheetTests/Document/PropertiesTest.php
@@ -48,11 +48,8 @@ class PropertiesTest extends TestCase
 
     /**
      * @dataProvider providerCreationTime
-     *
-     * @param mixed $expectedCreationTime
-     * @param mixed $created
      */
-    public function testSetCreated($expectedCreationTime, $created): void
+    public function testSetCreated(mixed $expectedCreationTime, mixed $created): void
     {
         $expectedCreationTime = $expectedCreationTime ?? $this->startTime;
 
@@ -80,11 +77,8 @@ class PropertiesTest extends TestCase
 
     /**
      * @dataProvider providerModifiedTime
-     *
-     * @param mixed $expectedModifiedTime
-     * @param mixed $modified
      */
-    public function testSetModified($expectedModifiedTime, $modified): void
+    public function testSetModified(mixed $expectedModifiedTime, mixed $modified): void
     {
         $expectedModifiedTime = $expectedModifiedTime ?? $this->startTime;
 
@@ -160,14 +154,8 @@ class PropertiesTest extends TestCase
 
     /**
      * @dataProvider providerCustomProperties
-     *
-     * @param mixed $expectedType
-     * @param mixed $expectedValue
-     * @param string $propertyName
-     * @param mixed $propertyValue
-     * @param ?string $propertyType
      */
-    public function testSetCustomProperties($expectedType, $expectedValue, $propertyName, $propertyValue, $propertyType = null): void
+    public function testSetCustomProperties(mixed $expectedType, mixed $expectedValue, string $propertyName, mixed $propertyValue, ?string $propertyType = null): void
     {
         if ($propertyType === null) {
             $this->properties->setCustomProperty($propertyName, $propertyValue);
diff --git a/tests/PhpSpreadsheetTests/Functional/AbstractFunctional.php b/tests/PhpSpreadsheetTests/Functional/AbstractFunctional.php
index 60351d71b..0587e3894 100644
--- a/tests/PhpSpreadsheetTests/Functional/AbstractFunctional.php
+++ b/tests/PhpSpreadsheetTests/Functional/AbstractFunctional.php
@@ -15,11 +15,9 @@ abstract class AbstractFunctional extends TestCase
     /**
      * Write spreadsheet to disk, reload and return it.
      *
-     * @param string $format
-     *
      * @return Spreadsheet
      */
-    protected function writeAndReload(Spreadsheet $spreadsheet, $format, ?callable $readerCustomizer = null, ?callable $writerCustomizer = null)
+    protected function writeAndReload(Spreadsheet $spreadsheet, string $format, ?callable $readerCustomizer = null, ?callable $writerCustomizer = null)
     {
         $filename = File::temporaryFilename();
         $writer = IOFactory::createWriter($spreadsheet, $format);
diff --git a/tests/PhpSpreadsheetTests/Functional/ActiveSheetTest.php b/tests/PhpSpreadsheetTests/Functional/ActiveSheetTest.php
index bc4b28944..7847e7365 100644
--- a/tests/PhpSpreadsheetTests/Functional/ActiveSheetTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/ActiveSheetTest.php
@@ -18,10 +18,8 @@ class ActiveSheetTest extends AbstractFunctional
      * Test load file with correct active sheet.
      *
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testActiveSheet($format): void
+    public function testActiveSheet(string $format): void
     {
         $spreadsheet = new Spreadsheet();
 
diff --git a/tests/PhpSpreadsheetTests/Functional/ConditionalStopIfTrueTest.php b/tests/PhpSpreadsheetTests/Functional/ConditionalStopIfTrueTest.php
index c2e271cac..991f5da94 100644
--- a/tests/PhpSpreadsheetTests/Functional/ConditionalStopIfTrueTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/ConditionalStopIfTrueTest.php
@@ -18,10 +18,8 @@ class ConditionalStopIfTrueTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testConditionalStopIfTrue($format): void
+    public function testConditionalStopIfTrue(string $format): void
     {
         $pCoordinate = 'A1:A3';
 
diff --git a/tests/PhpSpreadsheetTests/Functional/EnclosureTest.php b/tests/PhpSpreadsheetTests/Functional/EnclosureTest.php
index ebf79ee33..bbf54a2cf 100644
--- a/tests/PhpSpreadsheetTests/Functional/EnclosureTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/EnclosureTest.php
@@ -19,10 +19,8 @@ class EnclosureTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testEnclosure($format): void
+    public function testEnclosure(string $format): void
     {
         $value = '<img alt="" src="http://example.com/image.jpg" />';
 
diff --git a/tests/PhpSpreadsheetTests/Functional/FreezePaneTest.php b/tests/PhpSpreadsheetTests/Functional/FreezePaneTest.php
index cee46bfa0..1f7430e46 100644
--- a/tests/PhpSpreadsheetTests/Functional/FreezePaneTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/FreezePaneTest.php
@@ -18,10 +18,8 @@ class FreezePaneTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testFreezePane($format): void
+    public function testFreezePane(string $format): void
     {
         $cellSplit = 'B4';
         $topLeftCell = 'E7';
@@ -44,10 +42,8 @@ class FreezePaneTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testFreezePaneWithInvalidSelectedCells($format): void
+    public function testFreezePaneWithInvalidSelectedCells(string $format): void
     {
         $cellSplit = 'A7';
         $topLeftCell = 'A24';
@@ -74,10 +70,8 @@ class FreezePaneTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testFreezePaneUserSelectedCell($format): void
+    public function testFreezePaneUserSelectedCell(string $format): void
     {
         $spreadsheet = new Spreadsheet();
         $worksheet = $spreadsheet->getActiveSheet();
@@ -105,10 +99,8 @@ class FreezePaneTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testNoFreezePaneUserSelectedCell($format): void
+    public function testNoFreezePaneUserSelectedCell(string $format): void
     {
         $spreadsheet = new Spreadsheet();
         $worksheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Functional/MergedCellsTest.php b/tests/PhpSpreadsheetTests/Functional/MergedCellsTest.php
index b5ef4df40..ce9493d17 100644
--- a/tests/PhpSpreadsheetTests/Functional/MergedCellsTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/MergedCellsTest.php
@@ -18,10 +18,8 @@ class MergedCellsTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testMergedCells($format): void
+    public function testMergedCells(string $format): void
     {
         $spreadsheet = new Spreadsheet();
         $spreadsheet->setActiveSheetIndex(0);
diff --git a/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php b/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
index 1ceed4572..39f6517a5 100644
--- a/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
@@ -17,10 +17,8 @@ class PrintAreaTest extends AbstractFunctional
 
     /**
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testPageSetup($format): void
+    public function testPageSetup(string $format): void
     {
         // Create new workbook with 6 sheets and different print areas
         $spreadsheet = new Spreadsheet();
diff --git a/tests/PhpSpreadsheetTests/Functional/ReadBlankCellsTest.php b/tests/PhpSpreadsheetTests/Functional/ReadBlankCellsTest.php
index 6984a9aae..5384c254a 100644
--- a/tests/PhpSpreadsheetTests/Functional/ReadBlankCellsTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/ReadBlankCellsTest.php
@@ -21,10 +21,8 @@ class ReadBlankCellsTest extends AbstractFunctional
      * Test generate file with some empty cells.
      *
      * @dataProvider providerSheetFormat
-     *
-     * @param mixed $format
      */
-    public function testXlsxLoadWithNoBlankCells($format): void
+    public function testXlsxLoadWithNoBlankCells(mixed $format): void
     {
         $spreadsheet = new Spreadsheet();
         $spreadsheet->getActiveSheet()->getCell('B2')->setValue('');
diff --git a/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php b/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php
index 9560913ee..c8fb1628a 100644
--- a/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php
@@ -32,10 +32,8 @@ class ReadFilterTest extends AbstractFunctional
      * Test load Xlsx file with many empty cells with no filter used.
      *
      * @dataProvider providerCellsValues
-     *
-     * @param mixed $format
      */
-    public function testXlsxLoadWithoutReadFilter($format, array $arrayData): void
+    public function testXlsxLoadWithoutReadFilter(mixed $format, array $arrayData): void
     {
         $spreadsheet = new Spreadsheet();
 
@@ -59,10 +57,8 @@ class ReadFilterTest extends AbstractFunctional
      * Test load Xlsx file with many empty cells (and big max row number) with readfilter.
      *
      * @dataProvider providerCellsValues
-     *
-     * @param mixed $format
      */
-    public function testXlsxLoadWithReadFilter($format, array $arrayData): void
+    public function testXlsxLoadWithReadFilter(mixed $format, array $arrayData): void
     {
         $spreadsheet = new Spreadsheet();
         $spreadsheet->getActiveSheet()->fromArray($arrayData, null, 'A1');
diff --git a/tests/PhpSpreadsheetTests/Functional/SelectedCellsTest.php b/tests/PhpSpreadsheetTests/Functional/SelectedCellsTest.php
index 4444a2931..e03b2a87d 100644
--- a/tests/PhpSpreadsheetTests/Functional/SelectedCellsTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/SelectedCellsTest.php
@@ -17,10 +17,8 @@ class SelectedCellsTest extends AbstractFunctional
      * Test load file with correct selected cells.
      *
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testSelectedCells($format): void
+    public function testSelectedCells(string $format): void
     {
         $spreadsheet = new Spreadsheet();
 
diff --git a/tests/PhpSpreadsheetTests/Functional/TypeAttributePreservationTest.php b/tests/PhpSpreadsheetTests/Functional/TypeAttributePreservationTest.php
index 14343d32b..b852a879c 100644
--- a/tests/PhpSpreadsheetTests/Functional/TypeAttributePreservationTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/TypeAttributePreservationTest.php
@@ -31,10 +31,8 @@ class TypeAttributePreservationTest extends AbstractFunctional
      * Ensure saved spreadsheets maintain the correct data type.
      *
      * @dataProvider providerFormulae
-     *
-     * @param string $format
      */
-    public function testFormulae($format, array $values): void
+    public function testFormulae(string $format, array $values): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
@@ -65,10 +63,8 @@ class TypeAttributePreservationTest extends AbstractFunctional
      * Ensure saved spreadsheets maintain the correct data type.
      *
      * @dataProvider providerFormulae
-     *
-     * @param string $format
      */
-    public function testFormulaeNoPrecalc($format, array $values): void
+    public function testFormulaeNoPrecalc(string $format, array $values): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Functional/WorkbookViewAttributesTest.php b/tests/PhpSpreadsheetTests/Functional/WorkbookViewAttributesTest.php
index 9998dcedd..698673fc7 100644
--- a/tests/PhpSpreadsheetTests/Functional/WorkbookViewAttributesTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/WorkbookViewAttributesTest.php
@@ -21,10 +21,8 @@ class WorkbookViewAttributesTest extends AbstractFunctional
      * @see https://github.com/PHPOffice/PhpSpreadsheet/issues/523
      *
      * @dataProvider providerFormats
-     *
-     * @param string $format
      */
-    public function testPreserveWorkbookViewAttributes($format): void
+    public function testPreserveWorkbookViewAttributes(string $format): void
     {
         // Create a dummy workbook with two worksheets
         $workbook = new Spreadsheet();
diff --git a/tests/PhpSpreadsheetTests/HashTableTest.php b/tests/PhpSpreadsheetTests/HashTableTest.php
index 09c2fc928..e40cf0fcd 100644
--- a/tests/PhpSpreadsheetTests/HashTableTest.php
+++ b/tests/PhpSpreadsheetTests/HashTableTest.php
@@ -18,10 +18,7 @@ class HashTableTest extends TestCase
         return [$comment1, $comment2];
     }
 
-    /**
-     * @param mixed $comment
-     */
-    public static function getAuthor($comment): string
+    public static function getAuthor(mixed $comment): string
     {
         return ($comment instanceof Comment) ? $comment->getAuthor() : '';
     }
diff --git a/tests/PhpSpreadsheetTests/Helper/HtmlTest.php b/tests/PhpSpreadsheetTests/Helper/HtmlTest.php
index 6bcb97301..8c9d7f5a6 100644
--- a/tests/PhpSpreadsheetTests/Helper/HtmlTest.php
+++ b/tests/PhpSpreadsheetTests/Helper/HtmlTest.php
@@ -9,11 +9,8 @@ class HtmlTest extends TestCase
 {
     /**
      * @dataProvider providerUtf8EncodingSupport
-     *
-     * @param mixed $expected
-     * @param mixed $input
      */
-    public function testUtf8EncodingSupport($expected, $input): void
+    public function testUtf8EncodingSupport(mixed $expected, mixed $input): void
     {
         $html = new Html();
         $actual = $html->toRichTextObject($input);
diff --git a/tests/PhpSpreadsheetTests/IOFactoryTest.php b/tests/PhpSpreadsheetTests/IOFactoryTest.php
index 4f46a6b26..558766724 100644
--- a/tests/PhpSpreadsheetTests/IOFactoryTest.php
+++ b/tests/PhpSpreadsheetTests/IOFactoryTest.php
@@ -13,11 +13,8 @@ class IOFactoryTest extends TestCase
 {
     /**
      * @dataProvider providerCreateWriter
-     *
-     * @param string $name
-     * @param string $expected
      */
-    public function testCreateWriter($name, $expected): void
+    public function testCreateWriter(string $name, string $expected): void
     {
         $spreadsheet = new Spreadsheet();
         $actual = IOFactory::createWriter($spreadsheet, $name);
@@ -48,11 +45,8 @@ class IOFactoryTest extends TestCase
 
     /**
      * @dataProvider providerCreateReader
-     *
-     * @param string $name
-     * @param string $expected
      */
-    public function testCreateReader($name, $expected): void
+    public function testCreateReader(string $name, string $expected): void
     {
         $actual = IOFactory::createReader($name);
         self::assertSame($expected, get_class($actual));
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvCallbackTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvCallbackTest.php
index 46f4a5277..3968c47de 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvCallbackTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvCallbackTest.php
@@ -13,10 +13,7 @@ class CsvCallbackTest extends TestCase
         Csv::setConstructorCallback(null);
     }
 
-    /**
-     * @param mixed $obj
-     */
-    public function callbackDoNothing($obj): void
+    public function callbackDoNothing(mixed $obj): void
     {
         self::assertInstanceOf(Csv::class, $obj);
     }
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvEncodingTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvEncodingTest.php
index 7a9438864..db8a46a55 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvEncodingTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvEncodingTest.php
@@ -9,11 +9,8 @@ class CsvEncodingTest extends TestCase
 {
     /**
      * @dataProvider providerEncodings
-     *
-     * @param string $filename
-     * @param string $encoding
      */
-    public function testEncodings($filename, $encoding): void
+    public function testEncodings(string $filename, string $encoding): void
     {
         $reader = new Csv();
         $reader->setInputEncoding($encoding);
@@ -24,11 +21,8 @@ class CsvEncodingTest extends TestCase
 
     /**
      * @dataProvider providerEncodings
-     *
-     * @param string $filename
-     * @param string $encoding
      */
-    public function testWorkSheetInfo($filename, $encoding): void
+    public function testWorkSheetInfo(string $filename, string $encoding): void
     {
         $reader = new Csv();
         $reader->setInputEncoding($encoding);
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php
index 82256365f..4f1e95a54 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php
@@ -11,13 +11,9 @@ use PHPUnit\Framework\TestCase;
 
 class CsvIssue2232Test extends TestCase
 {
-    /**
-     * @var IValueBinder
-     */
-    private $valueBinder;
+    private IValueBinder $valueBinder;
 
-    /** @var string */
-    private $locale;
+    private string $locale;
 
     protected function setUp(): void
     {
@@ -33,11 +29,8 @@ class CsvIssue2232Test extends TestCase
 
     /**
      * @dataProvider providerIssue2232
-     *
-     * @param mixed $b2Value
-     * @param mixed $b3Value
      */
-    public function testBooleanConversions(bool $useStringBinder, ?bool $preserveBoolString, $b2Value, $b3Value): void
+    public function testBooleanConversions(bool $useStringBinder, ?bool $preserveBoolString, bool|string $b2Value, bool|string $b3Value): void
     {
         if ($useStringBinder) {
             $binder = new StringValueBinder();
@@ -69,11 +62,8 @@ class CsvIssue2232Test extends TestCase
 
     /**
      * @dataProvider providerIssue2232locale
-     *
-     * @param mixed $b4Value
-     * @param mixed $b5Value
      */
-    public function testBooleanConversionsLocaleAware(bool $useStringBinder, ?bool $preserveBoolString, $b4Value, $b5Value): void
+    public function testBooleanConversionsLocaleAware(bool $useStringBinder, ?bool $preserveBoolString, mixed $b4Value, mixed $b5Value): void
     {
         if ($useStringBinder) {
             $binder = new StringValueBinder();
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php
index 5e9af62dc..70cfb39de 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatLocaleTest.php
@@ -53,10 +53,8 @@ class CsvNumberFormatLocaleTest extends TestCase
 
     /**
      * @dataProvider providerNumberFormatNoConversionTest
-     *
-     * @param mixed $expectedValue
      */
-    public function testNumberFormatNoConversion($expectedValue, string $expectedFormat, string $cellAddress): void
+    public function testNumberFormatNoConversion(mixed $expectedValue, string $expectedFormat, string $cellAddress): void
     {
         if (!$this->localeAdjusted) {
             self::markTestSkipped('Unable to set locale for testing.');
@@ -95,11 +93,9 @@ class CsvNumberFormatLocaleTest extends TestCase
     /**
      * @dataProvider providerNumberValueConversionTest
      *
-     * @param mixed $expectedValue
-     *
      * @runInSeparateProcess
      */
-    public function testNumberValueConversion($expectedValue, string $cellAddress): void
+    public function testNumberValueConversion(mixed $expectedValue, string $cellAddress): void
     {
         if (!$this->localeAdjusted) {
             self::markTestSkipped('Unable to set locale for testing.');
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatTest.php
index 0022fd15a..50047f374 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvNumberFormatTest.php
@@ -26,10 +26,8 @@ class CsvNumberFormatTest extends TestCase
 
     /**
      * @dataProvider providerNumberFormatNoConversionTest
-     *
-     * @param mixed $expectedValue
      */
-    public function testNumberFormatNoConversion($expectedValue, string $expectedFormat, string $cellAddress): void
+    public function testNumberFormatNoConversion(int|string $expectedValue, string $expectedFormat, string $cellAddress): void
     {
         $spreadsheet = $this->csvReader->load($this->filename);
         $worksheet = $spreadsheet->getActiveSheet();
@@ -63,10 +61,8 @@ class CsvNumberFormatTest extends TestCase
 
     /**
      * @dataProvider providerNumberValueConversionTest
-     *
-     * @param mixed $expectedValue
      */
-    public function testNumberValueConversion($expectedValue, string $cellAddress): void
+    public function testNumberValueConversion(mixed $expectedValue, string $cellAddress): void
     {
         $this->csvReader->castFormattedNumberToNumeric(true);
         $spreadsheet = $this->csvReader->load($this->filename);
@@ -114,10 +110,8 @@ class CsvNumberFormatTest extends TestCase
 
     /**
      * @dataProvider providerNumberFormatConversionTest
-     *
-     * @param mixed $expectedValue
      */
-    public function testNumberFormatConversion($expectedValue, string $expectedFormat, string $cellAddress): void
+    public function testNumberFormatConversion(mixed $expectedValue, string $expectedFormat, string $cellAddress): void
     {
         $this->csvReader->castFormattedNumberToNumeric(true, true);
         $spreadsheet = $this->csvReader->load($this->filename);
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php
index 8a0308a4e..cd8ece9b2 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php
@@ -10,13 +10,8 @@ class CsvTest extends TestCase
 {
     /**
      * @dataProvider providerDelimiterDetection
-     *
-     * @param string $filename
-     * @param string $expectedDelimiter
-     * @param string $cell
-     * @param float|int|string $expectedValue
      */
-    public function testDelimiterDetection($filename, $expectedDelimiter, $cell, $expectedValue): void
+    public function testDelimiterDetection(string $filename, string $expectedDelimiter, string $cell, string|float|int|null $expectedValue): void
     {
         $reader = new Csv();
         $delim1 = $reader->getDelimiter();
@@ -92,11 +87,8 @@ class CsvTest extends TestCase
 
     /**
      * @dataProvider providerCanLoad
-     *
-     * @param bool $expected
-     * @param string $filename
      */
-    public function testCanLoad($expected, $filename): void
+    public function testCanLoad(bool $expected, string $filename): void
     {
         $reader = new Csv();
         self::assertSame($expected, $reader->canRead($filename));
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
index 5f80b2581..a15b16cb4 100644
--- a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
@@ -64,11 +64,8 @@ class HtmlTest extends TestCase
 
     /**
      * @dataProvider providerCanReadVerySmallFile
-     *
-     * @param bool $expected
-     * @param string $content
      */
-    public function testCanReadVerySmallFile($expected, $content): void
+    public function testCanReadVerySmallFile(bool $expected, string $content): void
     {
         $filename = HtmlHelper::createHtml($content);
         $reader = new Html();
diff --git a/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php b/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
index 34bf33ab6..6570bf9b1 100644
--- a/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
@@ -13,11 +13,8 @@ class XmlScannerTest extends TestCase
 {
     /**
      * @dataProvider providerValidXML
-     *
-     * @param mixed $filename
-     * @param mixed $expectedResult
      */
-    public function testValidXML($filename, $expectedResult): void
+    public function testValidXML(mixed $filename, mixed $expectedResult): void
     {
         $reader = XmlScanner::getInstance(new \PhpOffice\PhpSpreadsheet\Reader\Xml());
         $result = $reader->scanFile($filename);
@@ -40,10 +37,8 @@ class XmlScannerTest extends TestCase
 
     /**
      * @dataProvider providerInvalidXML
-     *
-     * @param mixed $filename
      */
-    public function testInvalidXML($filename): void
+    public function testInvalidXML(mixed $filename): void
     {
         $this->expectException(\PhpOffice\PhpSpreadsheet\Reader\Exception::class);
 
@@ -95,11 +90,8 @@ class XmlScannerTest extends TestCase
 
     /**
      * @dataProvider providerValidXMLForCallback
-     *
-     * @param mixed $filename
-     * @param mixed $expectedResult
      */
-    public function testSecurityScanWithCallback($filename, $expectedResult): void
+    public function testSecurityScanWithCallback(mixed $filename, mixed $expectedResult): void
     {
         $fileReader = new Xlsx();
         $scanner = $fileReader->getSecurityScannerOrThrow();
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/ErrorCodeMapTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/ErrorCodeMapTest.php
index 0b8839bf0..251b37ea0 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/ErrorCodeMapTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/ErrorCodeMapTest.php
@@ -8,11 +8,9 @@ use PHPUnit\Framework\TestCase;
 class ErrorCodeMapTest extends TestCase
 {
     /**
-     * @param bool|string $expected
-     *
      * @dataProvider errorCodeMapProvider
      */
-    public function testErrorCode($expected, int $index): void
+    public function testErrorCode(bool|string $expected, int $index): void
     {
         self::assertSame($expected, ErrorCode::lookup($index));
     }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
index 50c1b3c12..7c75469f1 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilterTest.php
@@ -30,12 +30,8 @@ class AutoFilterTest extends TestCase
 
     /**
      * @dataProvider loadDataProvider
-     *
-     * @param string $ref
-     * @param int $expectedReadAutoFilterCalled
-     * @param string $expectedRef
      */
-    public function testLoad($ref, $expectedReadAutoFilterCalled, $expectedRef): void
+    public function testLoad(string $ref, int $expectedReadAutoFilterCalled, string $expectedRef): void
     {
         $worksheetAutoFilter = $this->getMockBuilder(WorksheetAutoFilter::class)
             ->disableOriginalConstructor()
diff --git a/tests/PhpSpreadsheetTests/RefRangeTest.php b/tests/PhpSpreadsheetTests/RefRangeTest.php
index a05de9fd0..c248b40b4 100644
--- a/tests/PhpSpreadsheetTests/RefRangeTest.php
+++ b/tests/PhpSpreadsheetTests/RefRangeTest.php
@@ -9,11 +9,9 @@ use PHPUnit\Framework\TestCase;
 class RefRangeTest extends TestCase
 {
     /**
-     * @param int|string $expectedResult
-     *
      * @dataProvider providerRefRange
      */
-    public function testRefRange($expectedResult, string $rangeString): void
+    public function testRefRange(int|string $expectedResult, string $rangeString): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Shared/CodePageTest.php b/tests/PhpSpreadsheetTests/Shared/CodePageTest.php
index dc7489975..050cfe0cc 100644
--- a/tests/PhpSpreadsheetTests/Shared/CodePageTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/CodePageTest.php
@@ -10,11 +10,8 @@ class CodePageTest extends TestCase
 {
     /**
      * @dataProvider providerCodePage
-     *
-     * @param mixed $expectedResult
-     * @param mixed $codePageIndex
      */
-    public function testCodePageNumberToName($expectedResult, $codePageIndex): void
+    public function testCodePageNumberToName(mixed $expectedResult, mixed $codePageIndex): void
     {
         if ($expectedResult === 'exception') {
             $this->expectException(Exception::class);
diff --git a/tests/PhpSpreadsheetTests/Shared/Date2Test.php b/tests/PhpSpreadsheetTests/Shared/Date2Test.php
index 78d2b55ec..f1090e3a0 100644
--- a/tests/PhpSpreadsheetTests/Shared/Date2Test.php
+++ b/tests/PhpSpreadsheetTests/Shared/Date2Test.php
@@ -40,10 +40,9 @@ class Date2Test extends TestCase
     /**
      * @dataProvider providerTimeOnly
      *
-     * @param float|int $expectedResult
      * @param float|int $value
      */
-    public function testTimeOnly($expectedResult, $value, ?string $format = null): void
+    public function testTimeOnly(int|float $expectedResult, int|float|string $value, ?string $format = null): void
     {
         Cell::setCalculateDateTimeType(Cell::CALCULATE_TIME_FLOAT);
         $this->spreadsheet = new Spreadsheet();
@@ -87,11 +86,8 @@ class Date2Test extends TestCase
 
     /**
      * @dataProvider providerDateAndTime
-     *
-     * @param float|int $expectedResult
-     * @param float|int $value
      */
-    public function testDateAndTime($expectedResult, $value, ?string $format = null): void
+    public function testDateAndTime(int|float $expectedResult, int|float|string $value, ?string $format = null): void
     {
         Cell::setCalculateDateTimeType(Cell::CALCULATE_DATE_TIME_FLOAT);
         $this->spreadsheet = new Spreadsheet();
@@ -135,11 +131,8 @@ class Date2Test extends TestCase
 
     /**
      * @dataProvider providerAsis
-     *
-     * @param float|int $expectedResult
-     * @param float|int $value
      */
-    public function testDefault($expectedResult, $value, ?string $format = null): void
+    public function testDefault(int|float $expectedResult, int|float|string $value, ?string $format = null): void
     {
         //Cell::setCalculateDateTimeType(Cell::CALCULATE_DATE_TIME_ASIS);
         $this->spreadsheet = new Spreadsheet();
@@ -160,11 +153,8 @@ class Date2Test extends TestCase
 
     /**
      * @dataProvider providerAsis
-     *
-     * @param float|int $expectedResult
-     * @param float|int $value
      */
-    public function testAsis($expectedResult, $value, ?string $format = null): void
+    public function testAsis(int|float $expectedResult, int|float|string $value, ?string $format = null): void
     {
         Cell::setCalculateDateTimeType(Cell::CALCULATE_DATE_TIME_ASIS);
         $this->spreadsheet = new Spreadsheet();
diff --git a/tests/PhpSpreadsheetTests/Shared/DateTest.php b/tests/PhpSpreadsheetTests/Shared/DateTest.php
index 9bcd6ff29..95e12b650 100644
--- a/tests/PhpSpreadsheetTests/Shared/DateTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/DateTest.php
@@ -54,11 +54,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDateTimeExcelToTimestamp1900
-     *
-     * @param mixed $expectedResult
-     * @param mixed $excelDateTimeValue
      */
-    public function testDateTimeExcelToTimestamp1900($expectedResult, $excelDateTimeValue): void
+    public function testDateTimeExcelToTimestamp1900(mixed $expectedResult, mixed $excelDateTimeValue): void
     {
         if (is_numeric($expectedResult) && ($expectedResult > PHP_INT_MAX || $expectedResult < PHP_INT_MIN)) {
             self::markTestSkipped('Test invalid on 32-bit system.');
@@ -76,11 +73,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDateTimeTimestampToExcel1900
-     *
-     * @param mixed $expectedResult
-     * @param mixed $unixTimestamp
      */
-    public function testDateTimeTimestampToExcel1900($expectedResult, $unixTimestamp): void
+    public function testDateTimeTimestampToExcel1900(mixed $expectedResult, mixed $unixTimestamp): void
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
@@ -95,11 +89,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDateTimeDateTimeToExcel
-     *
-     * @param mixed $expectedResult
-     * @param mixed $dateTimeObject
      */
-    public function testDateTimeDateTimeToExcel($expectedResult, $dateTimeObject): void
+    public function testDateTimeDateTimeToExcel(mixed $expectedResult, mixed $dateTimeObject): void
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
@@ -114,10 +105,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDateTimeFormattedPHPToExcel1900
-     *
-     * @param mixed $expectedResult
      */
-    public function testDateTimeFormattedPHPToExcel1900($expectedResult, ...$args): void
+    public function testDateTimeFormattedPHPToExcel1900(mixed $expectedResult, mixed ...$args): void
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
@@ -132,11 +121,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDateTimeExcelToTimestamp1904
-     *
-     * @param mixed $expectedResult
-     * @param mixed $excelDateTimeValue
      */
-    public function testDateTimeExcelToTimestamp1904($expectedResult, $excelDateTimeValue): void
+    public function testDateTimeExcelToTimestamp1904(mixed $expectedResult, mixed $excelDateTimeValue): void
     {
         if (is_numeric($expectedResult) && ($expectedResult > PHP_INT_MAX || $expectedResult < PHP_INT_MIN)) {
             self::markTestSkipped('Test invalid on 32-bit system.');
@@ -154,11 +140,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDateTimeTimestampToExcel1904
-     *
-     * @param mixed $expectedResult
-     * @param mixed $unixTimestamp
      */
-    public function testDateTimeTimestampToExcel1904($expectedResult, $unixTimestamp): void
+    public function testDateTimeTimestampToExcel1904(mixed $expectedResult, mixed $unixTimestamp): void
     {
         Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
 
@@ -173,10 +156,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerIsDateTimeFormatCode
-     *
-     * @param mixed $expectedResult
      */
-    public function testIsDateTimeFormatCode($expectedResult, string $format): void
+    public function testIsDateTimeFormatCode(mixed $expectedResult, string $format): void
     {
         $result = Date::isDateTimeFormatCode($format);
         self::assertEquals($expectedResult, $result);
@@ -189,12 +170,8 @@ class DateTest extends TestCase
 
     /**
      * @dataProvider providerDateTimeExcelToTimestamp1900Timezone
-     *
-     * @param mixed $expectedResult
-     * @param mixed $excelDateTimeValue
-     * @param mixed $timezone
      */
-    public function testDateTimeExcelToTimestamp1900Timezone($expectedResult, $excelDateTimeValue, $timezone): void
+    public function testDateTimeExcelToTimestamp1900Timezone(mixed $expectedResult, mixed $excelDateTimeValue, mixed $timezone): void
     {
         if (is_numeric($expectedResult) && ($expectedResult > PHP_INT_MAX || $expectedResult < PHP_INT_MIN)) {
             self::markTestSkipped('Test invalid on 32-bit system.');
diff --git a/tests/PhpSpreadsheetTests/Shared/FontTest.php b/tests/PhpSpreadsheetTests/Shared/FontTest.php
index 558c66f57..699041ee1 100644
--- a/tests/PhpSpreadsheetTests/Shared/FontTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/FontTest.php
@@ -41,11 +41,8 @@ class FontTest extends TestCase
 
     /**
      * @dataProvider providerFontSizeToPixels
-     *
-     * @param mixed $expectedResult
-     * @param mixed $size
      */
-    public function testFontSizeToPixels($expectedResult, $size): void
+    public function testFontSizeToPixels(mixed $expectedResult, mixed $size): void
     {
         $result = Font::fontSizeToPixels($size);
         self::assertEquals($expectedResult, $result);
@@ -58,11 +55,8 @@ class FontTest extends TestCase
 
     /**
      * @dataProvider providerInchSizeToPixels
-     *
-     * @param mixed $expectedResult
-     * @param mixed $size
      */
-    public function testInchSizeToPixels($expectedResult, $size): void
+    public function testInchSizeToPixels(mixed $expectedResult, mixed $size): void
     {
         $result = Font::inchSizeToPixels($size);
         self::assertEqualsWithDelta($expectedResult, $result, self::FONT_PRECISION);
@@ -75,11 +69,8 @@ class FontTest extends TestCase
 
     /**
      * @dataProvider providerCentimeterSizeToPixels
-     *
-     * @param mixed $expectedResult
-     * @param mixed $size
      */
-    public function testCentimeterSizeToPixels($expectedResult, $size): void
+    public function testCentimeterSizeToPixels(mixed $expectedResult, mixed $size): void
     {
         $result = Font::centimeterSizeToPixels($size);
         self::assertEqualsWithDelta($expectedResult, $result, self::FONT_PRECISION);
diff --git a/tests/PhpSpreadsheetTests/Shared/Trend/ExponentialBestFitTest.php b/tests/PhpSpreadsheetTests/Shared/Trend/ExponentialBestFitTest.php
index f17785a61..82c97efa4 100644
--- a/tests/PhpSpreadsheetTests/Shared/Trend/ExponentialBestFitTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/Trend/ExponentialBestFitTest.php
@@ -9,21 +9,14 @@ class ExponentialBestFitTest extends TestCase
 {
     /**
      * @dataProvider providerExponentialBestFit
-     *
-     * @param mixed $expectedSlope
-     * @param mixed $expectedIntersect
-     * @param mixed $expectedGoodnessOfFit
-     * @param mixed $yValues
-     * @param mixed $xValues
-     * @param mixed $expectedEquation
      */
     public function testExponentialBestFit(
-        $expectedSlope,
-        $expectedIntersect,
-        $expectedGoodnessOfFit,
-        $expectedEquation,
-        $yValues,
-        $xValues
+        mixed $expectedSlope,
+        mixed $expectedIntersect,
+        mixed $expectedGoodnessOfFit,
+        mixed $expectedEquation,
+        mixed $yValues,
+        mixed $xValues
     ): void {
         $bestFit = new ExponentialBestFit($yValues, $xValues);
         $slope = $bestFit->getSlope(1);
diff --git a/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php b/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php
index c88ff8d58..0dafa66f7 100644
--- a/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php
@@ -11,21 +11,14 @@ class LinearBestFitTest extends TestCase
 
     /**
      * @dataProvider providerLinearBestFit
-     *
-     * @param mixed $expectedSlope
-     * @param mixed $expectedIntersect
-     * @param mixed $expectedGoodnessOfFit
-     * @param mixed $yValues
-     * @param mixed $xValues
-     * @param mixed $expectedEquation
      */
     public function testLinearBestFit(
-        $expectedSlope,
-        $expectedIntersect,
-        $expectedGoodnessOfFit,
-        $expectedEquation,
-        $yValues,
-        $xValues
+        mixed $expectedSlope,
+        mixed $expectedIntersect,
+        mixed $expectedGoodnessOfFit,
+        mixed $expectedEquation,
+        mixed $yValues,
+        mixed $xValues
     ): void {
         $bestFit = new LinearBestFit($yValues, $xValues);
         $slope = $bestFit->getSlope(1);
diff --git a/tests/PhpSpreadsheetTests/Style/ColorTest.php b/tests/PhpSpreadsheetTests/Style/ColorTest.php
index b4d4b1fe3..e8c41ab9b 100644
--- a/tests/PhpSpreadsheetTests/Style/ColorTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ColorTest.php
@@ -76,10 +76,8 @@ class ColorTest extends TestCase
 
     /**
      * @dataProvider providerColorGetRed
-     *
-     * @param mixed $expectedResult
      */
-    public function testGetRed($expectedResult, string $color, ?bool $bool = null): void
+    public function testGetRed(mixed $expectedResult, string $color, ?bool $bool = null): void
     {
         if ($bool === null) {
             $result = Color::getRed($color);
@@ -96,10 +94,8 @@ class ColorTest extends TestCase
 
     /**
      * @dataProvider providerColorGetGreen
-     *
-     * @param mixed $expectedResult
      */
-    public function testGetGreen($expectedResult, string $color, ?bool $bool = null): void
+    public function testGetGreen(mixed $expectedResult, string $color, ?bool $bool = null): void
     {
         if ($bool === null) {
             $result = Color::getGreen($color);
@@ -116,10 +112,8 @@ class ColorTest extends TestCase
 
     /**
      * @dataProvider providerColorGetBlue
-     *
-     * @param mixed $expectedResult
      */
-    public function testGetBlue($expectedResult, string $color, ?bool $bool = null): void
+    public function testGetBlue(mixed $expectedResult, string $color, ?bool $bool = null): void
     {
         if ($bool === null) {
             $result = Color::getBlue($color);
@@ -136,10 +130,8 @@ class ColorTest extends TestCase
 
     /**
      * @dataProvider providerColorChangeBrightness
-     *
-     * @param mixed $expectedResult
      */
-    public function testChangeBrightness($expectedResult, ...$args): void
+    public function testChangeBrightness(mixed $expectedResult, mixed ...$args): void
     {
         $result = Color::changeBrightness(...$args);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/CellValueWizardTest.php b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/CellValueWizardTest.php
index fa98db447..04974061c 100644
--- a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/CellValueWizardTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/CellValueWizardTest.php
@@ -33,11 +33,8 @@ class CellValueWizardTest extends TestCase
 
     /**
      * @dataProvider basicCellValueDataProvider
-     *
-     * @param mixed $operand
-     * @param mixed $expectedCondition
      */
-    public function testBasicCellValueWizard(string $operator, $operand, string $expectedOperator, $expectedCondition): void
+    public function testBasicCellValueWizard(string $operator, mixed $operand, string $expectedOperator, mixed $expectedCondition): void
     {
         $ruleType = Wizard::CELL_VALUE;
         /** @var Wizard\CellValue $wizard */
@@ -75,11 +72,8 @@ class CellValueWizardTest extends TestCase
 
     /**
      * @dataProvider relativeCellValueDataProvider
-     *
-     * @param mixed $operand
-     * @param mixed $expectedCondition
      */
-    public function testRelativeCellValueWizard($operand, $expectedCondition): void
+    public function testRelativeCellValueWizard(mixed $operand, mixed $expectedCondition): void
     {
         $ruleType = Wizard::CELL_VALUE;
         /** @var Wizard\CellValue $wizard */
@@ -109,11 +103,8 @@ class CellValueWizardTest extends TestCase
 
     /**
      * @dataProvider formulaCellValueDataProvider
-     *
-     * @param mixed $operand
-     * @param mixed $expectedCondition
      */
-    public function testCellValueWizardWithFormula($operand, $expectedCondition): void
+    public function testCellValueWizardWithFormula(mixed $operand, mixed $expectedCondition): void
     {
         $ruleType = Wizard::CELL_VALUE;
         /** @var Wizard\CellValue $wizard */
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTest.php
index e4b83a0b5..a8b7a4ff1 100644
--- a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTest.php
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTest.php
@@ -13,7 +13,7 @@ class DateTest extends TestCase
      * @param null|string|string[] $separators
      * @param string[] $formatBlocks
      */
-    public function testDate(string $expectedResult, $separators = null, array $formatBlocks = []): void
+    public function testDate(string $expectedResult, string|array|null $separators = null, array $formatBlocks = []): void
     {
         $wizard = new Date($separators, ...$formatBlocks);
         self::assertSame($expectedResult, (string) $wizard);
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTimeTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTimeTest.php
index a92ae6d06..7a1cc084b 100644
--- a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTimeTest.php
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DateTimeTest.php
@@ -15,7 +15,7 @@ class DateTimeTest extends TestCase
      * @param null|string|string[] $separators
      * @param string[] $formatBlocks
      */
-    public function testDateTime(string $expectedResult, $separators, array $formatBlocks): void
+    public function testDateTime(string $expectedResult, string|null|array $separators, array $formatBlocks): void
     {
         $wizard = new DateTime($separators, ...$formatBlocks);
         self::assertSame($expectedResult, (string) $wizard);
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DurationTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DurationTest.php
index 90cbdf68d..c7876beb9 100644
--- a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DurationTest.php
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/DurationTest.php
@@ -13,7 +13,7 @@ class DurationTest extends TestCase
      * @param null|string|string[] $separators
      * @param string[] $formatBlocks
      */
-    public function testTime(string $expectedResult, $separators = null, array $formatBlocks = []): void
+    public function testTime(string $expectedResult, string|array|null $separators = null, array $formatBlocks = []): void
     {
         $wizard = new Duration($separators, ...$formatBlocks);
         self::assertSame($expectedResult, (string) $wizard);
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/TimeTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/TimeTest.php
index a8e986cf9..02249de33 100644
--- a/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/TimeTest.php
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormat/Wizard/TimeTest.php
@@ -13,7 +13,7 @@ class TimeTest extends TestCase
      * @param null|string|string[] $separators
      * @param string[] $formatBlocks
      */
-    public function testTime(string $expectedResult, $separators = null, array $formatBlocks = []): void
+    public function testTime(string $expectedResult, string|array|null $separators = null, array $formatBlocks = []): void
     {
         $wizard = new Time($separators, ...$formatBlocks);
         self::assertSame($expectedResult, (string) $wizard);
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
index 741d36e7d..ed28aed8f 100644
--- a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
@@ -42,10 +42,8 @@ class NumberFormatTest extends TestCase
 
     /**
      * @dataProvider providerNumberFormat
-     *
-     * @param mixed $expectedResult
      */
-    public function testFormatValueWithMask($expectedResult, ...$args): void
+    public function testFormatValueWithMask(mixed $expectedResult, mixed ...$args): void
     {
         $result = NumberFormat::toFormattedString(...$args);
         self::assertSame($expectedResult, $result);
@@ -58,11 +56,8 @@ class NumberFormatTest extends TestCase
 
     /**
      * @dataProvider providerNumberFormatFractions
-     *
-     * @param mixed $expectedResult
-     * @param mixed $args
      */
-    public function testFormatValueWithMaskFraction($expectedResult, ...$args): void
+    public function testFormatValueWithMaskFraction(mixed $expectedResult, mixed ...$args): void
     {
         $result = NumberFormat::toFormattedString(...$args);
         self::assertEquals($expectedResult, $result);
@@ -75,11 +70,8 @@ class NumberFormatTest extends TestCase
 
     /**
      * @dataProvider providerNumberFormatDates
-     *
-     * @param mixed $expectedResult
-     * @param mixed $args
      */
-    public function testFormatValueWithMaskDate($expectedResult, ...$args): void
+    public function testFormatValueWithMaskDate(mixed $expectedResult, mixed ...$args): void
     {
         $result = NumberFormat::toFormattedString(...$args);
         self::assertEquals($expectedResult, $result);
diff --git a/tests/PhpSpreadsheetTests/Worksheet/Table/TableTest.php b/tests/PhpSpreadsheetTests/Worksheet/Table/TableTest.php
index 5ff0daed1..17f9bfd6c 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/Table/TableTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/Table/TableTest.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Worksheet\Table;
 
+use PhpOffice\PhpSpreadsheet\Cell\AddressRange;
 use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
 use PhpOffice\PhpSpreadsheet\Cell\CellRange;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
@@ -154,9 +155,8 @@ class TableTest extends SetupTeardown
 
     /**
      * @param AddressRange|array<int>|string $fullRange
-     * @param string $fullRange
      */
-    public function xtestSetRangeValidRange($fullRange, string $actualRange): void
+    public function xtestSetRangeValidRange(string|array|AddressRange $fullRange, string $actualRange): void
     {
         $table = new Table(self::INITIAL_RANGE);
 
diff --git a/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php b/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
index bd6c25a33..c30113436 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
@@ -33,12 +33,9 @@ class WorksheetTest extends TestCase
     }
 
     /**
-     * @param string $title
-     * @param string $expectMessage
-     *
      * @dataProvider setTitleInvalidProvider
      */
-    public function testSetTitleInvalid($title, $expectMessage): void
+    public function testSetTitleInvalid(string $title, string $expectMessage): void
     {
         // First, test setting title with validation disabled -- should be successful
         $worksheet = new Worksheet();
@@ -93,12 +90,9 @@ class WorksheetTest extends TestCase
     }
 
     /**
-     * @param string $codeName
-     * @param string $expectMessage
-     *
      * @dataProvider setCodeNameInvalidProvider
      */
-    public function testSetCodeNameInvalid($codeName, $expectMessage): void
+    public function testSetCodeNameInvalid(string $codeName, string $expectMessage): void
     {
         // First, test setting code name with validation disabled -- should be successful
         $worksheet = new Worksheet();
@@ -156,14 +150,9 @@ class WorksheetTest extends TestCase
     }
 
     /**
-     * @param string $range
-     * @param string $expectTitle
-     * @param string $expectCell
-     * @param string $expectCell2
-     *
      * @dataProvider extractSheetTitleProvider
      */
-    public function testExtractSheetTitle($range, $expectTitle, $expectCell, $expectCell2): void
+    public function testExtractSheetTitle(string $range, string $expectTitle, string $expectCell, string $expectCell2): void
     {
         // only cell reference
         self::assertSame($expectCell, Worksheet::extractSheetTitle($range));
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlCommentsTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlCommentsTest.php
index 22b2d4c1d..00fae1ade 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlCommentsTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlCommentsTest.php
@@ -52,10 +52,8 @@ class HtmlCommentsTest extends Functional\AbstractFunctional
 
     /**
      * @dataProvider providerCommentRichText
-     *
-     * @param mixed $richText
      */
-    public function testComments($richText): void
+    public function testComments(RichText $richText): void
     {
         $this->spreadsheet = new Spreadsheet();
 
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php
index 92a904660..fc4d30269 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php
@@ -153,12 +153,8 @@ class HtmlNumberFormatTest extends Functional\AbstractFunctional
 
     /**
      * @dataProvider providerNumberFormat
-     *
-     * @param mixed $expectedResult
-     * @param mixed $val
-     * @param mixed $fmt
      */
-    public function testFormatValueWithMask($expectedResult, $val, $fmt): void
+    public function testFormatValueWithMask(mixed $expectedResult, mixed $val, mixed $fmt): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
@@ -189,12 +185,8 @@ class HtmlNumberFormatTest extends Functional\AbstractFunctional
 
     /**
      * @dataProvider providerNumberFormatDates
-     *
-     * @param mixed $expectedResult
-     * @param mixed $val
-     * @param mixed $fmt
      */
-    public function testFormatValueWithMaskDate($expectedResult, $val, $fmt): void
+    public function testFormatValueWithMaskDate(mixed $expectedResult, mixed $val, mixed $fmt): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/XssVulnerabilityTest.php b/tests/PhpSpreadsheetTests/Writer/Html/XssVulnerabilityTest.php
index d5396b221..25933179b 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/XssVulnerabilityTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/XssVulnerabilityTest.php
@@ -20,11 +20,8 @@ class XssVulnerabilityTest extends Functional\AbstractFunctional
 
     /**
      * @dataProvider providerAcceptableMarkupRichText
-     *
-     * @param string $safeTextString
-     * @param string $adjustedTextString
      */
-    public function testMarkupInComment($safeTextString, $adjustedTextString): void
+    public function testMarkupInComment(string $safeTextString, string $adjustedTextString): void
     {
         $spreadsheet = new Spreadsheet();
 
@@ -61,10 +58,8 @@ class XssVulnerabilityTest extends Functional\AbstractFunctional
 
     /**
      * @dataProvider providerXssRichText
-     *
-     * @param string $xssTextString
      */
-    public function testXssInComment($xssTextString): void
+    public function testXssInComment(string $xssTextString): void
     {
         $spreadsheet = new Spreadsheet();
 
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
index c8b3a658b..a93662fd9 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
@@ -136,12 +136,8 @@ class WorkbookTest extends TestCase
 
     /**
      * Change palette color to rgb string.
-     *
-     * @param array $palette palette color
-     *
-     * @return string rgb string
      */
-    private function paletteToColor($palette): string
+    private function paletteToColor(array $palette): string
     {
         return $this->right('00' . dechex((int) ($palette[0])), 2)
             . $this->right('00' . dechex((int) ($palette[1])), 2)
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/FloatsRetainedTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/FloatsRetainedTest.php
index d8d2119ad..126022dc8 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/FloatsRetainedTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/FloatsRetainedTest.php
@@ -12,10 +12,8 @@ class FloatsRetainedTest extends TestCase
 {
     /**
      * @dataProvider providerIntyFloatsRetainedByWriter
-     *
-     * @param float|int $value
      */
-    public function testIntyFloatsRetainedByWriter($value): void
+    public function testIntyFloatsRetainedByWriter(float|int $value): void
     {
         $outputFilename = File::temporaryFilename();
         $spreadsheet = new Spreadsheet();
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/MemoryDrawingTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/MemoryDrawingTest.php
index bbc7fe230..c30cb4f09 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/MemoryDrawingTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/MemoryDrawingTest.php
@@ -67,10 +67,8 @@ class MemoryDrawingTest extends AbstractFunctional
      * Determine if image uses transparency.
      *
      * @see https://stackoverflow.com/questions/5495275/how-to-check-if-a-png-image-has-transparency-using-gd
-     *
-     * @param GdImage|resource $im
      */
-    private static function checkTransparent($im): bool
+    private static function checkTransparent(GdImage $im): bool
     {
         $width = imagesx($im); // Get the width of the image
         $height = imagesy($im); // Get the height of the image