Bump to PHPUnit 10 (#26)

symplify · Jun 19, 2023 · d81c73f · d81c73f
1 parent 1b33a8c
commit d81c73f
Show file tree

Hide file tree

Showing 27 changed files with 65 additions and 172 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 composer.lock
 
 
-.phpunit.result.cache
+.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -5,22 +5,21 @@
     "require": {
         "php": ">=8.1",
         "nette/utils": "^3.2",
-        "friendsofphp/php-cs-fixer": "^3.13",
+        "friendsofphp/php-cs-fixer": "^3.18",
         "symplify/rule-doc-generator-contracts": "^11.1"
     },
     "require-dev": {
-        "symplify/easy-coding-standard": "^11.1",
-        "symfony/framework-bundle": "6.1.*",
+        "symplify/easy-coding-standard": "^11.4",
         "squizlabs/php_codesniffer": "^3.7.1",
-        "phpunit/phpunit": "^9.5.26",
+        "phpunit/phpunit": "^10.2",
         "symplify/rule-doc-generator": "^11.1",
         "cweagans/composer-patches": "^1.7",
         "php-parallel-lint/php-parallel-lint": "^1.3",
-        "phpstan/extension-installer": "^1.2",
-        "phpstan/phpstan": "^1.9",
-        "rector/rector": "*",
-        "symplify/easy-ci": "^11.1",
-        "symplify/phpstan-extensions": "^11.1"
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.10.19",
+        "rector/rector": "^0.17.1",
+        "symplify/easy-ci": "^11.2",
+        "symplify/phpstan-extensions": "^11.2"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,10 @@
+<?xml version="1.0"?>
 <phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     bootstrap="tests/bootstrap.php"
     colors="true"
-    verbose="true"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
+    cacheDirectory=".phpunit.cache"
 >
     <testsuite name="all">
         <directory>tests</directory>

diff --git a/rector.php b/rector.php
@@ -18,6 +18,7 @@
         SetList::PRIVATIZATION,
         SetList::EARLY_RETURN,
         PHPUnitSetList::PHPUNIT_CODE_QUALITY,
+        PHPUnitSetList::PHPUNIT_100,
     ]);
 
     $rectorConfig->paths([

diff --git a/tests/Fixer/Annotation/RemovePHPStormAnnotationFixer/RemovePHPStormAnnotationFixerTest.php b/tests/Fixer/Annotation/RemovePHPStormAnnotationFixer/RemovePHPStormAnnotationFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\Annotation\RemovePHPStormAnnotationFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class RemovePHPStormAnnotationFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/tests/Fixer/ArrayNotation/ArrayListItemNewlineFixer/ArrayListItemNewlineFixerTest.php b/tests/Fixer/ArrayNotation/ArrayListItemNewlineFixer/ArrayListItemNewlineFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\ArrayListItemNewlineFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class ArrayListItemNewlineFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/...r/ArrayNotation/ArrayOpenerAndCloserNewlineFixer/ArrayOpenerAndCloserNewlineFixerTest.php b/...r/ArrayNotation/ArrayOpenerAndCloserNewlineFixer/ArrayOpenerAndCloserNewlineFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class ArrayOpenerAndCloserNewlineFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/...yNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTest.php b/...yNotation/StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\StandaloneLineInMultilineArrayFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class StandaloneLineInMultilineArrayFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/.../StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTestPhp80Test.php b/.../StandaloneLineInMultilineArrayFixer/StandaloneLineInMultilineArrayFixerTestPhp80Test.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\ArrayNotation\StandaloneLineInMultilineArrayFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class StandaloneLineInMultilineArrayFixerTestPhp80Test extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/FixturePhp80');
     }

diff --git a/...er/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php b/...er/Commenting/ParamReturnAndVarTagMalformsFixer/ParamReturnAndVarTagMalformsFixerTest.php
@@ -5,22 +5,21 @@
 namespace Symplify\CodingStandard\Tests\Fixer\Commenting\ParamReturnAndVarTagMalformsFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 /**
  * @mimic https://github.com/rectorphp/rector/pull/807/files
  */
 final class ParamReturnAndVarTagMalformsFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/...ixer/Commenting/RemoveUselessDefaultCommentFixer/RemoveUselessDefaultCommentFixerTest.php b/...ixer/Commenting/RemoveUselessDefaultCommentFixer/RemoveUselessDefaultCommentFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\Commenting\RemoveUselessDefaultCommentFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class RemoveUselessDefaultCommentFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/tests/Fixer/LineLength/LineLengthFixer/ArrayLineLengthFixerTest.php b/tests/Fixer/LineLength/LineLengthFixer/ArrayLineLengthFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class ArrayLineLengthFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/FixtureArray');
     }

diff --git a/tests/Fixer/LineLength/LineLengthFixer/ConfiguredLineLengthFixerTest.php b/tests/Fixer/LineLength/LineLengthFixer/ConfiguredLineLengthFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class ConfiguredLineLengthFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/FixtureConfigured');
     }

diff --git a/tests/Issues/Fixture/correct896.php.inc → ...thFixer/Fixture/skip_correct_file.php.inc b/tests/Issues/Fixture/correct896.php.inc → ...thFixer/Fixture/skip_correct_file.php.inc
diff --git a/tests/Fixer/LineLength/LineLengthFixer/LineLengthFixerTest.php b/tests/Fixer/LineLength/LineLengthFixer/LineLengthFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class LineLengthFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/tests/Fixer/Spacing/MethodChainingNewlineFixer/MethodChainingNewlineFixerTest.php b/tests/Fixer/Spacing/MethodChainingNewlineFixer/MethodChainingNewlineFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\Spacing\MethodChainingNewlineFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class MethodChainingNewlineFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/tests/Fixer/Spacing/SpaceAfterCommaHereNowDocFixer/SpaceAfterCommaHereNowDocFixerTest.php b/tests/Fixer/Spacing/SpaceAfterCommaHereNowDocFixer/SpaceAfterCommaHereNowDocFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\Spacing\SpaceAfterCommaHereNowDocFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class SpaceAfterCommaHereNowDocFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }

diff --git a/...oneLineConstructorParamFixer/StandaloneLineConstructorParamFixerContraindicationsTest.php b/...oneLineConstructorParamFixer/StandaloneLineConstructorParamFixerContraindicationsTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\Spacing\StandaloneLineConstructorParamFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class StandaloneLineConstructorParamFixerContraindicationsTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/FixtureContraindications');
     }

diff --git a/...r/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerTest.php b/...r/Spacing/StandaloneLineConstructorParamFixer/StandaloneLineConstructorParamFixerTest.php
@@ -5,19 +5,18 @@
 namespace Symplify\CodingStandard\Tests\Fixer\Spacing\StandaloneLineConstructorParamFixer;
 
 use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
 
 final class StandaloneLineConstructorParamFixerTest extends AbstractCheckerTestCase
 {
-    /**
-     * @dataProvider provideData()
-     */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
         return self::yieldFiles(__DIR__ . '/Fixture');
     }