Skip to content

Commit 117c2f9

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.4' into 8.0
* 7.4: replace PHPUnit annotations with attributes
2 parents 5a6be6a + 6df1a43 commit 117c2f9

File tree

1,029 files changed

+4555
-8363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,029 files changed

+4555
-8363
lines changed

‎.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
'/s',
4848
]),
4949
],
50+
'php_unit_attributes' => true,
5051
])
5152
->setRiskyAllowed(true)
5253
->setFinder(

‎src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Doctrine\Persistence\Mapping\ClassMetadata;
1717
use Doctrine\Persistence\ObjectManager;
1818
use Doctrine\Persistence\ObjectRepository;
19+
use PHPUnit\Framework\Attributes\DataProvider;
1920
use PHPUnit\Framework\MockObject\MockObject;
2021
use PHPUnit\Framework\TestCase;
2122
use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver;
@@ -101,9 +102,7 @@ public function testResolveWithStripNulls()
101102
$this->assertSame([], $resolver->resolve($request, $argument));
102103
}
103104

104-
/**
105-
* @dataProvider idsProvider
106-
*/
105+
#[DataProvider('idsProvider')]
107106
public function testResolveWithId(string|int $id)
108107
{
109108
$manager = $this->createMock(ObjectManager::class);
@@ -129,9 +128,7 @@ public function testResolveWithId(string|int $id)
129128
$this->assertSame([$object], $resolver->resolve($request, $argument));
130129
}
131130

132-
/**
133-
* @dataProvider idsProvider
134-
*/
131+
#[DataProvider('idsProvider')]
135132
public function testResolveWithIdAndTypeAlias(string|int $id)
136133
{
137134
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();

‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Doctrine\DBAL\ParameterType;
1616
use Doctrine\DBAL\Platforms\MySQLPlatform;
1717
use Doctrine\Persistence\ManagerRegistry;
18+
use PHPUnit\Framework\Attributes\DataProvider;
1819
use PHPUnit\Framework\TestCase;
1920
use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector;
2021
use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
@@ -148,9 +149,7 @@ public function testReset()
148149
$this->assertEquals([], $c->getQueries());
149150
}
150151

151-
/**
152-
* @dataProvider paramProvider
153-
*/
152+
#[DataProvider('paramProvider')]
154153
public function testCollectQueries($param, $types, $expected)
155154
{
156155
$queries = [
@@ -199,9 +198,7 @@ public function testCollectQueryWithNoParams()
199198
$this->assertTrue($collectedQueries['default'][1]['runnable']);
200199
}
201200

202-
/**
203-
* @dataProvider paramProvider
204-
*/
201+
#[DataProvider('paramProvider')]
205202
public function testSerialization($param, array $types, $expected)
206203
{
207204
$queries = [

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

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

1212
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\MockObject\MockObject;
1516
use PHPUnit\Framework\TestCase;
1617
use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
@@ -145,9 +146,7 @@ public static function getAutomappingData()
145146
];
146147
}
147148

148-
/**
149-
* @dataProvider getAutomappingData
150-
*/
149+
#[DataProvider('getAutomappingData')]
151150
public function testFixManagersAutoMappings(array $originalEm1, array $originalEm2, array $expectedEm1, array $expectedEm2)
152151
{
153152
$emConfigs = [
@@ -187,9 +186,7 @@ public static function providerBasicDrivers(): array
187186
];
188187
}
189188

190-
/**
191-
* @dataProvider providerBasicDrivers
192-
*/
189+
#[DataProvider('providerBasicDrivers')]
193190
public function testLoadBasicCacheDriver(string $class, array $config, array $expectedCalls = [])
194191
{
195192
$container = $this->createContainer();
@@ -270,9 +267,7 @@ public static function providerBundles(): iterable
270267
yield ['NewXmlBundle', 'xml', '/config/doctrine'];
271268
}
272269

273-
/**
274-
* @dataProvider providerBundles
275-
*/
270+
#[DataProvider('providerBundles')]
276271
public function testBundleAutoMapping(string $bundle, string $expectedType, string $dirSuffix)
277272
{
278273
$bundleDir = __DIR__.'/../Fixtures/Bundles/'.$bundle;

‎src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Doctrine\ORM\AbstractQuery;
1818
use Doctrine\ORM\Query;
1919
use Doctrine\ORM\QueryBuilder;
20+
use PHPUnit\Framework\Attributes\DataProvider;
2021
use PHPUnit\Framework\MockObject\MockObject;
2122
use PHPUnit\Framework\TestCase;
2223
use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
@@ -111,9 +112,7 @@ public function testFilterNonIntegerValues()
111112
$loader->getEntitiesByIds('id', [1, '', 2, 3, 'foo', '9223372036854775808']);
112113
}
113114

114-
/**
115-
* @dataProvider provideGuidEntityClasses
116-
*/
115+
#[DataProvider('provideGuidEntityClasses')]
117116
public function testFilterEmptyUuids(string $entityClass)
118117
{
119118
$em = DoctrineTestHelper::createTestEntityManager();
@@ -145,9 +144,7 @@ public function testFilterEmptyUuids(string $entityClass)
145144
$loader->getEntitiesByIds('id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', '', 'b98e8e11-2897-44df-ad24-d2627eb7f499']);
146145
}
147146

