Skip to content

Commit 3a676e1

Browse files
Merge branch '6.2' into 6.3
* 6.2: 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 [VarExporter] Generate proxies for static abstract methods [SecurityBundle] Prevent RuntimeException "Impossible to access an attribute ("security_enabled") on a null variable."
2 parents a173f98 + 6efa6f8 commit 3a676e1

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Tests/AbstractRequestHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function getNormalizedIniPostMaxSize(): string
6565
$this->request = null;
6666
}
6767

68-
public function methodExceptGetProvider()
68+
public static function methodExceptGetProvider()
6969
{
7070
return [
7171
['POST'],
@@ -79,7 +79,7 @@ public function methodProvider()
7979
{
8080
return array_merge([
8181
['GET'],
82-
], $this->methodExceptGetProvider());
82+
], self::methodExceptGetProvider());
8383
}
8484

8585
/**

Tests/Command/DebugCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public function provideCompletionSuggestions(): iterable
206206

207207
yield 'form_type' => [
208208
[''],
209-
$this->getCoreTypes(),
209+
self::getCoreTypes(),
210210
];
211211

212212
yield 'option for FQCN' => [
@@ -258,7 +258,7 @@ public function provideCompletionSuggestions(): iterable
258258
];
259259
}
260260

261-
private function getCoreTypes(): array
261+
private static function getCoreTypes(): array
262262
{
263263
$coreExtension = new CoreExtension();
264264
$loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');

Tests/DependencyInjection/FormPassTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,31 +285,31 @@ public function privateTaggedServicesProvider()
285285
function (ContainerBuilder $container) {
286286
$formTypes = $container->getDefinition('form.extension')->getArgument(0);
287287

288-
$this->assertInstanceOf(Reference::class, $formTypes);
288+
self::assertInstanceOf(Reference::class, $formTypes);
289289

290290
$locator = $container->getDefinition((string) $formTypes);
291291
$expectedLocatorMap = [
292292
'stdClass' => new ServiceClosureArgument(new Reference('my.type')),
293293
];
294294

295-
$this->assertInstanceOf(Definition::class, $locator);
296-
$this->assertEquals($expectedLocatorMap, $locator->getArgument(0));
295+
self::assertInstanceOf(Definition::class, $locator);
296+
self::assertEquals($expectedLocatorMap, $locator->getArgument(0));
297297
},
298298
],
299299
[
300300
'my.type_extension',
301301
Type1TypeExtension::class,
302302
'form.type_extension',
303303
function (ContainerBuilder $container) {
304-
$this->assertEquals(
304+
self::assertEquals(
305305
['Symfony\Component\Form\Extension\Core\Type\FormType' => new IteratorArgument([new Reference('my.type_extension')])],
306306
$container->getDefinition('form.extension')->getArgument(1)
307307
);
308308
},
309309
['extended_type' => 'Symfony\Component\Form\Extension\Core\Type\FormType'],
310310
],
311311
['my.guesser', 'stdClass', 'form.type_guesser', function (ContainerBuilder $container) {
312-
$this->assertEquals(new IteratorArgument([new Reference('my.guesser')]), $container->getDefinition('form.extension')->getArgument(2));
312+
self::assertEquals(new IteratorArgument([new Reference('my.guesser')]), $container->getDefinition('form.extension')->getArgument(2));
313313
}],
314314
];
315315
}

Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function tearDown(): void
3737
$this->dateTimeWithoutSeconds = null;
3838
}
3939

40-
public function allProvider()
40+
public static function allProvider()
4141
{
4242
return [
4343
['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'],
@@ -51,12 +51,12 @@ public function allProvider()
5151

5252
public function transformProvider()
5353
{
54-
return $this->allProvider();
54+
return self::allProvider();
5555
}
5656

5757
public function reverseTransformProvider()
5858
{
59-
return array_merge($this->allProvider(), [
59+
return array_merge(self::allProvider(), [
6060
// format without seconds, as appears in some browsers
6161
['UTC', 'UTC', '2010-02-03 04:05:00 UTC', '2010-02-03T04:05Z'],
6262
['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:00 America/New_York', '2010-02-03T17:05+08:00'],

0 commit comments

Comments
 (0)