PHPUnit 10 (#927)

spiral · Apr 25, 2023 · d6f2f13 · d6f2f13
1 parent 85d49c1
commit d6f2f13
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 48 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "nette/php-generator": "^4.0.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.20",
+        "phpunit/phpunit": "^10.1",
         "mockery/mockery": "^1.5",
         "psr/container": "^1.1|^2.0",
         "vimeo/psalm": "^5.9"

diff --git a/tests/BaseWithElementsTest.php → tests/BaseWithElementsTestCase.php b/tests/BaseWithElementsTest.php → tests/BaseWithElementsTestCase.php
@@ -11,11 +11,11 @@
 use Spiral\Reactor\Aggregator\Interfaces;
 use Spiral\Reactor\Aggregator\Traits;
 
-abstract class BaseWithElementsTest extends TestCase
+abstract class BaseWithElementsTestCase extends TestCase
 {
-    public function classesDataProvider(): \Traversable
+    public static function classesDataProvider(): \Traversable
     {
-        $testedClass = $this->getTestedClass();
+        $testedClass = static::getTestedClass();
 
         $withoutClasses = new $testedClass('a');
         $withoutClasses->addInterface('b');
@@ -42,9 +42,9 @@ public function classesDataProvider(): \Traversable
         yield [$withOtherElements, new Classes(['d' => $d])];
     }
 
-    public function interfacesDataProvider(): \Traversable
+    public static function interfacesDataProvider(): \Traversable
     {
-        $testedClass = $this->getTestedClass();
+        $testedClass = static::getTestedClass();
 
         $withoutInterfaces = new $testedClass('a');
         $withoutInterfaces->addClass('b');
@@ -71,9 +71,9 @@ public function interfacesDataProvider(): \Traversable
         yield [$withOtherElements, new Interfaces(['d' => $d])];
     }
 
-    public function traitsDataProvider(): \Traversable
+    public static function traitsDataProvider(): \Traversable
     {
-        $testedClass = $this->getTestedClass();
+        $testedClass = static::getTestedClass();
 
         $withoutTraits = new $testedClass('a');
         $withoutTraits->addClass('b');
@@ -100,9 +100,9 @@ public function traitsDataProvider(): \Traversable
         yield [$withOtherElements, new Traits(['d' => $d])];
     }
 
-    public function enumsDataProvider(): \Traversable
+    public static function enumsDataProvider(): \Traversable
     {
-        $testedClass = $this->getTestedClass();
+        $testedClass = static::getTestedClass();
 
         $withoutEnums = new $testedClass('a');
         $withoutEnums->addClass('b');
@@ -129,9 +129,9 @@ public function enumsDataProvider(): \Traversable
         yield [$withOtherElements, new Enums(['d' => $d])];
     }
 
-    public function elementsDataProvider(): \Traversable
+    public static function elementsDataProvider(): \Traversable
     {
-        $testedClass = $this->getTestedClass();
+        $testedClass = static::getTestedClass();
 
         $class = new $testedClass('a');
         $a = $class->addClass('a');
@@ -164,5 +164,5 @@ public function elementsDataProvider(): \Traversable
         ])];
     }
 
-    abstract protected function getTestedClass(): string;
+    abstract protected static function getTestedClass(): string;
 }
diff --git a/tests/FileDeclarationTest.php b/tests/FileDeclarationTest.php
@@ -5,6 +5,7 @@
 namespace Spiral\Tests\Reactor;
 
 use Nette\PhpGenerator\PhpFile;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Spiral\Reactor\Aggregator\Classes;
 use Spiral\Reactor\Aggregator\Elements;
 use Spiral\Reactor\Aggregator\Enums;
@@ -13,7 +14,7 @@
 use Spiral\Reactor\ClassDeclaration;
 use Spiral\Reactor\FileDeclaration;
 