148-
/**
149-
* @dataProvider provideUidEntityClasses
150-
*/
147+
#[DataProvider('provideUidEntityClasses')]
151148
public function testFilterUid(string $entityClass)
152149
{
153150
if (Type::hasType('uuid')) {
@@ -188,9 +185,7 @@ public function testFilterUid(string $entityClass)
188185
$loader->getEntitiesByIds('id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', '', 'b98e8e11-2897-44df-ad24-d2627eb7f499']);
189186
}
190187

191-
/**
192-
* @dataProvider provideUidEntityClasses
193-
*/
188+
#[DataProvider('provideUidEntityClasses')]
194189
public function testUidThrowProperException(string $entityClass)
195190
{
196191
if (Type::hasType('uuid')) {

‎src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Doctrine\ORM\Mapping\ManyToOneAssociationMapping;
1818
use Doctrine\Persistence\ManagerRegistry;
1919
use Doctrine\Persistence\ObjectManager;
20+
use PHPUnit\Framework\Attributes\DataProvider;
2021
use PHPUnit\Framework\TestCase;
2122
use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
2223
use Symfony\Component\Form\Guess\Guess;
@@ -25,9 +26,7 @@
2526

2627
class DoctrineOrmTypeGuesserTest extends TestCase
2728
{
28-
/**
29-
* @dataProvider requiredType
30-
*/
29+
#[DataProvider('requiredType')]
3130
public function testTypeGuesser(string $type, $expected)
3231
{
3332
$classMetadata = $this->createMock(ClassMetadata::class);

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Doctrine\ORM\EntityManager;
1515
use Doctrine\ORM\Tools\SchemaTool;
1616
use Doctrine\Persistence\ManagerRegistry;
17+
use PHPUnit\Framework\Attributes\Group;
1718
use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
1819
use Symfony\Bridge\Doctrine\Tests\DoctrineTestHelper;
1920
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
@@ -81,9 +82,8 @@ protected function setUp(): void
8182
/**
8283
* This test case is realistic in collection forms where each
8384
* row contains the same entity field.
84-
*
85-
* @group benchmark
8685
*/
86+
#[Group('benchmark')]
8787
public function testCollapsedEntityField()
8888
{
8989
$this->setMaxRunningTime(1);
@@ -98,9 +98,7 @@ public function testCollapsedEntityField()
9898
}
9999
}
100100

101-
/**
102-
* @group benchmark
103-
*/
101+
#[Group('benchmark')]
104102
public function testCollapsedEntityFieldWithChoices()
105103
{
106104
$choices = $this->em->createQuery('SELECT c FROM '.self::ENTITY_CLASS.' c')->getResult();
@@ -117,9 +115,7 @@ public function testCollapsedEntityFieldWithChoices()
117115
}
118116
}
119117

120-
/**
121-
* @group benchmark
122-
*/
118+
#[Group('benchmark')]
123119
public function testCollapsedEntityFieldWithPreferredChoices()
124120
{
125121
$choices = $this->em->createQuery('SELECT c FROM '.self::ENTITY_CLASS.' c')->getResult();

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Doctrine\ORM\EntityRepository;
1717
use Doctrine\ORM\Tools\SchemaTool;
1818
use Doctrine\Persistence\ManagerRegistry;
19+
use PHPUnit\Framework\Attributes\DataProvider;
1920
use PHPUnit\Framework\MockObject\MockObject;
2021
use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
2122
use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
@@ -118,9 +119,7 @@ public function testInvalidClassOption()
118119
]);
119120
}
120121

