Merge pull request #1498 from garak/phpunit-attributes

migrate to phpunit attributes

Author: garak

.php-cs-fixer.php

@@ -1,7 +1,7 @@
 <?php
 // see https://github.com/FriendsOfPHP/PHP-CS-Fixer
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     ->in([__DIR__.'/src', __DIR__.'/tests'])
 ;
 
@@ -10,9 +10,8 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHP80Migration:risky' => true,
         '@PHP81Migration' => true,
-        '@PHPUnit84Migration:risky' => true,
+        '@PHPUnit100Migration:risky' => true,
         'declare_strict_types' => false,
         'native_function_invocation' => ['include' => ['@all']],
         'fopen_flags' => ['b_mode' => true],

tests/Command/MappingDebugClassCommandTest.php

@@ -2,6 +2,7 @@
 
 namespace Vich\UploaderBundle\Tests\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
 use Vich\TestBundle\Entity\Image;
 use Vich\UploaderBundle\Command\MappingDebugClassCommand;
@@ -26,9 +27,7 @@ public function testUploadableClass(): void
         self::assertStringContainsString('Introspecting class', $output);
     }
 
-    /**
-     * @dataProvider provideCompletionSuggestions
-     */
+    #[DataProvider('provideCompletionSuggestions')]
     public function testComplete(array $input, array $expectedSuggestions): void
     {
         if (!\class_exists(CommandCompletionTester::class)) {

tests/Command/MappingDebugCommandTest.php

@@ -2,6 +2,7 @@
 
 namespace Vich\UploaderBundle\Tests\Command;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
 use Vich\UploaderBundle\Command\MappingDebugCommand;
 use Vich\UploaderBundle\Exception\MappingNotFoundException;
@@ -24,9 +25,7 @@ public function testExistentMapping(): void
         self::assertStringContainsString('Debug information for mapping image_mapping', $output);
     }
 
-    /**
-     * @dataProvider provideCompletionSuggestions
-     */
+    #[DataProvider('provideCompletionSuggestions')]
     public function testComplete(array $input, array $expectedSuggestions): void
     {
         if (!\class_exists(CommandCompletionTester::class)) {

tests/DependencyInjection/VichUploaderExtensionTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
+use PHPUnit\Framework\Attributes\Group;
 use Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension;
 use Vich\UploaderBundle\DependencyInjection\VichUploaderExtension;
 use Vich\UploaderBundle\Metadata\Driver\AttributeReader;
@@ -153,9 +154,7 @@ public function testFormThemeCorrectlyOverridden(): void
         );
     }
 
-    /**
-     * @group legacy
-     */
+    #[Group('legacy')]
     public function testMetadataAnnotation(): void
     {
         if (!\class_exists(AnnotationReader::class)) {

tests/Form/Type/VichFileTypeTest.php

@@ -2,6 +2,7 @@
 
 namespace Vich\UploaderBundle\Tests\Form\Type;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\Form\FormConfigInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
@@ -40,9 +41,7 @@ public function testEmptyDownloadLinkDoNotThrowsDeprecation(): void
         }
     }
 
-    /**
-     * @dataProvider buildViewDataProvider
-     */
+    #[DataProvider('buildViewDataProvider')]
     public function testBuildView(?Product $object, array $options, array $vars): void
     {
         $field = 'image';

tests/Form/Type/VichImageTypeTest.php

@@ -3,6 +3,8 @@
 namespace Vich\UploaderBundle\Tests\Form\Type;
 
 use Liip\ImagineBundle\Imagine\Cache\CacheManager;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresMethod;
 use Symfony\Component\Form\FormConfigInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
@@ -143,11 +145,8 @@ public static function buildViewDataProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider getLiipImagineBundleIntegrationData
-     *
-     * @requires function CacheManager::_construct
-     */
+    #[DataProvider('getLiipImagineBundleIntegrationData')]
+    #[RequiresMethod(CacheManager::class, '__construct')]
     public function testLiipImagineBundleIntegration(
         string $field,
         Product $object,

tests/Functional/UploadTest.php

@@ -2,11 +2,11 @@
 
 namespace Vich\UploaderBundle\Tests\Functional;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+
 final class UploadTest extends WebTestCase
 {
-    /**
-     * @dataProvider uploadTypeDataProvider
-     */
+    #[DataProvider('uploadTypeDataProvider')]
     public function testFileIsUploadedWithFileType(string $uploadType, string $imageFieldName): void
     {
         if (\headers_sent()) {
@@ -49,9 +49,7 @@ public function testFileIsUploadedWithFileType(string $uploadType, string $image
         self::assertFileDoesNotExist($this->getUploadsDir($client).'/symfony_black_03.png', 'The file is deleted');
     }
 
-    /**
-     * @dataProvider uploadTypeDataProvider
-     */
+    #[DataProvider('uploadTypeDataProvider')]
     public function testFileIsUploadedWithImageType(string $uploadType, string $imageFieldName): void
     {
         if (\headers_sent()) {

tests/Handler/DownloadHandlerTest.php

@@ -2,6 +2,7 @@
 
 namespace Vich\UploaderBundle\Tests\Handler;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Vich\TestBundle\Entity\Product;
@@ -51,9 +52,7 @@ public static function filenamesProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider filenamesProvider
-     */
+    #[DataProvider('filenamesProvider')]
     public function testDownloadObject(string $fileName, string $expectedFileName, ?string $expectedFallbackFilename): void
     {
         $file = $this->getUploadedFileMock();
@@ -90,9 +89,7 @@ public function testDownloadObject(string $fileName, string $expectedFileName, ?
         );
     }
 
-    /**
-     * @dataProvider filenamesProvider
-     */
+    #[DataProvider('filenamesProvider')]
     public function testDisplayObject(string $fileName, string $expectedFileName, ?string $expectedFallbackFilename): void
     {
         $file = $this->getUploadedFileMock();
@@ -129,9 +126,7 @@ public function testDisplayObject(string $fileName, string $expectedFileName, ?s
         );
     }
 
-    /**
-     * @dataProvider filenamesProvider
-     */
+    #[DataProvider('filenamesProvider')]
     public function testDownloadObjectWithoutFile(string $fileName, string $expectedFileName, ?string $expectedFallbackFilename): void
     {
         $this->mapping

tests/Handler/UploadHandlerTest.php

@@ -2,6 +2,7 @@
 
 namespace Vich\UploaderBundle\Tests\Handler;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\File\Exception\CannotWriteFileException;
@@ -75,9 +76,7 @@ public function testUpload(): void
         $this->handler->upload($this->object, self::FILE_FIELD);
     }
 
-    /**
-     * @dataProvider methodProvider
-     */
+    #[DataProvider('methodProvider')]
     public function testAnExceptionIsThrownIfMappingIsntFound(string $method): void
     {
         $this->expectException(MappingNotFoundException::class);

tests/Mapping/PropertyMappingFactoryTest.php

@@ -3,6 +3,7 @@
 namespace Vich\UploaderBundle\Tests\Mapping;
 
 use Doctrine\Persistence\Proxy;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Vich\UploaderBundle\Mapping\PropertyMappingFactory;
@@ -50,9 +51,8 @@ public function testFromObjectThrowsExceptionIfNotUploadable(): void
 
     /**
      * Test the fromObject method with one uploadable field.
-     *
-     * @dataProvider fromObjectProvider
      */
+    #[DataProvider('fromObjectProvider')]
     public function testFromObjectOneField(object|array $object, ?string $givenClassName, string $expectedClassName): void
     {
         $mappings = [
@@ -252,9 +252,7 @@ public function testThrowsExceptionOnInvalidMappingName(): void
         $factory->fromObject(new DummyEntity());
     }
 
-    /**
-     * @dataProvider fromFieldProvider
-     */
+    #[DataProvider('fromFieldProvider')]
     public function testFromField(object|array $object, ?string $className, string $expectedClassName): void
     {
         $mappings = [