Code simplification

PHP-DI · May 15, 2016 · 36a090b · 36a090b
1 parent 5bb67bf
commit 36a090b
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/DI/Definition/Resolver/ArrayResolver.php b/src/DI/Definition/Resolver/ArrayResolver.php
@@ -42,7 +42,12 @@ public function resolve(Definition $definition, array $parameters = [])
     {
         $values = $definition->getValues();
 
-        $values = $this->resolveNestedDefinitions($definition, $values);
+        // Resolve nested definitions
+        foreach ($values as $key => $value) {
+            if ($value instanceof DefinitionHelper) {
+                $values[$key] = $this->resolveDefinition($value, $definition, $key);
+            }
+        }
 
         return $values;
     }
@@ -55,17 +60,6 @@ public function isResolvable(Definition $definition, array $parameters = [])
         return true;
     }
 
-    private function resolveNestedDefinitions(ArrayDefinition $definition, array $values)
-    {
-        foreach ($values as $key => $value) {
-            if ($value instanceof DefinitionHelper) {
-                $values[$key] = $this->resolveDefinition($value, $definition, $key);
-            }
-        }
-
-        return $values;
-    }
-
     private function resolveDefinition(DefinitionHelper $value, ArrayDefinition $definition, $key)
     {
         try {