mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-14 16:34:26 +02:00
Code Issues Releases Wiki Activity

Do not resolve services when extending them

Browse Source 
Refs #1578.
This commit is contained in:
Franz Liedke
2018-12-13 01:57:31 +01:00
parent 16eb1fa63b
commit ed02eed88f
4 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Extend/Frontend.php
View File

@@ -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,15 +123,20 @@ class Frontend implements ExtenderInterface
return;
}
$routes = $container->make("flarum.$this->frontend.routes");
$factory = $container->make(RouteHandlerFactory::class);
$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(
$route['path'], $route['name'],
$factory->toFrontend($this->frontend, $route['content'])
);
}
foreach ($this->routes as $route) {
$collection->get(
$route['path'], $route['name'],
$factory->toFrontend($this->frontend, $route['content'])
);
}
}
);
}
private function registerContent(Container $container)