minor #21994 Use PHP functions as array_map callbacks when possible (javiereguiluz)

fabpot · fabpot · commit dd8e50baa1e0 · 2017-03-14T12:43:03.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- Use PHP functions as array_map callbacks when possible | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - We already do that in 99% of the cases ... but there were 3 occurrences where we didn't do it. Commits ------- 405bd4c Use PHP functions as array_map callbacks when possible
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -224,7 +224,7 @@ public function testTranslator()
         $this->assertEquals('translator.default', (string) $container->getAlias('translator'), '->registerTranslatorConfiguration() redefines translator service from identity to real translator');
         $options = $container->getDefinition('translator.default')->getArgument(3);
 
-        $files = array_map(function ($resource) { return realpath($resource); }, $options['resource_files']['en']);
+        $files = array_map('realpath', $options['resource_files']['en']);
         $ref = new \ReflectionClass('Symfony\Component\Validator\Validation');
         $this->assertContains(
             strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -73,7 +73,7 @@ public function testFirewalls()
         foreach (array_keys($arguments[1]) as $contextId) {
             $contextDef = $container->getDefinition($contextId);
             $arguments = $contextDef->getArguments();
-            $listeners[] = array_map(function ($ref) { return (string) $ref; }, $arguments['index_0']);
+            $listeners[] = array_map('strval', $arguments['index_0']);
         }
 
         $this->assertEquals(array(
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -317,7 +317,7 @@ public function testGetIterator()
 
         $finder = $this->buildFinder();
         $a = iterator_to_array($finder->directories()->in(self::$tmpDir));
-        $a = array_values(array_map(function ($a) { return (string) $a; }, $a));
+        $a = array_values(array_map('strval', $a));
         sort($a);
         $this->assertEquals($expected, $a, 'implements the \IteratorAggregate interface');
     }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function testFirewalls()`
`73`	`73`	`foreach (array_keys($arguments[1]) as $contextId) {`
`74`	`74`	`$contextDef = $container->getDefinition($contextId);`
`75`	`75`	`$arguments = $contextDef->getArguments();`
`76`		`- $listeners[] = array_map(function ($ref) { return (string) $ref; }, $arguments['index_0']);`
	`76`	`+ $listeners[] = array_map('strval', $arguments['index_0']);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`$this->assertEquals(array(`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public function testGetIterator()`
`317`	`317`
`318`	`318`	`$finder = $this->buildFinder();`
`319`	`319`	`$a = iterator_to_array($finder->directories()->in(self::$tmpDir));`
`320`		`- $a = array_values(array_map(function ($a) { return (string) $a; }, $a));`
	`320`	`+ $a = array_values(array_map('strval', $a));`
`321`	`321`	`sort($a);`
`322`	`322`	`$this->assertEquals($expected, $a, 'implements the \IteratorAggregate interface');`
`323`	`323`	`}`