121-
/**
122-
* @dataProvider choiceTranslationDomainProvider
123-
*/
122+
#[DataProvider('choiceTranslationDomainProvider')]
124123
public function testChoiceTranslationDomainIsDisabledByDefault($expanded)
125124
{
126125
$entity1 = new SingleIntIdEntity(1, 'Foo');

‎src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

1414
use Doctrine\Persistence\ObjectManager;
15+
use PHPUnit\Framework\Attributes\DataProvider;
1516
use PHPUnit\Framework\TestCase;
1617
use Symfony\Bridge\Doctrine\Tests\Fixtures\DummyManager;
1718
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -49,9 +50,7 @@ public function testResetService()
4950
$this->assertFalse(isset($foo->bar));
5051
}
5152

52-
/**
53-
* @dataProvider provideResetServiceWithNativeLazyObjectsCases
54-
*/
53+
#[DataProvider('provideResetServiceWithNativeLazyObjectsCases')]
5554
public function testResetServiceWithNativeLazyObjects(string $class)
5655
{
5756
$container = new $class();

‎src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
use Doctrine\DBAL\Statement;
2020
use Doctrine\DBAL\Types\Types;
2121
use Doctrine\ORM\ORMSetup;
22+
use PHPUnit\Framework\Attributes\DataProvider;
23+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
2224
use PHPUnit\Framework\TestCase;
2325
use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
2426
use Symfony\Bridge\Doctrine\Middleware\Debug\Middleware;
2527
use Symfony\Bridge\PhpUnit\ClockMock;
2628
use Symfony\Component\Stopwatch\Stopwatch;
2729

28-
/**
29-
* @requires extension pdo_sqlite
30-
*/
30+
#[RequiresPhpExtension('pdo_sqlite')]
3131
class MiddlewareTest extends TestCase
3232
{
3333
private DebugDataHolder $debugDataHolder;
@@ -87,9 +87,7 @@ public static function provideExecuteMethod(): array
8787
];
8888
}
8989

90-
/**
91-
* @dataProvider provideExecuteMethod
92-
*/
90+
#[DataProvider('provideExecuteMethod')]
9391
public function testWithoutBinding(callable $executeMethod)
9492
{
9593
$this->init();
@@ -104,9 +102,7 @@ public function testWithoutBinding(callable $executeMethod)
104102
$this->assertGreaterThan(0, $debug[1]['executionMS']);
105103
}
106104

107-
/**
108-
* @dataProvider provideExecuteMethod
109-
*/
105+
#[DataProvider('provideExecuteMethod')]
110106
public function testWithValueBound(callable $executeMethod)
111107
{
112108
$this->init();
@@ -134,9 +130,7 @@ public function testWithValueBound(callable $executeMethod)
134130
$this->assertGreaterThan(0, $debug[1]['executionMS']);
135131
}
136132

137-
/**
138-
* @dataProvider provideExecuteMethod
139-
*/
133+
#[DataProvider('provideExecuteMethod')]
140134
public function testWithParamBound(callable $executeMethod)
141135
{
142136
$this->init();
@@ -173,9 +167,7 @@ public static function provideEndTransactionMethod(): array
173167
];
174168
}
175169

176-
/**
177-
* @dataProvider provideEndTransactionMethod
178-
*/
170+
#[DataProvider('provideEndTransactionMethod')]
179171
public function testTransaction(callable $endTransactionMethod, string $expectedEndTransactionDebug)
180172
{
181173
$this->init();
@@ -227,9 +219,7 @@ public static function provideExecuteAndEndTransactionMethods(): array
227219
];
228220
}
229221

230-
/**
231-
* @dataProvider provideExecuteAndEndTransactionMethods
232-
*/
222+
#[DataProvider('provideExecuteAndEndTransactionMethods')]
233223
public function testGlobalDoctrineDuration(callable $sqlMethod, callable $endTransactionMethod)
234224
{
235225
$this->init();
@@ -253,9 +243,7 @@ public function testGlobalDoctrineDuration(callable $sqlMethod, callable $endTra
253243
$this->assertCount(4, $this->stopwatch->getEvent('doctrine')->getPeriods());
254244
}
255245

256-
/**
257-
* @dataProvider provideExecuteAndEndTransactionMethods
258-
*/
246+
#[DataProvider('provideExecuteAndEndTransactionMethods')]
259247
public function testWithoutStopwatch(callable $sqlMethod, callable $endTransactionMethod)
260248
{
261249
$this->init(false);

0 commit comments

Comments
 (0)