formatting

laravel · Feb 28, 2020 · 1764ff7 · 1764ff7
1 parent cba2b53
commit 1764ff7
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -767,25 +767,11 @@ public function registerDeferredProvider($provider, $service = null)
      */
     public function make($abstract, array $parameters = [])
     {
-        $abstract = $this->getAlias($abstract);
-
-        $this->loadDeferredProviderIfNeeded($abstract);
+        $this->loadDeferredProviderIfNeeded($abstract = $this->getAlias($abstract));
 
         return parent::make($abstract, $parameters);
     }
 
-    /**
-     * Load deferred provider if $abstract is deferred service and instance was not loaded.
-     *
-     * @param  string  $abstract
-     */
-    private function loadDeferredProviderIfNeeded($abstract)
-    {
-        if ($this->isDeferredService($abstract) && ! isset($this->instances[$abstract])) {
-            $this->loadDeferredProvider($abstract);
-        }
-    }
-
     /**
      * Resolve the given type from the container.
      *
@@ -798,13 +784,24 @@ private function loadDeferredProviderIfNeeded($abstract)
      */
     protected function resolve($abstract, $parameters = [], $raiseEvents = true)
     {
-        $abstract = $this->getAlias($abstract);
-
-        $this->loadDeferredProviderIfNeeded($abstract);
+        $this->loadDeferredProviderIfNeeded($abstract = $this->getAlias($abstract));
 
         return parent::resolve($abstract, $parameters, $raiseEvents);
     }
 
+    /**
+     * Load the deferred provider if the given type is a deferred service and the instance has not been loaded.
+     *
+     * @param  string  $abstract
+     * @return void
+     */
+    protected function loadDeferredProviderIfNeeded($abstract)
+    {
+        if ($this->isDeferredService($abstract) && ! isset($this->instances[$abstract])) {
+            $this->loadDeferredProvider($abstract);
+        }
+    }
+
     /**
      * Determine if the given abstract type has been bound.
      *