Merge pull request #614 from deguif/phpunit-attributes

goetas · web-flow · commit 86d6932325f5 · 2025-02-09T17:27:02.000+01:00
Use phpunit attributes
diff --git a/Tests/DependencyInjection/Compiler/MountDumpersPassTest.php b/Tests/DependencyInjection/Compiler/MountDumpersPassTest.php
@@ -6,6 +6,7 @@
 
 use JMS\TranslationBundle\DependencyInjection\Compiler\MountDumpersPass;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
+use PHPUnit\Framework\Attributes\Test;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,9 +21,7 @@ protected function registerCompilerPass(ContainerBuilder $container): void
         $container->addCompilerPass(new MountDumpersPass());
     }
 
-    /**
-     * @test
-     */
+    #[Test()]
     public function ifCompilerPassCollectsServicesByArgumentTheseWillExist(): void
     {
         $collectingService = new Definition();
diff --git a/Tests/DependencyInjection/Compiler/MountExtractorsPassTest.php b/Tests/DependencyInjection/Compiler/MountExtractorsPassTest.php
@@ -6,6 +6,7 @@
 
 use JMS\TranslationBundle\DependencyInjection\Compiler\MountExtractorsPass;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
+use PHPUnit\Framework\Attributes\Test;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,9 +21,7 @@ protected function registerCompilerPass(ContainerBuilder $container): void
         $container->addCompilerPass(new MountExtractorsPass());
     }
 
-    /**
-     * @test
-     */
+    #[Test()]
     public function ifCompilerPassCollectsServicesByArgumentTheseWillExist(): void
     {
         $collectingService = new Definition();
diff --git a/Tests/DependencyInjection/Compiler/MountFileVisitorsPassTest.php b/Tests/DependencyInjection/Compiler/MountFileVisitorsPassTest.php
@@ -6,6 +6,7 @@
 
 use JMS\TranslationBundle\DependencyInjection\Compiler\MountFileVisitorsPass;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
+use PHPUnit\Framework\Attributes\Test;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,9 +21,7 @@ protected function registerCompilerPass(ContainerBuilder $container): void
         $container->addCompilerPass(new MountFileVisitorsPass());
     }
 
-    /**
-     * @test
-     */
+    #[Test()]
     public function ifCompilerPassCollectsServicesByArgumentTheseWillExist(): void
     {
         $collectingService = new Definition();
diff --git a/Tests/DependencyInjection/Compiler/MountLoadersPassTest.php b/Tests/DependencyInjection/Compiler/MountLoadersPassTest.php
@@ -6,6 +6,7 @@
 
 use JMS\TranslationBundle\DependencyInjection\Compiler\MountLoadersPass;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
+use PHPUnit\Framework\Attributes\Test;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,9 +21,7 @@ protected function registerCompilerPass(ContainerBuilder $container): void
         $container->addCompilerPass(new MountLoadersPass());
     }
 
-    /**
-     * @test
-     */
+    #[Test()]
     public function ifCompilerPassCollectsServicesByArgumentTheseWillExist(): void
     {
         $collectingService = new Definition();
diff --git a/Tests/DependencyInjection/JMSTranslationExtensionTest.php b/Tests/DependencyInjection/JMSTranslationExtensionTest.php
@@ -6,6 +6,7 @@
 
 use JMS\TranslationBundle\DependencyInjection\JMSTranslationExtension;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -19,19 +20,15 @@ protected function getContainerExtensions(): array
         ];
     }
 
-    /**
-     * @test
-     */
+    #[Test()]
     public function defaultParametersAfterLoading(): void
     {
         $this->load();
 
         $this->assertContainerBuilderHasParameter('jms_translation.source_language', 'en');
     }
 
-    /**
-     * @test
-     */
+    #[Test()]
     public function basicParametersAfterLoading(): void
     {
         $locales = ['en', 'fr', 'es'];
diff --git a/Tests/Functional/ServiceInstantiationTest.php b/Tests/Functional/ServiceInstantiationTest.php
@@ -7,6 +7,7 @@
 use JMS\TranslationBundle\Translation\ConfigFactory;
 use JMS\TranslationBundle\Translation\Updater;
 use JMS\TranslationBundle\Twig\TranslationExtension;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Make sure we instantiate services.
@@ -29,9 +30,7 @@ public static function provider(): array
         ];
     }
 
