Merge pull request #4239 from oleibman/phpunit11d

Use Php Attributes Rather than Annotations for PhpUnit

Author: oleibman

.php-cs-fixer.dist.php

@@ -146,6 +146,7 @@
         'ordered_imports' => true,
         'ordered_interfaces' => true,
         'ordered_traits' => true,
+        'php_unit_attributes' => ['keep_annotations' => false],
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
         'php_unit_dedicate_assert_internal_type' => true,

CONTRIBUTING.md

@@ -40,7 +40,7 @@ This makes it easier to see exactly what is being tested when reviewing the PR.
     2. Tag subject must be the version number, eg: `1.2.3`
     3. Tag body must be a copy-paste of the changelog entries.
 3. Push the tag with `git push --tags`, GitHub Actions will create a GitHub release automatically, and the release details will automatically be sent to packagist.
-4. By default, Github remove markdown headings in the Release Notes. You can either edit to restore these, or, probably preferably, change the default comment character on your system - `git config core.commentChar ';'`.
+4. By default, Github removes markdown headings in the Release Notes. You can either edit to restore these, or, probably preferably, change the default comment character on your system - `git config core.commentChar ";"`.
 
 > **Note:** Tagged releases are made from the `master` branch. Only in an emergency should a tagged release be made from the `release` branch. (i.e. cherry-picked hot-fixes.) However, there are 3 branches which have been updated to apply security patches, and those may be tagged if future security updates are needed.
 - release1291

composer.json

@@ -95,7 +95,7 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.6 || ^10.5",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.7",
         "tecnickcom/tcpdf": "^6.5"
     },

phpunit.xml.dist

@@ -3,6 +3,7 @@
   <coverage/>
   <php>
     <ini name="memory_limit" value="2048M"/>
+    <ini name="error_reporting" value="E_ALL"/>
   </php>
   <testsuite name="PhpSpreadsheet Unit Test Suite">
     <directory>./tests/PhpSpreadsheetTests</directory>

phpunit9.xml.dist

@@ -10,9 +10,7 @@
 
 class ArrayFormulaTest extends TestCase
 {
-    /**
-     * @dataProvider providerArrayFormulae
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerArrayFormulae')]
     public function testArrayFormula(string $formula, mixed $expectedResult): void
     {
         $result = Calculation::getInstance()->_calculateFormulaValue($formula);

tests/PhpSpreadsheetTests/Calculation/ArrayFormulaTest.php

@@ -24,9 +24,7 @@ protected function tearDown(): void
         Functions::setCompatibilityMode($this->compatibilityMode);
     }
 
-    /**
-     * @dataProvider providerBinaryComparison
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerBinaryComparison')]
     public function testBinaryComparisonOperation(
         mixed $operand1,
         mixed $operand2,

tests/PhpSpreadsheetTests/Calculation/BinaryComparisonTest.php

@@ -24,9 +24,7 @@ protected function tearDown(): void
         Functions::setCompatibilityMode($this->compatibilityMode);
     }
 
-    /**
-     * @dataProvider providerGetFunctions
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerGetFunctions')]
     public function testGetFunctions(array|string $functionCall): void
     {
         self::assertIsCallable($functionCall);

tests/PhpSpreadsheetTests/Calculation/CalculationFunctionListTest.php

@@ -29,9 +29,7 @@ protected function tearDown(): void
         $calculation->setLocale($this->locale);
     }
 
-    /**
-     * @dataProvider providerCanLoadAllSupportedLocales
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerCanLoadAllSupportedLocales')]
     public function testCanLoadAllSupportedLocales(string $locale): void
     {
         $calculation = Calculation::getInstance();

tests/PhpSpreadsheetTests/Calculation/CalculationSettingsTest.php

@@ -27,9 +27,7 @@ protected function tearDown(): void
         Functions::setCompatibilityMode($this->compatibilityMode);
     }
 
-    /**
-     * @dataProvider providerBinaryComparisonOperation
-     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('providerBinaryComparisonOperation')]
     public function testBinaryComparisonOperation(string $formula, mixed $expectedResultExcel, mixed $expectedResultOpenOffice): void
     {
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
@@ -374,9 +372,8 @@ public function testBranchPruningFormulaParsingInequalitiesConditionsCase(): voi
      *  be set in cache
      * @param string[] $shouldNotBeSetInCacheCells coordinates of cells that must
      *  not be set in cache because of pruning
-     *
-     * @dataProvider dataProviderBranchPruningFullExecution
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataProviderBranchPruningFullExecution')]
     public function testFullExecutionDataPruning(
         mixed $expectedResult,
         array $dataArray,