[5.4] Attempt to fix container bug (#18812)

* first attempt * keep StyleCI happy * delay retrieving parameters
laravel · Apr 16, 2017 · ebe568c · ebe568c
1 parent e1fc1fa
commit ebe568c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -576,8 +576,6 @@ public function make($abstract)
      */
     protected function resolve($abstract, $parameters = [])
     {
-        $this->with[] = $parameters;
-
         $needsContextualBuild = ! empty($parameters) || ! is_null(
             $this->getContextualConcrete($abstract = $this->getAlias($abstract))
         );
@@ -589,6 +587,8 @@ protected function resolve($abstract, $parameters = [])
             return $this->instances[$abstract];
         }
 
+        $this->with[] = $parameters;
+
         $concrete = $this->getConcrete($abstract);
 
         // We're ready to instantiate an instance of the concrete type registered for