Merge 5e1e4c3 into e4a2ea2

sonata-project · Mar 1, 2018 · d7cd328 · d7cd328
2 parents e4a2ea2 + 5e1e4c3
commit d7cd328
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php b/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php
@@ -395,8 +395,9 @@ private function replaceDefaultArguments(
 
         foreach ($defaultArguments as $index => $value) {
             $declaredInParent = $parentDefinition && array_key_exists($index, $parentArguments);
+            $argumentValue = $declaredInParent ? $parentArguments[$index] : $arguments[$index];
 
-            if (0 == strlen($declaredInParent ? $parentArguments[$index] : $arguments[$index])) {
+            if (null === $argumentValue || 0 === strlen($argumentValue)) {
                 $arguments[$declaredInParent ? sprintf('index_%s', $index) : $index] = $value;
             }
         }