refactor

DeimosProject · Jan 23, 2017 · e661cc5 · e661cc5
1 parent e152db5
commit e661cc5
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/DI/DI.php b/src/DI/DI.php
@@ -50,11 +50,10 @@ protected static function requireInstance()
 
     /**
      * @param string $name
-     * @param array  $arguments
-     *
-     * @return mixed
+     * @param        $row
+     * @param        $last
      */
-    public function call($name, array $arguments = [])
+    protected function initSteps($name, &$row, &$last)
     {
         $path = $this->path($name);
         $row  = $this->getFirst($path);
@@ -64,7 +63,17 @@ public function call($name, array $arguments = [])
         {
             $this->steps($row, $path);
         }
+    }
 
+    /**
+     * @param string $name
+     * @param array  $arguments
+     *
+     * @return mixed
+     */
+    public function call($name, array $arguments = [])
+    {
+        $this->initSteps($name, $row, $last);
         $isCallable = is_callable($row);
 
         if (!$isCallable && !$last)
@@ -122,15 +131,7 @@ protected function getFirst(&$path)
 
     public function get($name)
     {
-        $path = $this->path($name);
-        $row  = $this->getFirst($path);
-        $last = array_pop($path);
-
-        if (!empty($path))
-        {
-            $this->steps($row, $path);
-        }
-
+        $this->initSteps($name, $row, $last);
         if ($last && is_object($row))
         {
             if ($row instanceof self)