From 0be13d50bd32847f88803d098e00c99a19ad97de Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 24 Jun 2017 11:52:53 +0200 Subject: [PATCH] Create new Flarum\Frontend namespace It replaces the old Http\WebApp namespace and swallows other namespaces and files, such as Flarum\Asset. --- src/Admin/AdminServiceProvider.php | 2 +- src/Admin/Controller/FrontendController.php | 4 +-- src/Admin/Frontend.php | 4 +-- src/Event/ConfigureWebApp.php | 16 +++++----- .../Controller/AuthorizedWebAppController.php | 2 +- src/Forum/Controller/DiscussionController.php | 6 ++-- src/Forum/Controller/IndexController.php | 6 ++-- src/Forum/Controller/WebAppController.php | 8 ++--- src/Forum/ForumServiceProvider.php | 6 ++-- src/Forum/WebApp.php | 12 ++++---- src/Foundation/Console/CacheClearCommand.php | 4 +-- .../AbstractFrontend.php} | 30 +++++++++---------- .../AbstractFrontendController.php} | 10 +++---- .../Asset/CompilerInterface.php | 2 +- src/{ => Frontend}/Asset/JsCompiler.php | 2 +- src/{ => Frontend}/Asset/LessCompiler.php | 2 +- .../Asset/LocaleJsCompiler.php} | 6 ++-- src/{ => Frontend}/Asset/RevisionCompiler.php | 2 +- .../FrontendAssets.php} | 10 +++---- .../FrontendAssetsFactory.php} | 8 ++--- .../FrontendView.php} | 16 +++++----- .../FrontendViewFactory.php} | 12 ++++---- 22 files changed, 84 insertions(+), 86 deletions(-) rename src/{Http/WebApp/AbstractWebApp.php => Frontend/AbstractFrontend.php} (85%) rename src/{Http/Controller/AbstractWebAppController.php => Frontend/AbstractFrontendController.php} (82%) rename src/{ => Frontend}/Asset/CompilerInterface.php (95%) rename src/{ => Frontend}/Asset/JsCompiler.php (98%) rename src/{ => Frontend}/Asset/LessCompiler.php (97%) rename src/{Locale/JsCompiler.php => Frontend/Asset/LocaleJsCompiler.php} (88%) rename src/{ => Frontend}/Asset/RevisionCompiler.php (99%) rename src/{Http/WebApp/WebAppAssets.php => Frontend/FrontendAssets.php} (94%) rename src/{Http/WebApp/WebAppAssetsFactory.php => Frontend/FrontendAssetsFactory.php} (84%) rename src/{Http/WebApp/WebAppView.php => Frontend/FrontendView.php} (96%) rename src/{Http/WebApp/WebAppViewFactory.php => Frontend/FrontendViewFactory.php} (81%) diff --git a/src/Admin/AdminServiceProvider.php b/src/Admin/AdminServiceProvider.php index 80713c37e..2cbd60a78 100644 --- a/src/Admin/AdminServiceProvider.php +++ b/src/Admin/AdminServiceProvider.php @@ -84,7 +84,7 @@ class AdminServiceProvider extends AbstractServiceProvider } /** - * @return \Flarum\Http\WebApp\WebAppAssets + * @return \Flarum\Frontend\FrontendAssets */ protected function getWebAppAssets() { diff --git a/src/Admin/Controller/FrontendController.php b/src/Admin/Controller/FrontendController.php index db8cc5c41..eb691f88f 100644 --- a/src/Admin/Controller/FrontendController.php +++ b/src/Admin/Controller/FrontendController.php @@ -15,12 +15,12 @@ use Flarum\Admin\Frontend; use Flarum\Core\Permission; use Flarum\Event\PrepareUnserializedSettings; use Flarum\Extension\ExtensionManager; -use Flarum\Http\Controller\AbstractWebAppController; +use Flarum\Frontend\AbstractFrontendController; use Flarum\Settings\SettingsRepositoryInterface; use Illuminate\Contracts\Events\Dispatcher; use Psr\Http\Message\ServerRequestInterface; -class FrontendController extends AbstractWebAppController +class FrontendController extends AbstractFrontendController { /** * @var SettingsRepositoryInterface diff --git a/src/Admin/Frontend.php b/src/Admin/Frontend.php index 65be577f0..b984e15e2 100644 --- a/src/Admin/Frontend.php +++ b/src/Admin/Frontend.php @@ -11,9 +11,9 @@ namespace Flarum\Admin; -use Flarum\Http\WebApp\AbstractWebApp; +use Flarum\Frontend\AbstractFrontend; -class Frontend extends AbstractWebApp +class Frontend extends AbstractFrontend { /** * {@inheritdoc} diff --git a/src/Event/ConfigureWebApp.php b/src/Event/ConfigureWebApp.php index 014672ffc..a7f26591e 100644 --- a/src/Event/ConfigureWebApp.php +++ b/src/Event/ConfigureWebApp.php @@ -12,20 +12,20 @@ namespace Flarum\Event; use Flarum\Admin\Controller\FrontendController as AdminWebAppController; -use Flarum\Forum\Controller\WebAppController as ForumWebAppController; -use Flarum\Http\Controller\AbstractWebAppController; -use Flarum\Http\WebApp\WebAppView; +use Flarum\Forum\Controller\FrontendController as ForumWebAppController; +use Flarum\Frontend\AbstractFrontendController; +use Flarum\Frontend\FrontendView; use Psr\Http\Message\ServerRequestInterface; class ConfigureWebApp { /** - * @var AbstractWebAppController + * @var AbstractFrontendController */ public $controller; /** - * @var WebAppView + * @var FrontendView */ public $view; @@ -35,11 +35,11 @@ class ConfigureWebApp public $request; /** - * @param AbstractWebAppController $controller - * @param WebAppView $view + * @param AbstractFrontendController $controller + * @param FrontendView $view * @param ServerRequestInterface $request */ - public function __construct(AbstractWebAppController $controller, WebAppView $view, ServerRequestInterface $request) + public function __construct(AbstractFrontendController $controller, FrontendView $view, ServerRequestInterface $request) { $this->controller = $controller; $this->view = $view; diff --git a/src/Forum/Controller/AuthorizedWebAppController.php b/src/Forum/Controller/AuthorizedWebAppController.php index 51131479f..05a5baf96 100644 --- a/src/Forum/Controller/AuthorizedWebAppController.php +++ b/src/Forum/Controller/AuthorizedWebAppController.php @@ -14,7 +14,7 @@ namespace Flarum\Forum\Controller; use Flarum\Core\Exception\PermissionDeniedException; use Psr\Http\Message\ServerRequestInterface as Request; -class AuthorizedWebAppController extends WebAppController +class AuthorizedWebAppController extends FrontendController { /** * {@inheritdoc} diff --git a/src/Forum/Controller/DiscussionController.php b/src/Forum/Controller/DiscussionController.php index ebc7ab0de..f12b1092e 100644 --- a/src/Forum/Controller/DiscussionController.php +++ b/src/Forum/Controller/DiscussionController.php @@ -14,12 +14,12 @@ namespace Flarum\Forum\Controller; use Flarum\Api\Client; use Flarum\Core\User; use Flarum\Forum\UrlGenerator; -use Flarum\Forum\WebApp; +use Flarum\Forum\Frontend; use Flarum\Http\Exception\RouteNotFoundException; use Illuminate\Contracts\Events\Dispatcher; use Psr\Http\Message\ServerRequestInterface as Request; -class DiscussionController extends WebAppController +class DiscussionController extends FrontendController { /** * @var ApiClient @@ -34,7 +34,7 @@ class DiscussionController extends WebAppController /** * {@inheritdoc} */ - public function __construct(WebApp $webApp, Dispatcher $events, Client $api, UrlGenerator $url) + public function __construct(Frontend $webApp, Dispatcher $events, Client $api, UrlGenerator $url) { parent::__construct($webApp, $events); diff --git a/src/Forum/Controller/IndexController.php b/src/Forum/Controller/IndexController.php index a4c059f34..8deeb7867 100644 --- a/src/Forum/Controller/IndexController.php +++ b/src/Forum/Controller/IndexController.php @@ -13,11 +13,11 @@ namespace Flarum\Forum\Controller; use Flarum\Api\Client as ApiClient; use Flarum\Core\User; -use Flarum\Forum\WebApp; +use Flarum\Forum\Frontend; use Illuminate\Contracts\Events\Dispatcher; use Psr\Http\Message\ServerRequestInterface as Request; -class IndexController extends WebAppController +class IndexController extends FrontendController { /** * @var ApiClient @@ -39,7 +39,7 @@ class IndexController extends WebAppController /** * {@inheritdoc} */ - public function __construct(WebApp $webApp, Dispatcher $events, ApiClient $api) + public function __construct(Frontend $webApp, Dispatcher $events, ApiClient $api) { parent::__construct($webApp, $events); diff --git a/src/Forum/Controller/WebAppController.php b/src/Forum/Controller/WebAppController.php index e24405150..ba863c019 100644 --- a/src/Forum/Controller/WebAppController.php +++ b/src/Forum/Controller/WebAppController.php @@ -11,16 +11,16 @@ namespace Flarum\Forum\Controller; -use Flarum\Forum\WebApp; -use Flarum\Http\Controller\AbstractWebAppController; +use Flarum\Forum\Frontend; +use Flarum\Frontend\AbstractFrontendController; use Illuminate\Contracts\Events\Dispatcher; -class WebAppController extends AbstractWebAppController +class FrontendController extends AbstractFrontendController { /** * {@inheritdoc} */ - public function __construct(WebApp $webApp, Dispatcher $events) + public function __construct(Frontend $webApp, Dispatcher $events) { $this->webApp = $webApp; $this->events = $events; diff --git a/src/Forum/ForumServiceProvider.php b/src/Forum/ForumServiceProvider.php index 43f4c2bed..4c1fa33f7 100644 --- a/src/Forum/ForumServiceProvider.php +++ b/src/Forum/ForumServiceProvider.php @@ -73,7 +73,7 @@ class ForumServiceProvider extends AbstractServiceProvider $routes->get( '/u/{username}[/{filter:[^/]*}]', 'user', - $route->toController(Controller\WebAppController::class) + $route->toController(Controller\FrontendController::class) ); $routes->get( @@ -164,10 +164,10 @@ class ForumServiceProvider extends AbstractServiceProvider } /** - * @return \Flarum\Http\WebApp\WebAppAssets + * @return \Flarum\Frontend\FrontendAssets */ protected function getWebAppAssets() { - return $this->app->make(WebApp::class)->getAssets(); + return $this->app->make(Frontend::class)->getAssets(); } } diff --git a/src/Forum/WebApp.php b/src/Forum/WebApp.php index 310532922..c59ce5345 100644 --- a/src/Forum/WebApp.php +++ b/src/Forum/WebApp.php @@ -12,13 +12,13 @@ namespace Flarum\Forum; use Flarum\Formatter\Formatter; -use Flarum\Http\WebApp\AbstractWebApp; -use Flarum\Http\WebApp\WebAppAssetsFactory; -use Flarum\Http\WebApp\WebAppViewFactory; +use Flarum\Frontend\AbstractFrontend; +use Flarum\Frontend\FrontendAssetsFactory; +use Flarum\Frontend\FrontendViewFactory; use Flarum\Locale\LocaleManager; use Flarum\Settings\SettingsRepositoryInterface; -class WebApp extends AbstractWebApp +class Frontend extends AbstractFrontend { /** * @var Formatter @@ -29,8 +29,8 @@ class WebApp extends AbstractWebApp * {@inheritdoc} */ public function __construct( - WebAppAssetsFactory $assets, - WebAppViewFactory $view, + FrontendAssetsFactory $assets, + FrontendViewFactory $view, SettingsRepositoryInterface $settings, LocaleManager $locales, Formatter $formatter diff --git a/src/Foundation/Console/CacheClearCommand.php b/src/Foundation/Console/CacheClearCommand.php index f669205bd..957c33478 100644 --- a/src/Foundation/Console/CacheClearCommand.php +++ b/src/Foundation/Console/CacheClearCommand.php @@ -13,7 +13,7 @@ namespace Flarum\Foundation\Console; use Flarum\Admin\Frontend as AdminWebApp; use Flarum\Console\AbstractCommand; -use Flarum\Forum\WebApp as ForumWebApp; +use Flarum\Forum\Frontend as ForumWebApp; use Illuminate\Contracts\Cache\Store; class CacheClearCommand extends AbstractCommand @@ -24,7 +24,7 @@ class CacheClearCommand extends AbstractCommand protected $cache; /** - * @var \Flarum\Forum\WebApp + * @var \Flarum\Forum\Frontend */ protected $forum; diff --git a/src/Http/WebApp/AbstractWebApp.php b/src/Frontend/AbstractFrontend.php similarity index 85% rename from src/Http/WebApp/AbstractWebApp.php rename to src/Frontend/AbstractFrontend.php index 0e2bc24aa..d556e81b8 100644 --- a/src/Http/WebApp/AbstractWebApp.php +++ b/src/Frontend/AbstractFrontend.php @@ -9,20 +9,20 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\WebApp; +namespace Flarum\Frontend; use Flarum\Locale\LocaleManager; use Flarum\Settings\SettingsRepositoryInterface; -abstract class AbstractWebApp +abstract class AbstractFrontend { /** - * @var WebAppAssetsFactory + * @var FrontendAssetsFactory */ protected $assets; /** - * @var WebAppViewFactory + * @var FrontendViewFactory */ protected $view; @@ -37,12 +37,12 @@ abstract class AbstractWebApp protected $locales; /** - * @param WebAppAssetsFactory $assets - * @param WebAppViewFactory $view + * @param FrontendAssetsFactory $assets + * @param FrontendViewFactory $view * @param SettingsRepositoryInterface $settings * @param LocaleManager $locales */ - public function __construct(WebAppAssetsFactory $assets, WebAppViewFactory $view, SettingsRepositoryInterface $settings, LocaleManager $locales) + public function __construct(FrontendAssetsFactory $assets, FrontendViewFactory $view, SettingsRepositoryInterface $settings, LocaleManager $locales) { $this->assets = $assets; $this->view = $view; @@ -51,7 +51,7 @@ abstract class AbstractWebApp } /** - * @return WebAppView + * @return FrontendView */ public function getView() { @@ -65,7 +65,7 @@ abstract class AbstractWebApp } /** - * @return WebAppAssets + * @return FrontendAssets */ public function getAssets() { @@ -100,9 +100,9 @@ abstract class AbstractWebApp } /** - * @param WebAppView $view + * @param FrontendView $view */ - private function addDefaultAssets(WebAppView $view) + private function addDefaultAssets(FrontendView $view) { $root = __DIR__.'/../../..'; $name = $this->getName(); @@ -112,9 +112,9 @@ abstract class AbstractWebApp } /** - * @param WebAppView $view + * @param FrontendView $view */ - private function addCustomLess(WebAppView $view) + private function addCustomLess(FrontendView $view) { $css = $view->getCss(); $localeCss = $view->getLocaleCss(); @@ -154,9 +154,9 @@ abstract class AbstractWebApp } /** - * @param WebAppView $view + * @param FrontendView $view */ - private function addTranslations(WebAppView $view) + private function addTranslations(FrontendView $view) { $translations = array_get($this->locales->getTranslator()->getMessages(), 'messages', []); diff --git a/src/Http/Controller/AbstractWebAppController.php b/src/Frontend/AbstractFrontendController.php similarity index 82% rename from src/Http/Controller/AbstractWebAppController.php rename to src/Frontend/AbstractFrontendController.php index a9af1f576..52eed3ac4 100644 --- a/src/Http/Controller/AbstractWebAppController.php +++ b/src/Frontend/AbstractFrontendController.php @@ -9,18 +9,18 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\Controller; +namespace Flarum\Frontend; use Flarum\Event\ConfigureClientView; use Flarum\Event\ConfigureWebApp; -use Flarum\Http\WebApp\AbstractWebApp; +use Flarum\Http\Controller\AbstractHtmlController; use Illuminate\Contracts\Events\Dispatcher; use Psr\Http\Message\ServerRequestInterface as Request; -abstract class AbstractWebAppController extends AbstractHtmlController +abstract class AbstractFrontendController extends AbstractHtmlController { /** - * @var AbstractWebApp + * @var AbstractFrontend */ protected $webApp; @@ -48,7 +48,7 @@ abstract class AbstractWebAppController extends AbstractHtmlController /** * @param Request $request - * @return \Flarum\Http\WebApp\WebAppView + * @return \Flarum\Frontend\FrontendView */ protected function getView(Request $request) { diff --git a/src/Asset/CompilerInterface.php b/src/Frontend/Asset/CompilerInterface.php similarity index 95% rename from src/Asset/CompilerInterface.php rename to src/Frontend/Asset/CompilerInterface.php index 5e65eb596..2fb113ab5 100644 --- a/src/Asset/CompilerInterface.php +++ b/src/Frontend/Asset/CompilerInterface.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Asset; +namespace Flarum\Frontend\Asset; interface CompilerInterface { diff --git a/src/Asset/JsCompiler.php b/src/Frontend/Asset/JsCompiler.php similarity index 98% rename from src/Asset/JsCompiler.php rename to src/Frontend/Asset/JsCompiler.php index 55771ead5..f99880a19 100644 --- a/src/Asset/JsCompiler.php +++ b/src/Frontend/Asset/JsCompiler.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Asset; +namespace Flarum\Frontend\Asset; use Exception; use Illuminate\Cache\Repository; diff --git a/src/Asset/LessCompiler.php b/src/Frontend/Asset/LessCompiler.php similarity index 97% rename from src/Asset/LessCompiler.php rename to src/Frontend/Asset/LessCompiler.php index 382a1b210..e1b74af0c 100644 --- a/src/Asset/LessCompiler.php +++ b/src/Frontend/Asset/LessCompiler.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Asset; +namespace Flarum\Frontend\Asset; use Less_Exception_Parser; use Less_Parser; diff --git a/src/Locale/JsCompiler.php b/src/Frontend/Asset/LocaleJsCompiler.php similarity index 88% rename from src/Locale/JsCompiler.php rename to src/Frontend/Asset/LocaleJsCompiler.php index db1d0b1e5..87b3d52a2 100644 --- a/src/Locale/JsCompiler.php +++ b/src/Frontend/Asset/LocaleJsCompiler.php @@ -9,11 +9,9 @@ * file that was distributed with this source code. */ -namespace Flarum\Locale; +namespace Flarum\Frontend\Asset; -use Flarum\Asset\JsCompiler as BaseJsCompiler; - -class JsCompiler extends BaseJsCompiler +class LocaleJsCompiler extends JsCompiler { protected $translations = []; diff --git a/src/Asset/RevisionCompiler.php b/src/Frontend/Asset/RevisionCompiler.php similarity index 99% rename from src/Asset/RevisionCompiler.php rename to src/Frontend/Asset/RevisionCompiler.php index 3993b90a7..74670af1f 100644 --- a/src/Asset/RevisionCompiler.php +++ b/src/Frontend/Asset/RevisionCompiler.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Asset; +namespace Flarum\Frontend\Asset; class RevisionCompiler implements CompilerInterface { diff --git a/src/Http/WebApp/WebAppAssets.php b/src/Frontend/FrontendAssets.php similarity index 94% rename from src/Http/WebApp/WebAppAssets.php rename to src/Frontend/FrontendAssets.php index 92a7539be..e3bce2f16 100644 --- a/src/Http/WebApp/WebAppAssets.php +++ b/src/Frontend/FrontendAssets.php @@ -9,16 +9,16 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\WebApp; +namespace Flarum\Frontend; -use Flarum\Asset\JsCompiler; -use Flarum\Asset\LessCompiler; +use Flarum\Frontend\Asset\JsCompiler; +use Flarum\Frontend\Asset\LessCompiler; use Flarum\Foundation\Application; -use Flarum\Locale\JsCompiler as LocaleJsCompiler; +use Flarum\Frontend\Asset\LocaleJsCompiler as LocaleJsCompiler; use Flarum\Locale\LocaleManager; use Illuminate\Contracts\Cache\Repository; -class WebAppAssets +class FrontendAssets { /** * @var string diff --git a/src/Http/WebApp/WebAppAssetsFactory.php b/src/Frontend/FrontendAssetsFactory.php similarity index 84% rename from src/Http/WebApp/WebAppAssetsFactory.php rename to src/Frontend/FrontendAssetsFactory.php index cb32ed30f..781963c41 100644 --- a/src/Http/WebApp/WebAppAssetsFactory.php +++ b/src/Frontend/FrontendAssetsFactory.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\WebApp; +namespace Flarum\Frontend; use Flarum\Foundation\Application; use Flarum\Locale\LocaleManager; use Illuminate\Contracts\Cache\Repository; -class WebAppAssetsFactory +class FrontendAssetsFactory { /** * @var Application @@ -46,10 +46,10 @@ class WebAppAssetsFactory /** * @param string $name - * @return WebAppAssets + * @return FrontendAssets */ public function make($name) { - return new WebAppAssets($name, $this->app, $this->cache, $this->locales); + return new FrontendAssets($name, $this->app, $this->cache, $this->locales); } } diff --git a/src/Http/WebApp/WebAppView.php b/src/Frontend/FrontendView.php similarity index 96% rename from src/Http/WebApp/WebAppView.php rename to src/Frontend/FrontendView.php index d38e95839..f564443ea 100644 --- a/src/Http/WebApp/WebAppView.php +++ b/src/Frontend/FrontendView.php @@ -9,13 +9,13 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\WebApp; +namespace Flarum\Frontend; use Flarum\Api\Client; use Flarum\Api\Serializer\AbstractSerializer; -use Flarum\Asset\CompilerInterface; +use Flarum\Frontend\Asset\CompilerInterface; use Flarum\Foundation\Application; -use Flarum\Locale\JsCompiler; +use Flarum\Frontend\Asset\LocaleJsCompiler; use Flarum\Locale\LocaleManager; use Illuminate\View\Factory; use Psr\Http\Message\ServerRequestInterface as Request; @@ -25,7 +25,7 @@ use Tobscure\JsonApi\Resource; /** * This class represents a view which boots up Flarum's client. */ -class WebAppView +class FrontendView { /** * The title of the document, displayed in the tag. @@ -135,7 +135,7 @@ class WebAppView protected $localeCss; /** - * @var WebAppAssets + * @var FrontendAssets */ protected $assets; @@ -166,14 +166,14 @@ class WebAppView /** * @param string $layout - * @param WebAppAssets $assets + * @param FrontendAssets $assets * @param Client $api * @param Factory $view * @param LocaleManager $locales * @param AbstractSerializer $userSerializer * @param Application $app */ - public function __construct($layout, WebAppAssets $assets, Client $api, Factory $view, LocaleManager $locales, AbstractSerializer $userSerializer, Application $app) + public function __construct($layout, FrontendAssets $assets, Client $api, Factory $view, LocaleManager $locales, AbstractSerializer $userSerializer, Application $app) { $this->layout = $layout; $this->api = $api; @@ -397,7 +397,7 @@ class WebAppView } /** - * @return JsCompiler + * @return LocaleJsCompiler */ public function getLocaleJs() { diff --git a/src/Http/WebApp/WebAppViewFactory.php b/src/Frontend/FrontendViewFactory.php similarity index 81% rename from src/Http/WebApp/WebAppViewFactory.php rename to src/Frontend/FrontendViewFactory.php index 037a162e9..82682c22a 100644 --- a/src/Http/WebApp/WebAppViewFactory.php +++ b/src/Frontend/FrontendViewFactory.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Http\WebApp; +namespace Flarum\Frontend; use Flarum\Api\Client; use Flarum\Api\Serializer\CurrentUserSerializer; @@ -17,7 +17,7 @@ use Flarum\Foundation\Application; use Flarum\Locale\LocaleManager; use Illuminate\Contracts\View\Factory; -class WebAppViewFactory +class FrontendViewFactory { /** * @var Client @@ -62,11 +62,11 @@ class WebAppViewFactory /** * @param string $layout - * @param WebAppAssets $assets - * @return WebAppView + * @param FrontendAssets $assets + * @return FrontendView */ - public function make($layout, WebAppAssets $assets) + public function make($layout, FrontendAssets $assets) { - return new WebAppView($layout, $assets, $this->api, $this->view, $this->locales, $this->userSerializer, $this->app); + return new FrontendView($layout, $assets, $this->api, $this->view, $this->locales, $this->userSerializer, $this->app); } }