minor symfony#48709 Use static methods inside data providers (OskarStark)

nicolas-grekas · nicolas-grekas · commit 4362f6e880e6 · 2022-12-22T11:31:08.000+01:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- Use static methods inside data providers | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a refs symfony#48668 follows * symfony#48625 Commits ------- 9a18048 Use static methods inside data providers
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceCheckerTest.php b/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceCheckerTest.php
@@ -51,7 +51,7 @@ public function testIsFresh(callable $mockContainer, $expected)
         $this->assertSame($expected, $this->resourceChecker->isFresh($this->resource, time()));
     }
 
-    public function isFreshProvider()
+    public static function isFreshProvider()
     {
         yield 'not fresh on missing parameter' => [function (MockObject $container) {
             $container->method('hasParameter')->with('locales')->willReturn(false);
@@ -62,11 +62,11 @@ public function isFreshProvider()
         }, false];
 
         yield 'fresh on every identical parameters' => [function (MockObject $container) {
-            $container->expects($this->exactly(2))->method('hasParameter')->willReturn(true);
-            $container->expects($this->exactly(2))->method('getParameter')
+            $container->expects(self::exactly(2))->method('hasParameter')->willReturn(true);
+            $container->expects(self::exactly(2))->method('getParameter')
                 ->withConsecutive(
-                    [$this->equalTo('locales')],
-                    [$this->equalTo('default_locale')]
+                    [self::equalTo('locales')],
+                    [self::equalTo('default_locale')]
                 )
                 ->willReturnMap([
                     ['locales', ['fr', 'en']],
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
@@ -22,7 +22,7 @@ abstract class AbstractCrawlerTest extends TestCase
 {
     use ExpectDeprecationTrait;
 
-    abstract public function getDoctype(): string;
+    abstract public static function getDoctype(): string;
 
     protected function createCrawler($node = null, string $uri = null, string $baseHref = null)
     {
diff --git a/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
@@ -13,7 +13,7 @@
 
 class Html5ParserCrawlerTest extends AbstractCrawlerTest
 {
-    public function getDoctype(): string
+    public static function getDoctype(): string
     {
         return '<!DOCTYPE html>';
     }
diff --git a/src/Symfony/Component/DomCrawler/Tests/NativeParserCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/NativeParserCrawlerTest.php
@@ -13,7 +13,7 @@
 
 class NativeParserCrawlerTest extends AbstractCrawlerTest
 {
-    public function getDoctype(): string
+    public static function getDoctype(): string
     {
         return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
     }
diff --git a/src/Symfony/Component/Finder/Tests/GitignoreTest.php b/src/Symfony/Component/Finder/Tests/GitignoreTest.php
@@ -55,7 +55,7 @@ public function testToRegex(array $gitignoreLines, array $matchingCases, array $
         }
     }
 
-    public function provider(): array
+    public static function provider(): array
     {
         $cases = [
             [
@@ -394,7 +394,7 @@ public function provider(): array
 
     public function providerExtended(): array
     {
-        $basicCases = $this->provider();
+        $basicCases = self::provider();
 
         $cases = [];
         foreach ($basicCases as $case) {
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/SizeRangeFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
@@ -41,7 +41,7 @@ public function getAcceptData()
         ];
 
         return [
-            [[new NumberComparator('< 1K'), new NumberComparator('> 0.5K')], $this->toAbsolute($lessThan1KGreaterThan05K)],
+            [[new NumberComparator('< 1K'), new NumberComparator('> 0.5K')], self::toAbsolute($lessThan1KGreaterThan05K)],
         ];
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
@@ -65,7 +65,7 @@ public function getNormalizedIniPostMaxSize(): string
         $this->request = null;
     }
 
-    public function methodExceptGetProvider()
+    public static function methodExceptGetProvider()
     {
         return [
             ['POST'],
@@ -79,7 +79,7 @@ public function methodProvider()
     {
         return array_merge([
             ['GET'],
-        ], $this->methodExceptGetProvider());
+        ], self::methodExceptGetProvider());
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -215,7 +215,7 @@ public function provideCompletionSuggestions(): iterable
 
         yield 'form_type' => [
             [''],
-            $this->getCoreTypes(),
+            self::getCoreTypes(),
         ];
 
         yield 'option for FQCN' => [
@@ -267,7 +267,7 @@ public function provideCompletionSuggestions(): iterable
         ];
     }
 
-    private function getCoreTypes(): array
+    private static function getCoreTypes(): array
     {
         $coreExtension = new CoreExtension();
         $loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -285,31 +285,31 @@ public function privateTaggedServicesProvider()
                 function (ContainerBuilder $container) {
                     $formTypes = $container->getDefinition('form.extension')->getArgument(0);
 
-                    $this->assertInstanceOf(Reference::class, $formTypes);
+                    self::assertInstanceOf(Reference::class, $formTypes);
 
                     $locator = $container->getDefinition((string) $formTypes);
                     $expectedLocatorMap = [
                         'stdClass' => new ServiceClosureArgument(new Reference('my.type')),
                     ];
 
-                    $this->assertInstanceOf(Definition::class, $locator);
-                    $this->assertEquals($expectedLocatorMap, $locator->getArgument(0));
+                    self::assertInstanceOf(Definition::class, $locator);
+                    self::assertEquals($expectedLocatorMap, $locator->getArgument(0));
                 },
             ],
             [
                 'my.type_extension',
                 Type1TypeExtension::class,
                 'form.type_extension',
                 function (ContainerBuilder $container) {
-                    $this->assertEquals(
+                    self::assertEquals(
                         ['Symfony\Component\Form\Extension\Core\Type\FormType' => new IteratorArgument([new Reference('my.type_extension')])],
                         $container->getDefinition('form.extension')->getArgument(1)
                     );
                 },
                 ['extended_type' => 'Symfony\Component\Form\Extension\Core\Type\FormType'],
             ],
             ['my.guesser', 'stdClass', 'form.type_guesser', function (ContainerBuilder $container) {
-                $this->assertEquals(new IteratorArgument([new Reference('my.guesser')]), $container->getDefinition('form.extension')->getArgument(2));
+                self::assertEquals(new IteratorArgument([new Reference('my.guesser')]), $container->getDefinition('form.extension')->getArgument(2));
             }],
         ];
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -37,7 +37,7 @@ protected function tearDown(): void
         $this->dateTimeWithoutSeconds = null;
     }
 
-    public function allProvider()
+    public static function allProvider()
     {
         return [
             ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'],
@@ -51,12 +51,12 @@ public function allProvider()
 
     public function transformProvider()
     {
-        return $this->allProvider();
+        return self::allProvider();
     }
 
     public function reverseTransformProvider()
     {
-        return array_merge($this->allProvider(), [
+        return array_merge(self::allProvider(), [
             // format without seconds, as appears in some browsers
             ['UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05Z'],
             ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05+08:00'],
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/CasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/CasterTest.php
@@ -22,7 +22,7 @@ class CasterTest extends TestCase
 {
     use VarDumperTestTrait;
 
-    private $referenceArray = [
+    private static $referenceArray = [
         'null' => null,
         'empty' => false,
         'public' => 'pub',
@@ -38,12 +38,12 @@ class CasterTest extends TestCase
     public function testFilter($filter, $expectedDiff, $listedProperties = null)
     {
         if (null === $listedProperties) {
-            $filteredArray = Caster::filter($this->referenceArray, $filter);
+            $filteredArray = Caster::filter(self::$referenceArray, $filter);
         } else {
-            $filteredArray = Caster::filter($this->referenceArray, $filter, $listedProperties);
+            $filteredArray = Caster::filter(self::$referenceArray, $filter, $listedProperties);
         }
 
-        $this->assertSame($expectedDiff, array_diff_assoc($this->referenceArray, $filteredArray));
+        $this->assertSame($expectedDiff, array_diff_assoc(self::$referenceArray, $filteredArray));
     }
 
     public function provideFilter()
@@ -126,7 +126,7 @@ public function provideFilter()
             ],
             [
                 Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_VERBOSE,
-                $this->referenceArray,
+                self::$referenceArray,
                 ['public', "\0*\0protected"],
             ],
             [

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ abstract class AbstractCrawlerTest extends TestCase`
`22`	`22`	`{`
`23`	`23`	`use ExpectDeprecationTrait;`
`24`	`24`
`25`		`- abstract public function getDoctype(): string;`
	`25`	`+ abstract public static function getDoctype(): string;`
`26`	`26`
`27`	`27`	`protected function createCrawler($node = null, string $uri = null, string $baseHref = null)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`class Html5ParserCrawlerTest extends AbstractCrawlerTest`
`15`	`15`	`{`
`16`		`- public function getDoctype(): string`
	`16`	`+ public static function getDoctype(): string`
`17`	`17`	`{`
`18`	`18`	`return '<!DOCTYPE html>';`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function testToRegex(array $gitignoreLines, array $matchingCases, array $`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function provider(): array`
	`58`	`+ public static function provider(): array`
`59`	`59`	`{`
`60`	`60`	`$cases = [`
`61`	`61`	`[`
`@@ -394,7 +394,7 @@ public function provider(): array`
`394`	`394`
`395`	`395`	`public function providerExtended(): array`
`396`	`396`	`{`
`397`		`- $basicCases = $this->provider();`
	`397`	`+ $basicCases = self::provider();`
`398`	`398`
`399`	`399`	`$cases = [];`
`400`	`400`	`foreach ($basicCases as $case) {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function getAcceptData()`
`41`	`41`	`];`
`42`	`42`
`43`	`43`	`return [`
`44`		`- [[new NumberComparator('< 1K'), new NumberComparator('> 0.5K')], $this->toAbsolute($lessThan1KGreaterThan05K)],`
	`44`	`+ [[new NumberComparator('< 1K'), new NumberComparator('> 0.5K')], self::toAbsolute($lessThan1KGreaterThan05K)],`
`45`	`45`	`];`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function getNormalizedIniPostMaxSize(): string`
`65`	`65`	`$this->request = null;`
`66`	`66`	`}`
`67`	`67`
`68`		`- public function methodExceptGetProvider()`
	`68`	`+ public static function methodExceptGetProvider()`
`69`	`69`	`{`
`70`	`70`	`return [`
`71`	`71`	`['POST'],`
`@@ -79,7 +79,7 @@ public function methodProvider()`
`79`	`79`	`{`
`80`	`80`	`return array_merge([`
`81`	`81`	`['GET'],`
`82`		`- ], $this->methodExceptGetProvider());`
	`82`	`+ ], self::methodExceptGetProvider());`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public function provideCompletionSuggestions(): iterable`
`215`	`215`
`216`	`216`	`yield 'form_type' => [`
`217`	`217`	`[''],`
`218`		`- $this->getCoreTypes(),`
	`218`	`+ self::getCoreTypes(),`
`219`	`219`	`];`
`220`	`220`
`221`	`221`	`yield 'option for FQCN' => [`
`@@ -267,7 +267,7 @@ public function provideCompletionSuggestions(): iterable`
`267`	`267`	`];`
`268`	`268`	`}`
`269`	`269`
`270`		`- private function getCoreTypes(): array`
	`270`	`+ private static function getCoreTypes(): array`
`271`	`271`	`{`
`272`	`272`	`$coreExtension = new CoreExtension();`
`273`	`273`	`$loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected function tearDown(): void`
`37`	`37`	`$this->dateTimeWithoutSeconds = null;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function allProvider()`
	`40`	`+ public static function allProvider()`
`41`	`41`	`{`
`42`	`42`	`return [`
`43`	`43`	`['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'],`
`@@ -51,12 +51,12 @@ public function allProvider()`
`51`	`51`
`52`	`52`	`public function transformProvider()`
`53`	`53`	`{`
`54`		`- return $this->allProvider();`
	`54`	`+ return self::allProvider();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public function reverseTransformProvider()`
`58`	`58`	`{`
`59`		`- return array_merge($this->allProvider(), [`
	`59`	`+ return array_merge(self::allProvider(), [`
`60`	`60`	`// format without seconds, as appears in some browsers`
`61`	`61`	`['UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05Z'],`
`62`	`62`	`['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05+08:00'],`