Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a83ad3f

Browse filesBrowse files
srozesroze
committed
CS changes, replace [] by array() (see #24396)
1 parent 8b818cc commit a83ad3f
Copy full SHA for a83ad3f

11 files changed

+56
-71
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
-15Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -844,21 +844,6 @@ public function testSerializerCacheDisabled()
844844
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
845845
}
846846

847-
/**
848-
* @group legacy
849-
* @expectedDeprecation The "framework.serializer.cache" option is deprecated %s.
850-
*/
851-
public function testDeprecatedSerializerCacheOption()
852-
{
853-
$container = $this->createContainerFromFile('serializer_legacy_cache', array('kernel.debug' => true, 'kernel.container_class' => __CLASS__));
854-
855-
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
856-
$this->assertTrue($container->hasDefinition('serializer.mapping.class_metadata_factory'));
857-
858-
$cache = $container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1);
859-
$this->assertEquals(new Reference('foo'), $cache);
860-
}
861-
862847
public function testSerializerMapping()
863848
{
864849
$container = $this->createContainerFromFile('serializer_mapping', array('kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'path' => __DIR__.'/Fixtures/TestBundle'))));

‎src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ public function __construct(array $data)
5252
$this->mapping = $data['mapping'];
5353
}
5454

55-
public function getTypeProperty() : string
55+
public function getTypeProperty(): string
5656
{
5757
return $this->typeProperty;
5858
}
5959

60-
public function getMapping() : array
60+
public function getMapping(): array
6161
{
6262
return $this->mapping;
6363
}

‎src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ClassDiscriminatorFromClassMetadata implements ClassDiscriminatorResolverI
2222
* @var ClassMetadataFactoryInterface
2323
*/
2424
private $classMetadataFactory;
25-
private $mappingForMappedObjectCache = [];
25+
private $mappingForMappedObjectCache = array();
2626

2727
public function __construct(ClassMetadataFactoryInterface $classMetadataFactory)
2828
{
@@ -32,7 +32,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory)
3232
/**
3333
* {@inheritdoc}
3434
*/
35-
public function getMappingForClass(string $class) : ?ClassDiscriminatorMapping
35+
public function getMappingForClass(string $class): ?ClassDiscriminatorMapping
3636
{
3737
if ($this->classMetadataFactory->hasMetadataFor($class)) {
3838
return $this->classMetadataFactory->getMetadataFor($class)->getClassDiscriminatorMapping();
@@ -44,7 +44,7 @@ public function getMappingForClass(string $class) : ?ClassDiscriminatorMapping
4444
/**
4545
* {@inheritdoc}
4646
*/
47-
public function getMappingForMappedObject($object) : ?ClassDiscriminatorMapping
47+
public function getMappingForMappedObject($object): ?ClassDiscriminatorMapping
4848
{
4949
if ($this->classMetadataFactory->hasMetadataFor($object)) {
5050
$metadata = $this->classMetadataFactory->getMetadataFor($object);
@@ -65,7 +65,7 @@ public function getMappingForMappedObject($object) : ?ClassDiscriminatorMapping
6565
/**
6666
* {@inheritdoc}
6767
*/
68-
public function getTypeForMappedObject($object) : ?string
68+
public function getTypeForMappedObject($object): ?string
6969
{
7070
if (null === $mapping = $this->getMappingForMappedObject($object)) {
7171
return null;

‎src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ class ClassDiscriminatorMapping
1919
private $typeProperty;
2020
private $typesMapping;
2121

22-
public function __construct(string $typeProperty, array $typesMapping = [])
22+
public function __construct(string $typeProperty, array $typesMapping = array())
2323
{
2424
$this->typeProperty = $typeProperty;
2525
$this->typesMapping = $typesMapping;
2626
}
2727

28-
public function getTypeProperty() : string
28+
public function getTypeProperty(): string
2929
{
3030
return $this->typeProperty;
3131
}
3232

33-
public function getClassForType(string $type) : ?string
33+
public function getClassForType(string $type): ?string
3434
{
3535
if (isset($this->typesMapping[$type])) {
3636
return $this->typesMapping[$type];
@@ -44,7 +44,7 @@ public function getClassForType(string $type) : ?string
4444
*
4545
* @return string|null
4646
*/
47-
public function getMappedObjectType($object) : ?string
47+
public function getMappedObjectType($object): ?string
4848
{
4949
foreach ($this->typesMapping as $type => $typeClass) {
5050
if (is_a($object, $typeClass)) {
@@ -55,7 +55,7 @@ public function getMappedObjectType($object) : ?string
5555
return null;
5656
}
5757

58-
public function getTypesMapping() : array
58+
public function getTypesMapping(): array
5959
{
6060
return $this->typesMapping;
6161
}

‎src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorResolverInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorResolverInterface.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ interface ClassDiscriminatorResolverInterface
2323
*
2424
* @return ClassDiscriminatorMapping|null
2525
*/
26-
public function getMappingForClass(string $class) : ?ClassDiscriminatorMapping;
26+
public function getMappingForClass(string $class): ?ClassDiscriminatorMapping;
2727

2828
/**
2929
* @param object|string $object
3030
*
3131
* @return ClassDiscriminatorMapping|null
3232
*/
33-
public function getMappingForMappedObject($object) : ?ClassDiscriminatorMapping;
33+
public function getMappingForMappedObject($object): ?ClassDiscriminatorMapping;
3434

3535
/**
3636
* @param object|string $object
3737
*
3838
* @return string|null
3939
*/
40-
public function getTypeForMappedObject($object) : ?string;
40+
public function getTypeForMappedObject($object): ?string;
4141
}

‎src/Symfony/Component/Serializer/Tests/Annotation/DiscriminatorMapTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Annotation/DiscriminatorMapTest.php
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,47 @@ class DiscriminatorMapTest extends TestCase
2121
{
2222
public function testGetTypePropertyAndMapping()
2323
{
24-
$annotation = new DiscriminatorMap(['typeProperty' => 'type', 'mapping' => [
24+
$annotation = new DiscriminatorMap(array('typeProperty' => 'type', 'mapping' => array(
2525
'foo' => 'FooClass',
2626
'bar' => 'BarClass',
27-
]]);
27+
)));
2828

2929
$this->assertEquals('type', $annotation->getTypeProperty());
30-
$this->assertEquals([
30+
$this->assertEquals(array(
3131
'foo' => 'FooClass',
3232
'bar' => 'BarClass',
33-
], $annotation->getMapping());
33+
), $annotation->getMapping());
3434
}
3535

3636
/**
3737
* @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
3838
*/
3939
public function testExceptionWithoutTypeProperty()
4040
{
41-
new DiscriminatorMap(['mapping' => ['foo' => 'FooClass']]);
41+
new DiscriminatorMap(array('mapping' => array('foo' => 'FooClass')));
4242
}
4343

4444
/**
4545
* @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
4646
*/
4747
public function testExceptionWithEmptyTypeProperty()
4848
{
49-
new DiscriminatorMap(['typeProperty' => '', 'mapping' => ['foo' => 'FooClass']]);
49+
new DiscriminatorMap(array('typeProperty' => '', 'mapping' => array('foo' => 'FooClass')));
5050
}
5151

5252
/**
5353
* @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
5454
*/
5555
public function testExceptionWithoutMappingProperty()
5656
{
57-
new DiscriminatorMap(['typeProperty' => 'type',]);
57+
new DiscriminatorMap(array('typeProperty' => 'type'));
5858
}
5959

6060
/**
6161
* @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
6262
*/
6363
public function testExceptionWitEmptyMappingProperty()
6464
{
65-
new DiscriminatorMap(['typeProperty' => 'type', 'mapping' => []]);
65+
new DiscriminatorMap(array('typeProperty' => 'type', 'mapping' => array()));
6666
}
6767
}

‎src/Symfony/Component/Serializer/Tests/Mapping/ClassDiscriminatorMappingTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Mapping/ClassDiscriminatorMappingTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ class ClassDiscriminatorMappingTest extends TestCase
2323
{
2424
public function testGetClass()
2525
{
26-
$mapping = new ClassDiscriminatorMapping('type', [
26+
$mapping = new ClassDiscriminatorMapping('type', array(
2727
'first' => AbstractDummyFirstChild::class,
28-
]);
28+
));
2929

3030
$this->assertEquals(AbstractDummyFirstChild::class, $mapping->getClassForType('first'));
3131
$this->assertEquals(null, $mapping->getClassForType('second'));
3232
}
3333

3434
public function testMappedObjectType()
3535
{
36-
$mapping = new ClassDiscriminatorMapping('type', [
36+
$mapping = new ClassDiscriminatorMapping('type', array(
3737
'first' => AbstractDummyFirstChild::class,
38-
]);
38+
));
3939

4040
$this->assertEquals('first', $mapping->getMappedObjectType(new AbstractDummyFirstChild()));
4141
$this->assertEquals(null, $mapping->getMappedObjectType(new AbstractDummySecondChild()));

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ public function testLoadDiscriminatorMap()
6262
$classMetadata = new ClassMetadata(AbstractDummy::class);
6363
$this->loader->loadClassMetadata($classMetadata);
6464

65-
$expected = new ClassMetadata(AbstractDummy::class, new ClassDiscriminatorMapping('type', [
65+
$expected = new ClassMetadata(AbstractDummy::class, new ClassDiscriminatorMapping('type', array(
6666
'first' => AbstractDummyFirstChild::class,
6767
'second' => AbstractDummySecondChild::class,
68-
]));
68+
)));
6969

7070
$expected->addAttributeMetadata(new AttributeMetadata('foo'));
7171
$expected->getReflectionClass();

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ public function testLoadDiscriminatorMap()
7373
$classMetadata = new ClassMetadata(AbstractDummy::class);
7474
$this->loader->loadClassMetadata($classMetadata);
7575

76-
$expected = new ClassMetadata(AbstractDummy::class, new ClassDiscriminatorMapping('type', [
76+
$expected = new ClassMetadata(AbstractDummy::class, new ClassDiscriminatorMapping('type', array(
7777
'first' => AbstractDummyFirstChild::class,
7878
'second' => AbstractDummySecondChild::class,
79-
]));
79+
)));
8080

8181
$expected->addAttributeMetadata(new AttributeMetadata('foo'));
8282

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ public function testLoadDiscriminatorMap()
8888
$classMetadata = new ClassMetadata(AbstractDummy::class);
8989
$this->loader->loadClassMetadata($classMetadata);
9090

91-
$expected = new ClassMetadata(AbstractDummy::class, new ClassDiscriminatorMapping('type', [
91+
$expected = new ClassMetadata(AbstractDummy::class, new ClassDiscriminatorMapping('type', array(
9292
'first' => AbstractDummyFirstChild::class,
9393
'second' => AbstractDummySecondChild::class,
94-
]));
94+
)));
9595

9696
$expected->addAttributeMetadata(new AttributeMetadata('foo'));
9797

‎src/Symfony/Component/Serializer/Tests/SerializerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/SerializerTest.php
+24-24Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -361,28 +361,28 @@ public function testDeserializeAndSerializeAbstractObjectsWithTheClassMetadataDi
361361
$example = new AbstractDummyFirstChild('foo-value', 'bar-value');
362362

363363
$loaderMock = $this->getMockBuilder(ClassMetadataFactoryInterface::class)->getMock();
364-
$loaderMock->method('hasMetadataFor')->will($this->returnValueMap([
365-
[
364+
$loaderMock->method('hasMetadataFor')->will($this->returnValueMap(array(
365+
array(
366366
AbstractDummy::class,
367367
true,
368-
],
369-
]));
368+
),
369+
)));
370370

371-
$loaderMock->method('getMetadataFor')->will($this->returnValueMap([
372-
[
371+
$loaderMock->method('getMetadataFor')->will($this->returnValueMap(array(
372+
array(
373373
AbstractDummy::class,
374374
new ClassMetadata(
375375
AbstractDummy::class,
376-
new ClassDiscriminatorMapping('type', [
376+
new ClassDiscriminatorMapping('type', array(
377377
'first' => AbstractDummyFirstChild::class,
378378
'second' => AbstractDummySecondChild::class,
379-
])
379+
))
380380
),
381-
],
382-
]));
381+
),
382+
)));
383383

384384
$discriminatorResolver = new ClassDiscriminatorFromClassMetadata($loaderMock);
385-
$serializer = new Serializer([new ObjectNormalizer(null, null, null, null, $discriminatorResolver)], ['json' => new JsonEncoder()]);
385+
$serializer = new Serializer(array(new ObjectNormalizer(null, null, null, null, $discriminatorResolver)), array('json' => new JsonEncoder()));
386386

387387
$jsonData = '{"type":"first","bar":"bar-value","foo":"foo-value"}';
388388

@@ -401,7 +401,7 @@ public function testDeserializeAndSerializeInterfacedObjectsWithTheClassMetadata
401401
$jsonData = '{"message-type":"one","one":1}';
402402

403403
$discriminatorResolver = new ClassDiscriminatorFromClassMetadata($this->metadataFactoryMockForDummyInterface());
404-
$serializer = new Serializer([new ObjectNormalizer(null, null, null, null, $discriminatorResolver)], ['json' => new JsonEncoder()]);
404+
$serializer = new Serializer(array(new ObjectNormalizer(null, null, null, null, $discriminatorResolver)), array('json' => new JsonEncoder()));
405405

406406
$deserialized = $serializer->deserialize($jsonData, DummyMessageInterface::class, 'json');
407407
$this->assertEquals($example, $deserialized);
@@ -417,7 +417,7 @@ public function testDeserializeAndSerializeInterfacedObjectsWithTheClassMetadata
417417
public function testExceptionWhenTypeIsNotKnownInDiscriminator()
418418
{
419419
$discriminatorResolver = new ClassDiscriminatorFromClassMetadata($this->metadataFactoryMockForDummyInterface());
420-
$serializer = new Serializer([new ObjectNormalizer(null, null, null, null, $discriminatorResolver)], ['json' => new JsonEncoder()]);
420+
$serializer = new Serializer(array(new ObjectNormalizer(null, null, null, null, $discriminatorResolver)), array('json' => new JsonEncoder()));
421421
$serializer->deserialize('{"message-type":"second","one":1}', DummyMessageInterface::class, 'json');
422422
}
423423

@@ -428,31 +428,31 @@ public function testExceptionWhenTypeIsNotKnownInDiscriminator()
428428
public function testExceptionWhenTypeIsNotInTheBodyToDeserialiaze()
429429
{
430430
$discriminatorResolver = new ClassDiscriminatorFromClassMetadata($this->metadataFactoryMockForDummyInterface());
431-
$serializer = new Serializer([new ObjectNormalizer(null, null, null, null, $discriminatorResolver)], ['json' => new JsonEncoder()]);
431+
$serializer = new Serializer(array(new ObjectNormalizer(null, null, null, null, $discriminatorResolver)), array('json' => new JsonEncoder()));
432432
$serializer->deserialize('{"one":1}', DummyMessageInterface::class, 'json');
433433
}
434434

435435
private function metadataFactoryMockForDummyInterface()
436436
{
437437
$factoryMock = $this->getMockBuilder(ClassMetadataFactoryInterface::class)->getMock();
438-
$factoryMock->method('hasMetadataFor')->will($this->returnValueMap([
439-
[
438+
$factoryMock->method('hasMetadataFor')->will($this->returnValueMap(array(
439+
array(
440440
DummyMessageInterface::class,
441441
true,
442-
],
443-
]));
442+
),
443+
)));
444444

445-
$factoryMock->method('getMetadataFor')->will($this->returnValueMap([
446-
[
445+
$factoryMock->method('getMetadataFor')->will($this->returnValueMap(array(
446+
array(
447447
DummyMessageInterface::class,
448448
new ClassMetadata(
449449
DummyMessageInterface::class,
450-
new ClassDiscriminatorMapping('message-type', [
450+
new ClassDiscriminatorMapping('message-type', array(
451451
'one' => DummyMessageNumberOne::class,
452-
])
452+
))
453453
),
454-
],
455-
]));
454+
),
455+
)));
456456

457457
return $factoryMock;
458458
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.