-    /**
-     * @dataProvider provider
-     */
+    #[DataProvider('provider')]
     public function testServiceExists(string $serviceId, string $class): void
     {
         $container = static::$kernel->getContainer();
diff --git a/Tests/Model/FileSourceTest.php b/Tests/Model/FileSourceTest.php
@@ -22,6 +22,7 @@
 
 use JMS\TranslationBundle\Model\FileSource;
 use JMS\TranslationBundle\Model\SourceInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class FileSourceTest extends TestCase
@@ -56,9 +57,7 @@ public function testGetColumnWhenSet(): void
         $this->assertEquals(2, $r->getColumn());
     }
 
-    /**
-     * @dataProvider getEqualityTests
-     */
+    #[DataProvider('getEqualityTests')]
     public function testEquals($r1, $r2, $expected): void
     {
         $this->assertSame($expected, $r1->equals($r2));
@@ -124,9 +123,7 @@ public function __toString(): string
         return $tests;
     }
 
-    /**
-     * @dataProvider getToStringTests
-     */
+    #[DataProvider('getToStringTests')]
     public function testToString(FileSource $r, string $expected): void
     {
         $this->assertEquals($expected, (string) $r);
diff --git a/Tests/Model/MessageCollectionTest.php b/Tests/Model/MessageCollectionTest.php
@@ -23,6 +23,7 @@
 use JMS\TranslationBundle\Model\FileSource;
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Model\MessageCollection;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\TestCase;
 
 class MessageCollectionTest extends TestCase
@@ -154,9 +155,7 @@ public function testAddChecksConsistency(): void
         $col->add($msg2);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
+    #[DoesNotPerformAssertions()]
     public function testAddChecksConsistencyButAllowsEmptyDescs(): void
     {
         $col = new MessageCollection();
@@ -220,9 +219,7 @@ public function testSetChecksConsistency(): void
         $col->set($msg2);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
+    #[DoesNotPerformAssertions()]
     public function testSetChecksConsistencyButAllowsEmptyDescs(): void
     {
         $col = new MessageCollection();
diff --git a/Tests/Translation/Extractor/File/FormExtractorTest.php b/Tests/Translation/Extractor/File/FormExtractorTest.php
@@ -23,12 +23,11 @@
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Model\MessageCatalogue;
 use JMS\TranslationBundle\Translation\Extractor\File\FormExtractor;
+use PHPUnit\Framework\Attributes\Group;
 
 class FormExtractorTest extends PhpFileExtractorTestCase
 {
-    /**
-     * @group placeholder
-     */
+    #[Group('placeholder')]
     public function testPlaceholderExtract(): void
     {
         $expected          = new MessageCatalogue();
@@ -62,9 +61,7 @@ public function testPlaceholderExtract(): void
         $this->assertEquals($expected, $this->extract('MyPlaceholderFormType.php'));
     }
 
-    /**
-     * @group testExtract
-     */
+    #[Group('testExtract')]
     public function testExtract(): void
     {
         $expected          = new MessageCatalogue();
diff --git a/Tests/Translation/FileSourceFactoryTest.php b/Tests/Translation/FileSourceFactoryTest.php
@@ -6,15 +6,12 @@
 
 use JMS\TranslationBundle\Translation\FileSourceFactory;
 use Nyholm\NSA;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class FileSourceFactoryTest extends TestCase
 {
-    /**
-     * Test many different path to make sure we find the relative one.
-     *
-     * @dataProvider pathProvider
-     */
+    #[DataProvider('pathProvider')]
     public function testGetRelativePath($root, $projectRoot, $file, $expected, $message = ''): void
     {
         $factory = new FileSourceFactory($root, $projectRoot);
diff --git a/Tests/Translation/Loader/XliffLoaderTest.php b/Tests/Translation/Loader/XliffLoaderTest.php
@@ -25,13 +25,12 @@
 use JMS\TranslationBundle\Model\MessageCatalogue;
 use JMS\TranslationBundle\Translation\Dumper\XliffDumper;
 use JMS\TranslationBundle\Translation\Loader\XliffLoader;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class XliffLoaderTest extends TestCase
 {
-    /**
-     * @dataProvider getTestFiles
-     */
+    #[DataProvider('getTestFiles')]
     public function testLoadIntegration(string $file): void
     {
         $loader    = new XliffLoader();

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`use JMS\TranslationBundle\DependencyInjection\JMSTranslationExtension;`
`8`	`8`	`use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;`
	`9`	`+use PHPUnit\Framework\Attributes\Test;`
`9`	`10`
`10`	`11`	`/**`
`11`	`12`	`* @author Tobias Nyholm <tobias.nyholm@gmail.com>`
`@@ -19,19 +20,15 @@ protected function getContainerExtensions(): array`
`19`	`20`	`];`
`20`	`21`	`}`
`21`	`22`
`22`		`- /**`
`23`		`- * @test`
`24`		`- */`
	`23`	`+ #[Test()]`
`25`	`24`	`public function defaultParametersAfterLoading(): void`
`26`	`25`	`{`
`27`	`26`	`$this->load();`
`28`	`27`
`29`	`28`	`$this->assertContainerBuilderHasParameter('jms_translation.source_language', 'en');`
`30`	`29`	`}`
`31`	`30`
`32`		`- /**`
`33`		`- * @test`
`34`		`- */`
	`31`	`+ #[Test()]`
`35`	`32`	`public function basicParametersAfterLoading(): void`
`36`	`33`	`{`
`37`	`34`	`$locales = ['en', 'fr', 'es'];`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`
`23`	`23`	`use JMS\TranslationBundle\Model\FileSource;`
`24`	`24`	`use JMS\TranslationBundle\Model\SourceInterface;`
	`25`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`25`	`26`	`use PHPUnit\Framework\TestCase;`
`26`	`27`
`27`	`28`	`class FileSourceTest extends TestCase`
`@@ -56,9 +57,7 @@ public function testGetColumnWhenSet(): void`
`56`	`57`	`$this->assertEquals(2, $r->getColumn());`
`57`	`58`	`}`
`58`	`59`
`59`		`- /**`
`60`		`- * @dataProvider getEqualityTests`
`61`		`- */`
	`60`	`+ #[DataProvider('getEqualityTests')]`
`62`	`61`	`public function testEquals($r1, $r2, $expected): void`
`63`	`62`	`{`
`64`	`63`	`$this->assertSame($expected, $r1->equals($r2));`
`@@ -124,9 +123,7 @@ public function __toString(): string`
`124`	`123`	`return $tests;`
`125`	`124`	`}`
`126`	`125`
`127`		`- /**`
`128`		`- * @dataProvider getToStringTests`
`129`		`- */`
	`126`	`+ #[DataProvider('getToStringTests')]`
`130`	`127`	`public function testToString(FileSource $r, string $expected): void`
`131`	`128`	`{`
`132`	`129`	`$this->assertEquals($expected, (string) $r);`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,11 @@`
`23`	`23`	`use JMS\TranslationBundle\Model\Message;`
`24`	`24`	`use JMS\TranslationBundle\Model\MessageCatalogue;`
`25`	`25`	`use JMS\TranslationBundle\Translation\Extractor\File\FormExtractor;`
	`26`	`+use PHPUnit\Framework\Attributes\Group;`
`26`	`27`
`27`	`28`	`class FormExtractorTest extends PhpFileExtractorTestCase`
`28`	`29`	`{`
`29`		`- /**`
`30`		`- * @group placeholder`
`31`		`- */`
	`30`	`+ #[Group('placeholder')]`
`32`	`31`	`public function testPlaceholderExtract(): void`
`33`	`32`	`{`
`34`	`33`	`$expected = new MessageCatalogue();`
`@@ -62,9 +61,7 @@ public function testPlaceholderExtract(): void`
`62`	`61`	`$this->assertEquals($expected, $this->extract('MyPlaceholderFormType.php'));`
`63`	`62`	`}`
`64`	`63`
`65`		`- /**`
`66`		`- * @group testExtract`
`67`		`- */`
	`64`	`+ #[Group('testExtract')]`
`68`	`65`	`public function testExtract(): void`
`69`	`66`	`{`
`70`	`67`	`$expected = new MessageCatalogue();`