Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit be82f9222b2b · 2022-12-22T18:54:54.000+01:00
* 6.0:
  Fix integration test gha
  Update RedisTrait.php
  Use static methods inside data providers
  [VarExporter] Fix exporting classes with __unserialize() but not __serialize()
  [Validator] Fix IBAN format for Tunisia and Mauritania
  [Workflow] Allow spaces in place names so the PUML dump doesn't break
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -48,7 +48,7 @@ jobs:
         ports:
           - 16379:6379
       redis-cluster:
-        image: grokzen/redis-cluster:5.0.4
+        image: grokzen/redis-cluster:latest
         ports:
           - 7000:7000
           - 7001:7001
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -202,7 +202,7 @@ public static function createConnection(string $dsn, array $options = []): \Redi
                         break;
                     }
 
-                    $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
+                    $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::OPT_NULL_MULTIBULK_AS_NULL') ? [$params['auth'] ?? ''] : []);
 
                     if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                         [$host, $port] = $address;
@@ -214,7 +214,10 @@ public static function createConnection(string $dsn, array $options = []): \Redi
                 }
 
                 try {
-                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);
+                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [[
+                        'auth' => $params['auth'] ?? '',
+                        'stream' => $params['ssl'] ?? null,
+                    ]] : []);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     try {
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
@@ -19,7 +19,7 @@
 
 abstract class AbstractCrawlerTest extends TestCase
 {
-    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
@@ -206,7 +206,7 @@ public function provideCompletionSuggestions(): iterable
 
         yield 'form_type' => [
             [''],
-            $this->getCoreTypes(),
+            self::getCoreTypes(),
         ];
 
         yield 'option for FQCN' => [
@@ -258,7 +258,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/Validator/Constraints/IbanValidator.php b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
@@ -102,7 +102,7 @@ class IbanValidator extends ConstraintValidator
         'MK' => 'MK\d{2}\d{3}[\dA-Z]{10}\d{2}', // Macedonia, Former Yugoslav Republic of
         'ML' => 'ML\d{2}[A-Z]{1}\d{23}', // Mali
         'MQ' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Martinique
-        'MR' => 'MR13\d{5}\d{5}\d{11}\d{2}', // Mauritania
+        'MR' => 'MR\d{2}\d{5}\d{5}\d{11}\d{2}', // Mauritania
         'MT' => 'MT\d{2}[A-Z]{4}\d{5}[\dA-Z]{18}', // Malta
         'MU' => 'MU\d{2}[A-Z]{4}\d{2}\d{2}\d{12}\d{3}[A-Z]{3}', // Mauritius
         'MZ' => 'MZ\d{2}\d{21}', // Mozambique
@@ -127,7 +127,7 @@ class IbanValidator extends ConstraintValidator
         'SN' => 'SN\d{2}[A-Z]{1}\d{23}', // Senegal
         'TF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // French Southern Territories
         'TL' => 'TL\d{2}\d{3}\d{14}\d{2}', // Timor-Leste
-        'TN' => 'TN59\d{2}\d{3}\d{13}\d{2}', // Tunisia
+        'TN' => 'TN\d{2}\d{2}\d{3}\d{13}\d{2}', // Tunisia
         'TR' => 'TR\d{2}\d{5}[\dA-Z]{1}[\dA-Z]{16}', // Turkey
         'UA' => 'UA\d{2}\d{6}[\dA-Z]{19}', // Ukraine
         'VA' => 'VA\d{2}\d{3}\d{15}', // Vatican City State
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"],
             ],
             [
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -151,6 +151,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                 }
                 if (null !== $sleep) {
                     if (!isset($sleep[$n]) || ($i && $c !== $class)) {
+                        unset($arrayValue[$name]);
                         continue;
                     }
                     $sleep[$n] = false;
@@ -166,6 +167,9 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     }
                 }
             }
+            if (method_exists($class, '__unserialize')) {
+                $properties = $arrayValue;
+            }
 
             prepare_value:
             $objectsPool[$value] = [$id = \count($objectsPool)];
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/__unserialize-but-no-__serialize.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/__unserialize-but-no-__serialize.php
@@ -0,0 +1,15 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = [
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\__UnserializeButNo__Serialize'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\__UnserializeButNo__Serialize')),
+    ],
+    null,
+    [],
+    $o[0],
+    [
+        [
+            'foo' => 'ccc',
+        ],
+    ]
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -233,6 +233,8 @@ public function provideExport()
 
         yield ['php74-serializable', new Php74Serializable()];
 
+        yield ['__unserialize-but-no-__serialize', new __UnserializeButNo__Serialize()];
+
         yield ['unit-enum', [FooUnitEnum::Bar], true];
         yield ['readonly', new FooReadonly('k', 'v')];
     }
