Skip to content

Commit d1b8177

Browse files
garakgarak
authored
Merge pull request #1498 from garak/phpunit-attributes
migrate to phpunit attributes
2 parents beb9d9f + 48de9a3 commit d1b8177

30 files changed

+77
-137
lines changed

‎.php-cs-fixer.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
// see https://github.com/FriendsOfPHP/PHP-CS-Fixer
33

4-
$finder = PhpCsFixer\Finder::create()
4+
$finder = (new PhpCsFixer\Finder())
55
->in([__DIR__.'/src', __DIR__.'/tests'])
66
;
77

@@ -10,9 +10,8 @@
1010
->setRules([
1111
'@Symfony' => true,
1212
'@Symfony:risky' => true,
13-
'@PHP80Migration:risky' => true,
1413
'@PHP81Migration' => true,
15-
'@PHPUnit84Migration:risky' => true,
14+
'@PHPUnit100Migration:risky' => true,
1615
'declare_strict_types' => false,
1716
'native_function_invocation' => ['include' => ['@all']],
1817
'fopen_flags' => ['b_mode' => true],

‎tests/Command/MappingDebugClassCommandTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Command;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Symfony\Component\Console\Tester\CommandCompletionTester;
67
use Vich\TestBundle\Entity\Image;
78
use Vich\UploaderBundle\Command\MappingDebugClassCommand;
@@ -26,9 +27,7 @@ public function testUploadableClass(): void
2627
self::assertStringContainsString('Introspecting class', $output);
2728
}
2829

29-
/**
30-
* @dataProvider provideCompletionSuggestions
31-
*/
30+
#[DataProvider('provideCompletionSuggestions')]
3231
public function testComplete(array $input, array $expectedSuggestions): void
3332
{
3433
if (!\class_exists(CommandCompletionTester::class)) {

‎tests/Command/MappingDebugCommandTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Command;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Symfony\Component\Console\Tester\CommandCompletionTester;
67
use Vich\UploaderBundle\Command\MappingDebugCommand;
78
use Vich\UploaderBundle\Exception\MappingNotFoundException;
@@ -24,9 +25,7 @@ public function testExistentMapping(): void
2425
self::assertStringContainsString('Debug information for mapping image_mapping', $output);
2526
}
2627

27-
/**
28-
* @dataProvider provideCompletionSuggestions
29-
*/
28+
#[DataProvider('provideCompletionSuggestions')]
3029
public function testComplete(array $input, array $expectedSuggestions): void
3130
{
3231
if (!\class_exists(CommandCompletionTester::class)) {

‎tests/DependencyInjection/VichUploaderExtensionTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Doctrine\Common\Annotations\AnnotationReader;
66
use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
7+
use PHPUnit\Framework\Attributes\Group;
78
use Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension;
89
use Vich\UploaderBundle\DependencyInjection\VichUploaderExtension;
910
use Vich\UploaderBundle\Metadata\Driver\AttributeReader;
@@ -153,9 +154,7 @@ public function testFormThemeCorrectlyOverridden(): void
153154
);
154155
}
155156

156-
/**
157-
* @group legacy
158-
*/
157+
#[Group('legacy')]
159158
public function testMetadataAnnotation(): void
160159
{
161160
if (!\class_exists(AnnotationReader::class)) {

‎tests/Form/Type/VichFileTypeTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Form\Type;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Symfony\Component\Form\FormConfigInterface;
67
use Symfony\Component\Form\FormInterface;
78
use Symfony\Component\Form\FormView;
@@ -40,9 +41,7 @@ public function testEmptyDownloadLinkDoNotThrowsDeprecation(): void
4041
}
4142
}
4243

43-
/**
44-
* @dataProvider buildViewDataProvider
45-
*/
44+
#[DataProvider('buildViewDataProvider')]
4645
public function testBuildView(?Product $object, array $options, array $vars): void
4746
{
4847
$field = 'image';

‎tests/Form/Type/VichImageTypeTest.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
namespace Vich\UploaderBundle\Tests\Form\Type;
44

55
use Liip\ImagineBundle\Imagine\Cache\CacheManager;
6+
use PHPUnit\Framework\Attributes\DataProvider;
7+
use PHPUnit\Framework\Attributes\RequiresMethod;
68
use Symfony\Component\Form\FormConfigInterface;
79
use Symfony\Component\Form\FormInterface;
810
use Symfony\Component\Form\FormView;
@@ -143,11 +145,8 @@ public static function buildViewDataProvider(): array
143145
];
144146
}
145147

146-
/**
147-
* @dataProvider getLiipImagineBundleIntegrationData
148-
*
149-
* @requires function CacheManager::_construct
150-
*/
148+
#[DataProvider('getLiipImagineBundleIntegrationData')]
149+
#[RequiresMethod(CacheManager::class, '__construct')]
151150
public function testLiipImagineBundleIntegration(
152151
string $field,
153152
Product $object,

‎tests/Functional/UploadTest.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace Vich\UploaderBundle\Tests\Functional;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
6+
57
final class UploadTest extends WebTestCase
68
{
7-
/**
8-
* @dataProvider uploadTypeDataProvider
9-
*/
9+
#[DataProvider('uploadTypeDataProvider')]
1010
public function testFileIsUploadedWithFileType(string $uploadType, string $imageFieldName): void
1111
{
1212
if (\headers_sent()) {
@@ -49,9 +49,7 @@ public function testFileIsUploadedWithFileType(string $uploadType, string $image
4949
self::assertFileDoesNotExist($this->getUploadsDir($client).'/symfony_black_03.png', 'The file is deleted');
5050
}
5151

52-
/**
53-
* @dataProvider uploadTypeDataProvider
54-
*/
52+
#[DataProvider('uploadTypeDataProvider')]
5553
public function testFileIsUploadedWithImageType(string $uploadType, string $imageFieldName): void
5654
{
5755
if (\headers_sent()) {

‎tests/Handler/DownloadHandlerTest.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Handler;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use PHPUnit\Framework\MockObject\MockObject;
67
use Symfony\Component\HttpFoundation\StreamedResponse;
78
use Vich\TestBundle\Entity\Product;
@@ -51,9 +52,7 @@ public static function filenamesProvider(): array
5152
];
5253
}
5354

54-
/**
55-
* @dataProvider filenamesProvider
56-
*/
55+
#[DataProvider('filenamesProvider')]
5756
public function testDownloadObject(string $fileName, string $expectedFileName, ?string $expectedFallbackFilename): void
5857
{
5958
$file = $this->getUploadedFileMock();
@@ -90,9 +89,7 @@ public function testDownloadObject(string $fileName, string $expectedFileName, ?
9089
);
9190
}
9291

93-
/**
94-
* @dataProvider filenamesProvider
95-
*/
92+
#[DataProvider('filenamesProvider')]
9693
public function testDisplayObject(string $fileName, string $expectedFileName, ?string $expectedFallbackFilename): void
9794
{
9895
$file = $this->getUploadedFileMock();
@@ -129,9 +126,7 @@ public function testDisplayObject(string $fileName, string $expectedFileName, ?s
129126
);
130127
}
131128

132-
/**
133-
* @dataProvider filenamesProvider
134-
*/
129+
#[DataProvider('filenamesProvider')]
135130
public function testDownloadObjectWithoutFile(string $fileName, string $expectedFileName, ?string $expectedFallbackFilename): void
136131
{
137132
$this->mapping

‎tests/Handler/UploadHandlerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Handler;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use PHPUnit\Framework\MockObject\MockObject;
67
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
78
use Symfony\Component\HttpFoundation\File\Exception\CannotWriteFileException;
@@ -75,9 +76,7 @@ public function testUpload(): void
7576
$this->handler->upload($this->object, self::FILE_FIELD);
7677
}
7778

78-
/**
79-
* @dataProvider methodProvider
80-
*/
79+
#[DataProvider('methodProvider')]
8180
public function testAnExceptionIsThrownIfMappingIsntFound(string $method): void
8281
{
8382
$this->expectException(MappingNotFoundException::class);

‎tests/Mapping/PropertyMappingFactoryTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Vich\UploaderBundle\Tests\Mapping;
44

55
use Doctrine\Persistence\Proxy;
6+
use PHPUnit\Framework\Attributes\DataProvider;
67
use PHPUnit\Framework\MockObject\MockObject;
78
use Symfony\Component\DependencyInjection\ContainerInterface;
89
use Vich\UploaderBundle\Mapping\PropertyMappingFactory;
@@ -50,9 +51,8 @@ public function testFromObjectThrowsExceptionIfNotUploadable(): void
5051

5152
/**
5253
* Test the fromObject method with one uploadable field.
53-
*
54-
* @dataProvider fromObjectProvider
5554
*/
55+
#[DataProvider('fromObjectProvider')]
5656
public function testFromObjectOneField(object|array $object, ?string $givenClassName, string $expectedClassName): void
5757
{
5858
$mappings = [
@@ -252,9 +252,7 @@ public function testThrowsExceptionOnInvalidMappingName(): void
252252
$factory->fromObject(new DummyEntity());
253253
}
254254

255-
/**
256-
* @dataProvider fromFieldProvider
257-
*/
255+
#[DataProvider('fromFieldProvider')]
258256
public function testFromField(object|array $object, ?string $className, string $expectedClassName): void
259257
{
260258
$mappings = [

‎tests/Mapping/PropertyMappingTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Mapping;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Vich\TestBundle\Entity\Article;
67
use Vich\TestBundle\Naming\DummyNamer;
78
use Vich\UploaderBundle\Mapping\PropertyMapping;
@@ -36,9 +37,7 @@ public function testConfiguredMappingAccess(): void
3637
self::assertEquals('fileName', $prop->getFileNamePropertyName());
3738
}
3839

39-
/**
40-
* @dataProvider directoryProvider
41-
*/
40+
#[DataProvider('directoryProvider')]
4241
public function testDirectoryNamerIsCalled(string $dir, string $expectedDir): void
4342
{
4443
$object = new DummyEntity();

‎tests/Metadata/Driver/AnnotationDriverTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Doctrine\ORM\EntityManagerInterface;
88
use Doctrine\Persistence\ManagerRegistry;
99
use Metadata\ClassMetadata;
10+
use PHPUnit\Framework\Attributes\Group;
1011
use PHPUnit\Framework\MockObject\MockObject;
1112
use PHPUnit\Framework\TestCase;
1213
use Vich\TestBundle\Entity\Article;
@@ -16,12 +17,9 @@
1617
use Vich\UploaderBundle\Tests\DummyFile;
1718

1819
/**
19-
* AnnotationDriverTest.
20-
*
2120
* @author Kévin Gomez <contact@kevingomez.fr>
22-
*
23-
* @group legacy
2421
*/
22+
#[Group('legacy')]
2523
final class AnnotationDriverTest extends TestCase
2624
{
2725
private Connection|MockObject $connection;

‎tests/Metadata/Driver/FileDriverTestCase.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44

55
use Metadata\Driver\DriverInterface;
66
use Metadata\Driver\FileLocatorInterface;
7+
use PHPUnit\Framework\Attributes\DataProvider;
78
use PHPUnit\Framework\TestCase;
89
use Vich\TestBundle\Entity\Article;
910
use Vich\TestBundle\Entity\Product;
1011
use Vich\UploaderBundle\Metadata\ClassMetadata;
1112

1213
abstract class FileDriverTestCase extends TestCase
1314
{
14-
/**
15-
* @dataProvider classesProvider
16-
*/
15+
#[DataProvider('classesProvider')]
1716
public function testLoadMetadataForClass(string $class, string $file, array $expectedMetadata): void
1817
{
1918
$reflectionClass = new \ReflectionClass($class);

‎tests/Metadata/MetadataReaderTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Vich\UploaderBundle\Tests\Metadata;
44

55
use Metadata\AdvancedMetadataFactoryInterface;
6+
use PHPUnit\Framework\Attributes\DataProvider;
67
use PHPUnit\Framework\MockObject\MockObject;
78
use PHPUnit\Framework\TestCase;
89
use Vich\UploaderBundle\Metadata\MetadataReader;
@@ -112,9 +113,7 @@ public function testGetUploadableFieldsWithInheritance(): void
112113
self::assertSame(['bar', 'baz', 'foo'], $this->reader->getUploadableFields('SubClassName'));
113114
}
114115

115-
/**
116-
* @dataProvider fieldsMetadataProvider
117-
*/
116+
#[DataProvider('fieldsMetadataProvider')]
118117
public function testGetUploadableField(array $fields, ?string $expectedMetadata): void
119118
{
120119
$classMetadata = new \stdClass();

‎tests/Naming/Base64NamerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Naming;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Vich\UploaderBundle\Tests\DummyEntity;
67
use Vich\UploaderBundle\Tests\TestCase;
78

@@ -28,9 +29,7 @@ public static function fileDataProvider(): array
2829
];
2930
}
3031

31-
/**
32-
* @dataProvider fileDataProvider
33-
*/
32+
#[DataProvider('fileDataProvider')]
3433
public function testNameReturnsTheRightName(string $expectedFileName, string $extension, ?int $length): void
3534
{
3635
$file = $this->getUploadedFileMock();

‎tests/Naming/CurrentDateTimeDirectoryNamerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Naming;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
67
use Vich\UploaderBundle\Naming\CurrentDateTimeDirectoryNamer;
78
use Vich\UploaderBundle\Tests\DummyEntity;
@@ -24,9 +25,7 @@ public static function directoryNameDataProvider(): array
2425
];
2526
}
2627

27-
/**
28-
* @dataProvider directoryNameDataProvider
29-
*/
28+
#[DataProvider('directoryNameDataProvider')]
3029
public function testNameReturnsTheRightName(int $timestamp, ?string $dateTimeFormat, string $expectedName): void
3130
{
3231
\date_default_timezone_set('UTC');

‎tests/Naming/HashNamerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Naming;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Vich\UploaderBundle\Naming\HashNamer as BaseHashNamer;
67
use Vich\UploaderBundle\Tests\DummyEntity;
78
use Vich\UploaderBundle\Tests\TestCase;
@@ -29,9 +30,7 @@ public static function fileDataProvider(): array
2930
];
3031
}
3132

32-
/**
33-
* @dataProvider fileDataProvider
34-
*/
33+
#[DataProvider('fileDataProvider')]
3534
public function testNameReturnsTheRightName(string $expectedFileName, string $extension, string $algorithm, ?int $length): void
3635
{
3736
$file = $this->getUploadedFileMock();

‎tests/Naming/OrignameNamerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Vich\UploaderBundle\Tests\Naming;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Vich\UploaderBundle\Naming\OrignameNamer;
67
use Vich\UploaderBundle\Tests\TestCase;
78

@@ -22,9 +23,7 @@ public static function fileDataProvider(): array
2223
];
2324
}
2425

25-
/**
26-
* @dataProvider fileDataProvider
27-
*/
26+
#[DataProvider('fileDataProvider')]
2827
public function testNameReturnsAnUniqueName(string $name, string $ext, string $pattern, bool $transliterate): void
2928
{
3029
$file = $this->getUploadedFileMock();

0 commit comments

Comments
 (0)