From 8887f76b64f8ba2ab296deec9b4c4422e704744f Mon Sep 17 00:00:00 2001 From: Vladimir Reznichenko Date: Wed, 2 Jan 2019 12:31:17 +0100 Subject: [PATCH] SCA: minor code tweaks --- .../DependencyInjection/FrameworkExtension.php | 4 +--- .../Messenger/DataCollector/MessengerDataCollector.php | 4 +--- .../Component/Serializer/Mapping/Loader/XmlFileLoader.php | 3 ++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index c42f91c40888..293b52dc4acc 100644 --- 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 index 1cffd74a2f1c..7c5a81252fe8 100644 --- 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 index eec766f91d53..9a4aba54a140 100644 --- 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(