Merge pull request #1697 from flarum/fl/1578-speed-up-extenders

Do not resolve services in extenders

framework/core/src/Admin/AdminServiceProvider.php

@@ -12,8 +12,11 @@
 namespace Flarum\Admin;
 
 use Flarum\Event\ConfigureMiddleware;
+use Flarum\Extension\Event\Disabled;
+use Flarum\Extension\Event\Enabled;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\Application;
+use Flarum\Foundation\Event\ClearingCache;
 use Flarum\Frontend\AddLocaleAssets;
 use Flarum\Frontend\AddTranslations;
 use Flarum\Frontend\Compiler\Source\SourceCollector;
@@ -22,6 +25,8 @@ use Flarum\Http\Middleware as HttpMiddleware;
 use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
+use Flarum\Locale\LocaleManager;
+use Flarum\Settings\Event\Saved;
 use Zend\Stratigility\MiddlewarePipe;
 
 class AdminServiceProvider extends AbstractServiceProvider
@@ -102,11 +107,28 @@ class AdminServiceProvider extends AbstractServiceProvider
 
         $this->loadViewsFrom(__DIR__.'/../../views', 'flarum.admin');
 
-        $this->app->make('events')->subscribe(
+        $events = $this->app->make('events');
-            new RecompileFrontendAssets(
+
-                $this->app->make('flarum.assets.admin'),
+        $events->listen(
-                $this->app->make('flarum.locales')
+            [Enabled::class, Disabled::class, ClearingCache::class],
-            )
+            function () {
+                $recompile = new RecompileFrontendAssets(
+                    $this->app->make('flarum.assets.admin'),
+                    $this->app->make(LocaleManager::class)
+                );
+                $recompile->flush();
+            }
+        );
+
+        $events->listen(
+            Saved::class,
+            function (Saved $event) {
+                $recompile = new RecompileFrontendAssets(
+                    $this->app->make('flarum.assets.admin'),
+                    $this->app->make(LocaleManager::class)
+                );
+                $recompile->whenSettingsSaved($event);
+            }
         );
     }
 

framework/core/src/Extend/Frontend.php

@@ -11,12 +11,18 @@
 
 namespace Flarum\Extend;
 
+use Flarum\Extension\Event\Disabled;
+use Flarum\Extension\Event\Enabled;
 use Flarum\Extension\Extension;
+use Flarum\Foundation\Event\ClearingCache;
 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 Flarum\Locale\LocaleManager;
+use Flarum\Settings\Event\Saved;
 use Illuminate\Contracts\Container\Container;
 
 class Frontend implements ExtenderInterface
@@ -107,11 +113,29 @@ class Frontend implements ExtenderInterface
                 return $container->make('flarum.assets.factory')($this->frontend);
             });
 
-            $container->make('events')->subscribe(
+            /** @var \Illuminate\Contracts\Events\Dispatcher $events */
-                new RecompileFrontendAssets(
+            $events = $container->make('events');
-                    $container->make($abstract),
+
-                    $container->make('flarum.locales')
+            $events->listen(
-                )
+                [Enabled::class, Disabled::class, ClearingCache::class],
+                function () use ($container, $abstract) {
+                    $recompile = new RecompileFrontendAssets(
+                        $container->make($abstract),
+                        $container->make(LocaleManager::class)
+                    );
+                    $recompile->flush();
+                }
+            );
+
+            $events->listen(
+                Saved::class,
+                function (Saved $event) use ($container, $abstract) {
+                    $recompile = new RecompileFrontendAssets(
+                        $container->make($abstract),
+                        $container->make(LocaleManager::class)
+                    );
+                    $recompile->whenSettingsSaved($event);
+                }
             );
         }
     }
@@ -122,15 +146,20 @@ class Frontend implements ExtenderInterface
             return;
         }
 
-        $routes = $container->make("flarum.$this->frontend.routes");
+        $container->resolving(
-        $factory = $container->make(RouteHandlerFactory::class);
+            "flarum.{$this->frontend}.routes",
+            function (RouteCollection $collection, Container $container) {
+                /** @var RouteHandlerFactory $factory */
+                $factory = $container->make(RouteHandlerFactory::class);
 
-        foreach ($this->routes as $route) {
+                foreach ($this->routes as $route) {
-            $routes->get(
+                    $collection->get(
-                $route['path'], $route['name'],
+                        $route['path'], $route['name'],
-                $factory->toFrontend($this->frontend, $route['content'])
+                        $factory->toFrontend($this->frontend, $route['content'])
-            );
+                    );
-        }
+                }
+            }
+        );
     }
 
     private function registerContent(Container $container)

framework/core/src/Extend/LanguagePack.php

@@ -37,8 +37,16 @@ class LanguagePack implements ExtenderInterface, LifecycleInterface
             );
         }
 
