diff --git a/framework/core/src/Admin/AdminServiceProvider.php b/framework/core/src/Admin/AdminServiceProvider.php index f9a9c6f7c..496ca5473 100644 --- a/framework/core/src/Admin/AdminServiceProvider.php +++ b/framework/core/src/Admin/AdminServiceProvider.php @@ -9,7 +9,6 @@ namespace Flarum\Admin; -use Flarum\Event\ConfigureMiddleware; use Flarum\Extension\Event\Disabled; use Flarum\Extension\Event\Enabled; use Flarum\Foundation\AbstractServiceProvider; @@ -75,8 +74,6 @@ class AdminServiceProvider extends AbstractServiceProvider $pipe->pipe($this->app->make($middleware)); } - event(new ConfigureMiddleware($pipe, 'admin')); - $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.admin.routes'))); return $pipe; diff --git a/framework/core/src/Api/ApiServiceProvider.php b/framework/core/src/Api/ApiServiceProvider.php index 398a037ff..d77d9c2b3 100644 --- a/framework/core/src/Api/ApiServiceProvider.php +++ b/framework/core/src/Api/ApiServiceProvider.php @@ -14,7 +14,6 @@ use Flarum\Api\Serializer\AbstractSerializer; use Flarum\Api\Serializer\BasicDiscussionSerializer; use Flarum\Api\Serializer\NotificationSerializer; use Flarum\Event\ConfigureApiRoutes; -use Flarum\Event\ConfigureMiddleware; use Flarum\Event\ConfigureNotificationTypes; use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\Application; @@ -71,8 +70,6 @@ class ApiServiceProvider extends AbstractServiceProvider $pipe->pipe($this->app->make($middleware)); } - event(new ConfigureMiddleware($pipe, 'api')); - $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.api.routes'))); return $pipe; diff --git a/framework/core/src/Event/ConfigureMiddleware.php b/framework/core/src/Event/ConfigureMiddleware.php deleted file mode 100644 index 1a7e87757..000000000 --- a/framework/core/src/Event/ConfigureMiddleware.php +++ /dev/null @@ -1,58 +0,0 @@ -pipe = $pipe; - $this->stackName = $stackName; - } - - public function pipe($middleware) - { - $this->pipe->pipe($middleware); - } - - public function isForum() - { - return $this->stackName === 'forum'; - } - - public function isAdmin() - { - return $this->stackName === 'admin'; - } - - public function isApi() - { - return $this->stackName === 'api'; - } -} diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php index 7e4061a17..4d63486bc 100644 --- a/framework/core/src/Forum/ForumServiceProvider.php +++ b/framework/core/src/Forum/ForumServiceProvider.php @@ -10,7 +10,6 @@ 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; @@ -86,8 +85,6 @@ class ForumServiceProvider extends AbstractServiceProvider $pipe->pipe($this->app->make($middleware)); } - event(new ConfigureMiddleware($pipe, 'forum')); - $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.forum.routes'))); return $pipe;