-final class FileDeclarationTest extends BaseWithElementsTest
+final class FileDeclarationTest extends BaseWithElementsTestCase
 {
     public function testFromCode(): void
     {
@@ -158,47 +159,37 @@ public function testGetElement(): void
         $this->assertInstanceOf(PhpFile::class, $element);
     }
 
-    /**
-     * @dataProvider classesDataProvider
-     */
+    #[DataProvider('classesDataProvider')]
     public function testGetClasses(FileDeclaration $file, Classes $expected): void
     {
         $this->assertEquals($file->getClasses(), $expected);
     }
 
-    /**
-     * @dataProvider interfacesDataProvider
-     */
+    #[DataProvider('interfacesDataProvider')]
     public function testGetInterfaces(FileDeclaration $file, Interfaces $expected): void
     {
         $this->assertEquals($file->getInterfaces(), $expected);
     }
 
-    /**
-     * @dataProvider traitsDataProvider
-     */
+    #[DataProvider('traitsDataProvider')]
     public function testGetTraits(FileDeclaration $file, Traits $expected): void
     {
         $this->assertEquals($file->getTraits(), $expected);
     }
 
-    /**
-     * @dataProvider enumsDataProvider
-     */
+    #[DataProvider('enumsDataProvider')]
     public function testGetEnums(FileDeclaration $file, Enums $expected): void
     {
         $this->assertEquals($file->getEnums(), $expected);
     }
 
-    /**
-     * @dataProvider elementsDataProvider
-     */
+    #[DataProvider('elementsDataProvider')]
     public function testGetElements(FileDeclaration $file, Elements $expected): void
     {
         $this->assertEquals($file->getElements(), $expected);
     }
 
-    protected function getTestedClass(): string
+    protected static function getTestedClass(): string
     {
         return FileDeclaration::class;
     }

diff --git a/tests/Partial/PhpNamespaceTest.php b/tests/Partial/PhpNamespaceTest.php
@@ -5,16 +5,17 @@
 namespace Spiral\Tests\Reactor\Partial;
 
 use Nette\PhpGenerator\PhpNamespace as NettePhpNamespace;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Spiral\Reactor\Aggregator\Classes;
 use Spiral\Reactor\Aggregator\Elements;
 use Spiral\Reactor\Aggregator\Enums;
 use Spiral\Reactor\Aggregator\Interfaces;
 use Spiral\Reactor\Aggregator\Traits;
 use Spiral\Reactor\FileDeclaration;
 use Spiral\Reactor\Partial\PhpNamespace;
-use Spiral\Tests\Reactor\BaseWithElementsTest;
+use Spiral\Tests\Reactor\BaseWithElementsTestCase;
 
-final class PhpNamespaceTest extends BaseWithElementsTest
+final class PhpNamespaceTest extends BaseWithElementsTestCase
 {
     public function testGetName(): void
     {
@@ -194,47 +195,37 @@ public function testGetElement(): void
         $this->assertSame('Foo\\Bar', $element->getName());
     }
 
-    /**
-     * @dataProvider classesDataProvider
-     */
+    #[DataProvider('classesDataProvider')]
     public function testGetClasses(PhpNamespace $namespace, Classes $expected): void
     {
         $this->assertEquals($namespace->getClasses(), $expected);
     }
 
-    /**
-     * @dataProvider interfacesDataProvider
-     */
+    #[DataProvider('interfacesDataProvider')]
     public function testGetInterfaces(PhpNamespace $namespace, Interfaces $expected): void
     {
         $this->assertEquals($namespace->getInterfaces(), $expected);
     }
 
-    /**
-     * @dataProvider traitsDataProvider
-     */
+    #[DataProvider('traitsDataProvider')]
     public function testGetTraits(PhpNamespace $namespace, Traits $expected): void
     {
         $this->assertEquals($namespace->getTraits(), $expected);
     }
 
-    /**
-     * @dataProvider enumsDataProvider
-     */
+    #[DataProvider('enumsDataProvider')]
     public function testGetEnums(PhpNamespace $namespace, Enums $expected): void
     {
         $this->assertEquals($namespace->getEnums(), $expected);
     }
 
-    /**
-     * @dataProvider elementsDataProvider
-     */
+    #[DataProvider('elementsDataProvider')]
     public function testGetElements(PhpNamespace $namespace, Elements $expected): void
     {
         $this->assertEquals($namespace->getElements(), $expected);
     }
 
-    protected function getTestedClass(): string
+    protected static function getTestedClass(): string
     {
         return PhpNamespace::class;
     }