SCA: minor code tweaks

kalessil · fabpot · commit 8887f76b64f8 · 2019-01-13T17:56:40.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -558,9 +558,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $metadataStoreDefinition->replaceArgument(2, $transitionsMetadataDefinition);
 
             // Create places
-            $places = array_map(function (array $place) {
-                return $place['name'];
-            }, $workflow['places']);
+            $places = array_column($workflow['places'], 'name');
 
             // Create a Definition
             $definitionDefinition = new Definition(Workflow\Definition::class);
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -62,9 +62,7 @@ public function lateCollect()
         });
 
         // Keep the messages clones only
-        $this->data['messages'] = array_map(function (array $item): Data {
-            return $item[0];
-        }, $messages);
+        $this->data['messages'] = array_column($messages, 0);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
@@ -71,7 +71,8 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
             if (isset($xml->{'discriminator-map'})) {
                 $mapping = array();
                 foreach ($xml->{'discriminator-map'}->mapping as $element) {
-                    $mapping[(string) $element->attributes()->type] = (string) $element->attributes()->class;
+                    $elementAttributes = $element->attributes();
+                    $mapping[(string) $elementAttributes->type] = (string) $elementAttributes->class;
                 }
 
                 $classMetadata->setClassDiscriminatorMapping(new ClassDiscriminatorMapping(

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ public function lateCollect()`
`62`	`62`	`});`
`63`	`63`
`64`	`64`	`// Keep the messages clones only`
`65`		`- $this->data['messages'] = array_map(function (array $item): Data {`
`66`		`- return $item[0];`
`67`		`- }, $messages);`
	`65`	`+ $this->data['messages'] = array_column($messages, 0);`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)`
`71`	`71`	`if (isset($xml->{'discriminator-map'})) {`
`72`	`72`	`$mapping = array();`
`73`	`73`	`foreach ($xml->{'discriminator-map'}->mapping as $element) {`
`74`		`- $mapping[(string) $element->attributes()->type] = (string) $element->attributes()->class;`
	`74`	`+ $elementAttributes = $element->attributes();`
	`75`	`+ $mapping[(string) $elementAttributes->type] = (string) $elementAttributes->class;`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`$classMetadata->setClassDiscriminatorMapping(new ClassDiscriminatorMapping(`