[PHP 7] Fixed reference issue in ConfigurationProcessor

References behave differently in PHP 7 and calls to `call_user_func_array()` now must have explicit references when passing arguments (not variables assigned by reference). See [reported PHP bug](https://bugs.php.net/bug.php?id=70379). Tests should have broken but they did not because of a issue in `testMapConfigClosure()`.
ezpublishlegacy · Aug 31, 2015 · 393e75e · 393e75e
1 parent cbb4894
commit 393e75e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...shCoreBundle/DependencyInjection/Configuration/SiteAccessAware/ConfigurationProcessor.php b/...shCoreBundle/DependencyInjection/Configuration/SiteAccessAware/ConfigurationProcessor.php
@@ -105,7 +105,7 @@ public function mapConfig(array $config, $mapper)
         $scopeNodeName = $this->contextualizer->getSiteAccessNodeName();
         foreach ($config[$scopeNodeName] as $currentScope => &$scopeSettings) {
             if ($mapperCallable) {
-                call_user_func_array($mapper, array($scopeSettings, $currentScope, $this->contextualizer));
+                call_user_func_array($mapper, array(&$scopeSettings, $currentScope, $this->contextualizer));
             } else {
                 $mapper->mapConfig($scopeSettings, $currentScope, $this->contextualizer);
             }

diff --git a/...le/Tests/DependencyInjection/Configuration/SiteAccessAware/ConfigurationProcessorTest.php b/...le/Tests/DependencyInjection/Configuration/SiteAccessAware/ConfigurationProcessorTest.php
@@ -101,7 +101,7 @@ public function testMapConfigClosure()
             ),
         );
 
-        $mapperClosure = function (array $scopeSettings, $currentScope, ContextualizerInterface $contextualizer) use ($config, $availableSAs, $saNodeName, $expectedContextualizer) {
+        $mapperClosure = function (array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer) use ($config, $availableSAs, $saNodeName, $expectedContextualizer) {
             self::assertTrue(isset($availableSAs[$currentScope]));
             self::assertTrue(isset($config[$saNodeName][$currentScope]));
             self::assertSame($config[$saNodeName][$currentScope], $scopeSettings);