Merge branch '5.4' into 6.2

* 5.4: Migrate to `static` data providers using `rector/rector`
symfony · Feb 14, 2023 · 35cb504 · 35cb504
2 parents c232a91 + d0ec59b
commit 35cb504
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
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],