@@ -437,3 +439,18 @@ public function unserialize($ser)
 class ArrayObject extends \ArrayObject
 {
 }
+
+class __UnserializeButNo__Serialize
+{
+    public $foo;
+
+    public function __construct()
+    {
+        $this->foo = 'ccc';
+    }
+
+    public function __unserialize(array $data): void
+    {
+        $this->foo = $data['foo'];
+    }
+}
diff --git a/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php b/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Workflow\Dumper;
 
-use InvalidArgumentException;
 use Symfony\Component\Workflow\Definition;
 use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Metadata\MetadataStoreInterface;
@@ -57,7 +56,7 @@ class PlantUmlDumper implements DumperInterface
     public function __construct(string $transitionType)
     {
         if (!\in_array($transitionType, self::TRANSITION_TYPES, true)) {
-            throw new InvalidArgumentException("Transition type '$transitionType' does not exist.");
+            throw new \InvalidArgumentException("Transition type '$transitionType' does not exist.");
         }
         $this->transitionType = $transitionType;
     }
@@ -209,9 +208,7 @@ private function getState(string $place, Definition $definition, Marking $markin
 
         $description = $workflowMetadata->getMetadata('description', $place);
         if (null !== $description) {
-            $output .= ' as '.$place.
-                \PHP_EOL.
-                $place.' : '.$description;
+            $output .= \PHP_EOL.$placeEscaped.' : '.$description;
         }
 
         return $output;
diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php
@@ -12,9 +12,12 @@
 namespace Symfony\Component\Workflow\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Workflow\Definition;
 use Symfony\Component\Workflow\Dumper\PlantUmlDumper;
 use Symfony\Component\Workflow\Marking;
+use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
 use Symfony\Component\Workflow\Tests\WorkflowBuilderTrait;
+use Symfony\Component\Workflow\Transition;
 
 class PlantUmlDumperTest extends TestCase
 {
@@ -63,6 +66,34 @@ public function provideStateMachineDefinitionWithoutMarking()
         yield [$this->createComplexStateMachineDefinition(), $marking, 'complex-state-machine-marking', 'SimpleDiagram'];
     }
 
+    public function testDumpWorkflowWithSpacesInTheStateNamesAndDescription()
+    {
+        $dumper = new PlantUmlDumper(PlantUmlDumper::WORKFLOW_TRANSITION);
+
+        // The graph looks like:
+        //
+        // +---------+  t 1   +----------+  |
+        // | place a | -----> | place b  |  |
+        // +---------+        +----------+  |
+        $places = ['place a', 'place b'];
+
+        $transitions = [];
+        $transition = new Transition('t 1', 'place a', 'place b');
+        $transitions[] = $transition;
+
+        $placesMetadata = [];
+        $placesMetadata['place a'] = [
+            'description' => 'My custom place description',
+        ];
+        $inMemoryMetadataStore = new InMemoryMetadataStore([], $placesMetadata);
+        $definition = new Definition($places, $transitions, null, $inMemoryMetadataStore);
+
+        $dump = $dumper->dump($definition, null, ['title' => 'SimpleDiagram']);
+        $dump = str_replace(\PHP_EOL, "\n", $dump.\PHP_EOL);
+        $file = $this->getFixturePath('simple-workflow-with-spaces', PlantUmlDumper::WORKFLOW_TRANSITION);
+        $this->assertStringEqualsFile($file, $dump);
+    }
+
     private function getFixturePath($name, $transitionType)
     {
         return __DIR__.'/../fixtures/puml/'.$transitionType.'/'.$name.'.puml';
diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking.puml
diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking.puml
diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-with-spaces.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-with-spaces.puml

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`abstract class AbstractCrawlerTest extends TestCase`
`21`	`21`	`{`
`22`		`- abstract public function getDoctype(): string;`
	`22`	`+ abstract public static function getDoctype(): string;`
`23`	`23`
`24`	`24`	`protected function createCrawler($node = null, string $uri = null, string $baseHref = null)`
`25`	`25`	`{`
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
`@@ -206,7 +206,7 @@ public function provideCompletionSuggestions(): iterable`
`206`	`206`
`207`	`207`	`yield 'form_type' => [`
`208`	`208`	`[''],`
`209`		`- $this->getCoreTypes(),`
	`209`	`+ self::getCoreTypes(),`
`210`	`210`	`];`
`211`	`211`
`212`	`212`	`yield 'option for FQCN' => [`
`@@ -258,7 +258,7 @@ public function provideCompletionSuggestions(): iterable`
`258`	`258`	`];`
`259`	`259`	`}`
`260`	`260`
`261`		`- private function getCoreTypes(): array`
	`261`	`+ private static function getCoreTypes(): array`
`262`	`262`	`{`
`263`	`263`	`$coreExtension = new CoreExtension();`
`264`	`264`	`$loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');`