-        /** @var LocaleManager $locales */
+        $container->resolving(
-        $locales = $container->make(LocaleManager::class);
+            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';

framework/core/src/Extend/Locales.php

@@ -27,33 +27,35 @@ class Locales implements ExtenderInterface, LifecycleInterface
 
     public function extend(Container $container, Extension $extension = null)
     {
-        /** @var LocaleManager $locales */
+        $container->resolving(
-        $locales = $container->make(LocaleManager::class);
+            LocaleManager::class,
+            function (LocaleManager $locales) {
+                foreach (new DirectoryIterator($this->directory) as $file) {
+                    if (! $file->isFile()) {
+                        continue;
+                    }
 
-        foreach (new DirectoryIterator($this->directory) as $file) {
+                    $extension = $file->getExtension();
-            if (! $file->isFile()) {
+                    if (! in_array($extension, ['yml', 'yaml'])) {
-                continue;
+                        continue;
+                    }
+
+                    $locales->addTranslations(
+                        $file->getBasename(".$extension"),
+                        $file->getPathname()
+                    );
+                }
             }
-
+        );
-            $extension = $file->getExtension();
-            if (! in_array($extension, ['yml', 'yaml'])) {
-                continue;
-            }
-
-            $locales->addTranslations(
-                $file->getBasename(".$extension"),
-                $file->getPathname()
-            );
-        }
     }
 
     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();
     }
 }

framework/core/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,19 +70,21 @@ class Routes implements ExtenderInterface
             return;
         }
 
-        /** @var \Flarum\Http\RouteCollection $collection */
+        $container->resolving(
-        $collection = $container->make("flarum.{$this->appName}.routes");
+            "flarum.{$this->appName}.routes",
+            function (RouteCollection $collection, Container $container) {
+                /** @var RouteHandlerFactory $factory */
+                $factory = $container->make(RouteHandlerFactory::class);
 
-        /** @var RouteHandlerFactory $factory */
+                foreach ($this->routes as $route) {
-        $factory = $container->make(RouteHandlerFactory::class);
+                    $collection->addRoute(
-
+                        $route['method'],
-        foreach ($this->routes as $route) {
+                        $route['path'],
-            $collection->addRoute(
+                        $route['name'],
-                $route['method'],
+                        $factory->toController($route['handler'])
-                $route['path'],
+                    );
-                $route['name'],
+                }
-                $factory->toController($route['handler'])
+            }
-            );
+        );
-        }
     }
 }

framework/core/src/Forum/ForumServiceProvider.php

@@ -13,9 +13,12 @@ namespace Flarum\Forum;
 
 use Flarum\Event\ConfigureForumRoutes;
 use Flarum\Event\ConfigureMiddleware;
+use Flarum\Extension\Event\Disabled;
+use Flarum\Extension\Event\Enabled;
 use Flarum\Formatter\Formatter;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\Application;
+use Flarum\Foundation\Event\ClearingCache;
 use Flarum\Frontend\AddLocaleAssets;
 use Flarum\Frontend\AddTranslations;
 use Flarum\Frontend\Assets;
@@ -25,6 +28,8 @@ use Flarum\Http\Middleware as HttpMiddleware;
 use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
+use Flarum\Locale\LocaleManager;
+use Flarum\Settings\Event\Saved;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Zend\Stratigility\MiddlewarePipe;
@@ -116,11 +121,26 @@ class ForumServiceProvider extends AbstractServiceProvider
 
         $events = $this->app->make('events');
 
-        $events->subscribe(
+        $events->listen(
-            new RecompileFrontendAssets(
+            [Enabled::class, Disabled::class, ClearingCache::class],
-                $this->app->make('flarum.assets.forum'),
+            function () {
-                $this->app->make('flarum.locales')
+                $recompile = new RecompileFrontendAssets(
-            )
+                    $this->app->make('flarum.assets.forum'),
+                    $this->app->make(LocaleManager::class)
+                );
+                $recompile->flush();
+            }
+        );
+
+        $events->listen(
+            Saved::class,
+            function (Saved $event) {
+                $recompile = new RecompileFrontendAssets(
+                    $this->app->make('flarum.assets.forum'),
+                    $this->app->make(LocaleManager::class)
+                );
+                $recompile->whenSettingsSaved($event);
+            }
         );
 
         $events->subscribe(

framework/core/src/Frontend/RecompileFrontendAssets.php

@@ -11,12 +11,8 @@
 
 namespace Flarum\Frontend;
 
-use Flarum\Extension\Event\Disabled;
-use Flarum\Extension\Event\Enabled;
-use Flarum\Foundation\Event\ClearingCache;
 use Flarum\Locale\LocaleManager;
 use Flarum\Settings\Event\Saved;
-use Illuminate\Contracts\Events\Dispatcher;
 
 class RecompileFrontendAssets
 {
@@ -40,17 +36,6 @@ class RecompileFrontendAssets
         $this->locales = $locales;
     }
 
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Saved::class, [$this, 'whenSettingsSaved']);
-        $events->listen(Enabled::class, [$this, 'flush']);
-        $events->listen(Disabled::class, [$this, 'flush']);
-        $events->listen(ClearingCache::class, [$this, 'flush']);
-    }
-
     public function whenSettingsSaved(Saved $event)
     {
         if (preg_grep('/^theme_/i', array_keys($event->settings))) {