Merge pull request #31008 from laravel/revert-30962-delay

Revert "[6.x] Delay instantiation of transator and view factory"
laravel · Jan 2, 2020 · 795660e · 795660e
2 parents 7d9c4fe + acc20d2
commit 795660e
Showing 1 changed file with 12 additions and 32 deletions.
diff --git a/src/Illuminate/Support/ServiceProvider.php b/src/Illuminate/Support/ServiceProvider.php
@@ -87,18 +87,18 @@ protected function loadRoutesFrom($path)
      */
     protected function loadViewsFrom($path, $namespace)
     {
-        $this->callAfterResolving('view', function ($view) use ($path, $namespace) {
-            if (isset($this->app->config['view']['paths']) &&
-                is_array($this->app->config['view']['paths'])) {
-                foreach ($this->app->config['view']['paths'] as $viewPath) {
-                    if (is_dir($appPath = $viewPath.'/vendor/'.$namespace)) {
-                        $view->addNamespace($namespace, $appPath);
-                    }
+        $view = $this->app['view'];
+
+        if (isset($this->app->config['view']['paths']) &&
+            is_array($this->app->config['view']['paths'])) {
+            foreach ($this->app->config['view']['paths'] as $viewPath) {
+                if (is_dir($appPath = $viewPath.'/vendor/'.$namespace)) {
+                    $view->addNamespace($namespace, $appPath);
                 }
             }
+        }
 
-            $view->addNamespace($namespace, $path);
-        });
+        $view->addNamespace($namespace, $path);
     }
 
     /**
@@ -110,9 +110,7 @@ protected function loadViewsFrom($path, $namespace)
      */
     protected function loadTranslationsFrom($path, $namespace)
     {
-        $this->callAfterResolving('translator', function ($translator) use ($path, $namespace) {
-            $translator->addNamespace($namespace, $path);
-        });
+        $this->app['translator']->addNamespace($namespace, $path);
     }
 
     /**
@@ -123,9 +121,7 @@ protected function loadTranslationsFrom($path, $namespace)
      */
     protected function loadJsonTranslationsFrom($path)
     {
-        $this->callAfterResolving('translator', function ($translator) use ($path) {
-            $translator->addJsonPath($path);
-        });
+        $this->app['translator']->addJsonPath($path);
     }
 
     /**
@@ -136,29 +132,13 @@ protected function loadJsonTranslationsFrom($path)
      */
     protected function loadMigrationsFrom($paths)
     {
-        $this->callAfterResolving('migrator', function ($migrator) use ($paths) {
+        $this->app->afterResolving('migrator', function ($migrator) use ($paths) {
             foreach ((array) $paths as $path) {
                 $migrator->path($path);
             }
         });
     }
 
-    /**
-     * Setup an after resolving listener, or fire immediately if already resolved.
-     *
-     * @param  string  $name
-     * @param  callable  $callback
-     * @return void
-     */
-    protected function callAfterResolving($name, $callback)
-    {
-        $this->app->afterResolving($name, $callback);
-
-        if ($this->app->resolved($name)) {
-            $callback($this->app->make($name), $this->app);
-        }
-    }
-
     /**
      * Register paths to be published by the publish command.
      *