Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 35cb5045e15b · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/ArgumentResolver/EntityValueResolverTest.php b/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -187,7 +187,7 @@ public function testUsedProperIdentifier()
         $this->assertSame([null], $resolver->resolve($request, $argument));
     }
 
-    public function idsProvider(): iterable
+    public static function idsProvider(): iterable
     {
         yield [1];
         yield [0];
diff --git a/Tests/DataCollector/DoctrineDataCollectorTest.php b/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -134,7 +134,7 @@ public function testSerialization($param, array $types, $expected)
         $this->assertTrue($collectedQueries['default'][0]['runnable']);
     }
 
-    public function paramProvider(): array
+    public static function paramProvider(): array
     {
         return [
             ['some value', [], 'some value'],
diff --git a/Tests/DataCollector/DoctrineDataCollectorWithDebugStackTest.php b/Tests/DataCollector/DoctrineDataCollectorWithDebugStackTest.php
@@ -107,7 +107,7 @@ public function testSerialization($param, array $types, $expected, $explainable,
         $this->assertSame($runnable, $collectedQueries['default'][0]['runnable']);
     }
 
-    public function paramProvider(): array
+    public static function paramProvider(): array
     {
         return [
             ['some value', [], 'some value', true],
diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -83,7 +83,7 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
         $method->invoke($this->extension, $emConfigs, $bundles);
     }
 
-    public function getAutomappingData()
+    public static function getAutomappingData()
     {
         return [
             [
@@ -194,7 +194,7 @@ public function testMappingTypeDetection()
         $this->assertSame($mappingType, 'attribute');
     }
 
-    public function providerBasicDrivers()
+    public static function providerBasicDrivers()
     {
         return [
             ['doctrine.orm.cache.apc.class',       ['type' => 'apc']],
@@ -273,7 +273,7 @@ public function testUnrecognizedCacheDriverException()
         $this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
     }
 
-    public function providerBundles()
+    public static function providerBundles()
     {
         yield ['AnnotationsBundle', 'annotation', '/Entity'];
         yield ['AnnotationsOneLineBundle', 'annotation', '/Entity'];
diff --git a/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
@@ -255,15 +255,15 @@ public function testEmbeddedIdentifierName()
         $loader->getEntitiesByIds('id.value', [1, '', 2, 3, 'foo']);
     }
 
-    public function provideGuidEntityClasses()
+    public static function provideGuidEntityClasses()
     {
         return [
             ['Symfony\Bridge\Doctrine\Tests\Fixtures\GuidIdEntity'],
             ['Symfony\Bridge\Doctrine\Tests\Fixtures\UuidIdEntity'],
         ];
     }
 
-    public function provideUidEntityClasses()
+    public static function provideUidEntityClasses()
     {
         return [
             ['Symfony\Bridge\Doctrine\Tests\Fixtures\UuidIdEntity'],
diff --git a/Tests/Form/Type/EntityTypeTest.php b/Tests/Form/Type/EntityTypeTest.php
@@ -158,7 +158,7 @@ public function testChoiceTranslationDomainIsDisabledByDefault($expanded)
         }
     }
 
-    public function choiceTranslationDomainProvider()
+    public static function choiceTranslationDomainProvider()
     {
         return [
             [false],
diff --git a/Tests/Logger/DbalLoggerTest.php b/Tests/Logger/DbalLoggerTest.php
@@ -43,7 +43,7 @@ public function testLog($sql, $params, $logParams)
         $dbalLogger->startQuery($sql, $params);
     }
 
-    public function getLogFixtures()
+    public static function getLogFixtures()
     {
         return [
             ['SQL', null, []],
diff --git a/Tests/Middleware/Debug/MiddlewareTest.php b/Tests/Middleware/Debug/MiddlewareTest.php
@@ -78,7 +78,7 @@ private function getResourceFromString(string $str)
         return $res;
     }
 
-    public function provideExecuteMethod(): array
+    public static function provideExecuteMethod(): array
     {
         return [
             'executeStatement' => [
@@ -168,7 +168,7 @@ public function testWithParamBound(callable $executeMethod)
         $this->assertGreaterThan(0, $debug[1]['executionMS']);
     }
 
-    public function provideEndTransactionMethod(): array
+    public static function provideEndTransactionMethod(): array
     {
         return [
             'commit' => [static fn (Connection $conn) => $conn->commit(), '"COMMIT"'],
@@ -208,7 +208,7 @@ public function testTransaction(callable $endTransactionMethod, string $expected
         $this->assertGreaterThan(0, $debug[6]['executionMS']);
     }
 
-    public function provideExecuteAndEndTransactionMethods(): array
+    public static function provideExecuteAndEndTransactionMethods(): array
     {
         return [
             'commit and exec' => [
diff --git a/Tests/PropertyInfo/DoctrineExtractorTest.php b/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -135,7 +135,7 @@ public function testExtractEnum()
         $this->assertNull($this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));
     }
 
-    public function typesProvider()
+    public static function typesProvider()
     {
         $provider = [
             ['id', [new Type(Type::BUILTIN_TYPE_INT)]],
diff --git a/Tests/Types/UlidTypeTest.php b/Tests/Types/UlidTypeTest.php
@@ -140,7 +140,7 @@ public function testGetGuidTypeDeclarationSQL(AbstractPlatform $platform, string
         $this->assertEquals($expectedDeclaration, $this->type->getSqlDeclaration(['length' => 36], $platform));
     }
 
-    public function provideSqlDeclarations(): array
+    public static function provideSqlDeclarations(): array
     {
         return [
             [new PostgreSQLPlatform(), 'UUID'],
diff --git a/Tests/Types/UuidTypeTest.php b/Tests/Types/UuidTypeTest.php
@@ -152,7 +152,7 @@ public function testGetGuidTypeDeclarationSQL(AbstractPlatform $platform, string
         $this->assertEquals($expectedDeclaration, $this->type->getSqlDeclaration(['length' => 36], $platform));
     }
 
-    public function provideSqlDeclarations(): array
+    public static function provideSqlDeclarations(): array
     {
         return [
             [new PostgreSQLPlatform(), 'UUID'],
diff --git a/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -186,7 +186,7 @@ public function testValidateUniqueness(UniqueEntity $constraint)
             ->assertRaised();
     }
 
-    public function provideUniquenessConstraints(): iterable
+    public static function provideUniquenessConstraints(): iterable
     {
         yield 'Doctrine style' => [new UniqueEntity([
             'message' => 'myMessage',
@@ -219,7 +219,7 @@ public function testValidateCustomErrorPath(UniqueEntity $constraint)
             ->assertRaised();
     }
 
-    public function provideConstraintsWithCustomErrorPath(): iterable
+    public static function provideConstraintsWithCustomErrorPath(): iterable
     {
         yield 'Doctrine style' => [new UniqueEntity([
             'message' => 'myMessage',
@@ -278,7 +278,7 @@ public function testValidateUniquenessWithIgnoreNullDisabled(UniqueEntity $const
             ->assertRaised();
     }
 
-    public function provideConstraintsWithIgnoreNullDisabled(): iterable
+    public static function provideConstraintsWithIgnoreNullDisabled(): iterable
     {
         yield 'Doctrine style' => [new UniqueEntity([
             'message' => 'myMessage',
@@ -325,7 +325,7 @@ public function testNoValidationIfFirstFieldIsNullAndNullValuesAreIgnored(Unique
         $this->assertNoViolation();
     }
 
-    public function provideConstraintsWithIgnoreNullEnabled(): iterable
+    public static function provideConstraintsWithIgnoreNullEnabled(): iterable
     {
         yield 'Doctrine style' => [new UniqueEntity([
             'message' => 'myMessage',
@@ -424,7 +424,7 @@ function () use ($entity) {
         $this->assertNoViolation();
     }
 
-    public function provideConstraintsWithCustomRepositoryMethod(): iterable
+    public static function provideConstraintsWithCustomRepositoryMethod(): iterable
     {
         yield 'Doctrine style' => [new UniqueEntity([
             'message' => 'myMessage',
@@ -463,7 +463,7 @@ public function testValidateResultTypes($entity1, $result)
         $this->assertNoViolation();
     }
 
-    public function resultTypesProvider()
+    public static function resultTypesProvider()
     {
         $entity = new SingleIntIdEntity(1, 'foo');
 
@@ -876,7 +876,7 @@ public function testValueCanBeNull()
         $this->assertNoViolation();
     }
 
-    public function resultWithEmptyIterator(): array
+    public static function resultWithEmptyIterator(): array
     {
         $entity = new SingleIntIdEntity(1, 'foo');
 
diff --git a/Tests/Validator/DoctrineLoaderTest.php b/Tests/Validator/DoctrineLoaderTest.php
@@ -198,7 +198,7 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp
         $this->assertSame($expected, $doctrineLoader->loadClassMetadata($classMetadata));
     }
 
-    public function regexpProvider()
+    public static function regexpProvider()
     {
         return [
             [false, null],

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public function testUsedProperIdentifier()`
`187`	`187`	`$this->assertSame([null], $resolver->resolve($request, $argument));`
`188`	`188`	`}`
`189`	`189`
`190`		`- public function idsProvider(): iterable`
	`190`	`+ public static function idsProvider(): iterable`
`191`	`191`	`{`
`192`	`192`	`yield [1];`
`193`	`193`	`yield [0];`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public function testSerialization($param, array $types, $expected)`
`134`	`134`	`$this->assertTrue($collectedQueries['default'][0]['runnable']);`
`135`	`135`	`}`
`136`	`136`
`137`		`- public function paramProvider(): array`
	`137`	`+ public static function paramProvider(): array`
`138`	`138`	`{`
`139`	`139`	`return [`
`140`	`140`	`['some value', [], 'some value'],`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function testSerialization($param, array $types, $expected, $explainable,`
`107`	`107`	`$this->assertSame($runnable, $collectedQueries['default'][0]['runnable']);`
`108`	`108`	`}`
`109`	`109`
`110`		`- public function paramProvider(): array`
	`110`	`+ public static function paramProvider(): array`
`111`	`111`	`{`
`112`	`112`	`return [`
`113`	`113`	`['some value', [], 'some value', true],`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()`
`83`	`83`	`$method->invoke($this->extension, $emConfigs, $bundles);`
`84`	`84`	`}`
`85`	`85`
`86`		`- public function getAutomappingData()`
	`86`	`+ public static function getAutomappingData()`
`87`	`87`	`{`
`88`	`88`	`return [`
`89`	`89`	`[`
`@@ -194,7 +194,7 @@ public function testMappingTypeDetection()`
`194`	`194`	`$this->assertSame($mappingType, 'attribute');`
`195`	`195`	`}`
`196`	`196`
`197`		`- public function providerBasicDrivers()`
	`197`	`+ public static function providerBasicDrivers()`
`198`	`198`	`{`
`199`	`199`	`return [`
`200`	`200`	`['doctrine.orm.cache.apc.class', ['type' => 'apc']],`
`@@ -273,7 +273,7 @@ public function testUnrecognizedCacheDriverException()`
`273`	`273`	`$this->invokeLoadCacheDriver($objectManager, $container, $cacheName);`
`274`	`274`	`}`
`275`	`275`
`276`		`- public function providerBundles()`
	`276`	`+ public static function providerBundles()`
`277`	`277`	`{`
`278`	`278`	`yield ['AnnotationsBundle', 'annotation', '/Entity'];`
`279`	`279`	`yield ['AnnotationsOneLineBundle', 'annotation', '/Entity'];`
Original file line number	Diff line number	Diff line change
`@@ -255,15 +255,15 @@ public function testEmbeddedIdentifierName()`
`255`	`255`	`$loader->getEntitiesByIds('id.value', [1, '', 2, 3, 'foo']);`
`256`	`256`	`}`
`257`	`257`
`258`		`- public function provideGuidEntityClasses()`
	`258`	`+ public static function provideGuidEntityClasses()`
`259`	`259`	`{`
`260`	`260`	`return [`
`261`	`261`	`['Symfony\Bridge\Doctrine\Tests\Fixtures\GuidIdEntity'],`
`262`	`262`	`['Symfony\Bridge\Doctrine\Tests\Fixtures\UuidIdEntity'],`
`263`	`263`	`];`
`264`	`264`	`}`
`265`	`265`
`266`		`- public function provideUidEntityClasses()`
	`266`	`+ public static function provideUidEntityClasses()`
`267`	`267`	`{`
`268`	`268`	`return [`
`269`	`269`	`['Symfony\Bridge\Doctrine\Tests\Fixtures\UuidIdEntity'],`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function testChoiceTranslationDomainIsDisabledByDefault($expanded)`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`- public function choiceTranslationDomainProvider()`
	`161`	`+ public static function choiceTranslationDomainProvider()`
`162`	`162`	`{`
`163`	`163`	`return [`
`164`	`164`	`[false],`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testLog($sql, $params, $logParams)`
`43`	`43`	`$dbalLogger->startQuery($sql, $params);`
`44`	`44`	`}`
`45`	`45`
`46`		`- public function getLogFixtures()`
	`46`	`+ public static function getLogFixtures()`
`47`	`47`	`{`
`48`	`48`	`return [`
`49`	`49`	`['SQL', null, []],`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private function getResourceFromString(string $str)`
`78`	`78`	`return $res;`
`79`	`79`	`}`
`80`	`80`
`81`		`- public function provideExecuteMethod(): array`
	`81`	`+ public static function provideExecuteMethod(): array`
`82`	`82`	`{`
`83`	`83`	`return [`
`84`	`84`	`'executeStatement' => [`
`@@ -168,7 +168,7 @@ public function testWithParamBound(callable $executeMethod)`
`168`	`168`	`$this->assertGreaterThan(0, $debug[1]['executionMS']);`
`169`	`169`	`}`
`170`	`170`
`171`		`- public function provideEndTransactionMethod(): array`
	`171`	`+ public static function provideEndTransactionMethod(): array`
`172`	`172`	`{`
`173`	`173`	`return [`
`174`	`174`	`'commit' => [static fn (Connection $conn) => $conn->commit(), '"COMMIT"'],`
`@@ -208,7 +208,7 @@ public function testTransaction(callable $endTransactionMethod, string $expected`
`208`	`208`	`$this->assertGreaterThan(0, $debug[6]['executionMS']);`
`209`	`209`	`}`
`210`	`210`
`211`		`- public function provideExecuteAndEndTransactionMethods(): array`
	`211`	`+ public static function provideExecuteAndEndTransactionMethods(): array`
`212`	`212`	`{`
`213`	`213`	`return [`
`214`	`214`	`'commit and exec' => [`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function testExtractEnum()`
`135`	`135`	`$this->assertNull($this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));`
`136`	`136`	`}`
`137`	`137`
`138`		`- public function typesProvider()`
	`138`	`+ public static function typesProvider()`
`139`	`139`	`{`
`140`	`140`	`$provider = [`
`141`	`141`	`['id', [new Type(Type::BUILTIN_TYPE_INT)]],`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public function testGetGuidTypeDeclarationSQL(AbstractPlatform $platform, string`
`140`	`140`	`$this->assertEquals($expectedDeclaration, $this->type->getSqlDeclaration(['length' => 36], $platform));`
`141`	`141`	`}`
`142`	`142`
`143`		`- public function provideSqlDeclarations(): array`
	`143`	`+ public static function provideSqlDeclarations(): array`
`144`	`144`	`{`
`145`	`145`	`return [`
`146`	`146`	`[new PostgreSQLPlatform(), 'UUID'],`