From df6f10da207a30a2ecf50091ce2f18b4b97e8bbb Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 7 Sep 2018 01:29:13 +0200 Subject: [PATCH] Frontend extender: Remove route registration This can be achieved using the Route extender, which is more flexible, as it does not necessary connect the URL with the current frontend's router. (Example use-case: The ext-embed frontend will be a new frontend, however any routes using this frontend will be part of the forum route group.) Refs #851. --- framework/core/src/Extend/Frontend.php | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/framework/core/src/Extend/Frontend.php b/framework/core/src/Extend/Frontend.php index 45282316a..7c74dd339 100644 --- a/framework/core/src/Extend/Frontend.php +++ b/framework/core/src/Extend/Frontend.php @@ -14,7 +14,6 @@ namespace Flarum\Extend; use Flarum\Extension\Extension; use Flarum\Frontend\Asset\ExtensionAssets; use Flarum\Frontend\CompilerFactory; -use Flarum\Http\RouteHandlerFactory; use Illuminate\Contracts\Container\Container; class Frontend implements ExtenderInterface @@ -44,17 +43,9 @@ class Frontend implements ExtenderInterface return $this; } - public function route($path, $name, $content = null) - { - $this->routes[] = compact('path', 'name', 'content'); - - return $this; - } - public function __invoke(Container $container, Extension $extension = null) { $this->registerAssets($container, $this->getModuleName($extension)); - $this->registerRoutes($container); } private function registerAssets(Container $container, string $moduleName) @@ -75,23 +66,6 @@ class Frontend implements ExtenderInterface ); } - private function registerRoutes(Container $container) - { - if (empty($this->routes)) { - return; - } - - $routes = $container->make("flarum.$this->frontend.routes"); - $factory = $container->make(RouteHandlerFactory::class); - - foreach ($this->routes as $route) { - $routes->get( - $route['path'], $route['name'], - $factory->toFrontend($this->frontend, $route['content']) - ); - } - } - private function getModuleName(?Extension $extension): string { return $extension ? $extension->getId() : 'site-custom';