Do not resolve services when extending them

Refs #1578.

src/Extend/Frontend.php

@@ -16,6 +16,7 @@ use Flarum\Frontend\Assets;
 use Flarum\Frontend\Compiler\Source\SourceCollector;
 use Flarum\Frontend\Frontend as ActualFrontend;
 use Flarum\Frontend\RecompileFrontendAssets;
+use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Illuminate\Contracts\Container\Container;
 
@@ -122,16 +123,21 @@ class Frontend implements ExtenderInterface
             return;
         }
 
-        $routes = $container->make("flarum.$this->frontend.routes");
+        $container->resolving(
+            "flarum.{$this->frontend}.routes",
+            function (RouteCollection $collection, Container $container) {
+                /** @var RouteHandlerFactory $factory */
                 $factory = $container->make(RouteHandlerFactory::class);
 
                 foreach ($this->routes as $route) {
-            $routes->get(
+                    $collection->get(
                         $route['path'], $route['name'],
                         $factory->toFrontend($this->frontend, $route['content'])
                     );
                 }
             }
+        );
+    }
 
     private function registerContent(Container $container)
     {

src/Extend/LanguagePack.php

@@ -37,8 +37,16 @@ class LanguagePack implements ExtenderInterface, LifecycleInterface
             );
         }
 
-        /** @var LocaleManager $locales */
-        $locales = $container->make(LocaleManager::class);
+        $container->resolving(
+            LocaleManager::class,
+            function (LocaleManager $locales) use ($extension, $locale, $title) {
+                $this->registerLocale($locales, $extension, $locale, $title);
+            }
+        );
+    }
+
+    private function registerLocale(LocaleManager $locales, Extension $extension, $locale, $title)
+    {
         $locales->addLocale($locale, $title);
 
         $directory = $extension->getPath().'/locale';

src/Extend/Locales.php

@@ -27,9 +27,9 @@ class Locales implements ExtenderInterface, LifecycleInterface
 
     public function extend(Container $container, Extension $extension = null)
     {
-        /** @var LocaleManager $locales */
-        $locales = $container->make(LocaleManager::class);
-
+        $container->resolving(
+            LocaleManager::class,
+            function (LocaleManager $locales) {
                 foreach (new DirectoryIterator($this->directory) as $file) {
                     if (! $file->isFile()) {
                         continue;
@@ -46,14 +46,16 @@ class Locales implements ExtenderInterface, LifecycleInterface
                     );
                 }
             }
+        );
+    }
 
     public function onEnable(Container $container, Extension $extension)
     {
-        $container->make('flarum.locales')->clearCache();
+        $container->make(LocaleManager::class)->clearCache();
     }
 
     public function onDisable(Container $container, Extension $extension)
     {
-        $container->make('flarum.locales')->clearCache();
+        $container->make(LocaleManager::class)->clearCache();
     }
 }

src/Extend/Routes.php

@@ -12,6 +12,7 @@
 namespace Flarum\Extend;
 
 use Flarum\Extension\Extension;
+use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Illuminate\Contracts\Container\Container;
 
@@ -69,9 +70,9 @@ class Routes implements ExtenderInterface
             return;
         }
 
-        /** @var \Flarum\Http\RouteCollection $collection */
-        $collection = $container->make("flarum.{$this->appName}.routes");
-
+        $container->resolving(
+            "flarum.{$this->appName}.routes",
+            function (RouteCollection $collection, Container $container) {
                 /** @var RouteHandlerFactory $factory */
                 $factory = $container->make(RouteHandlerFactory::class);
 
@@ -84,4 +85,6 @@ class Routes implements ExtenderInterface
                     );
                 }
             }
+        );
+    }
 }