github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-06 06:43:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove deprecated ConfigureMiddleware Event (#2032)

Browse Source
This commit is contained in:
Franz Liedke 2020-03-04 23:02:05 +01:00 committed by GitHub
parent f6b4985347
commit 00e4b44abc
4 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/src/Admin/AdminServiceProvider.php
View File

@ -9,7 +9,6 @@
namespace Flarum\Admin; namespace Flarum\Admin;
use Flarum\Event\ConfigureMiddleware;
use Flarum\Extension\Event\Disabled; use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled; use Flarum\Extension\Event\Enabled;
use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\AbstractServiceProvider;
@ -75,8 +74,6 @@ class AdminServiceProvider extends AbstractServiceProvider
$pipe->pipe($this->app->make($middleware)); $pipe->pipe($this->app->make($middleware));
} }
event(new ConfigureMiddleware($pipe, 'admin'));
$pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.admin.routes'))); $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.admin.routes')));
return $pipe; return $pipe;

3
framework/core/src/Api/ApiServiceProvider.php
View File

@ -14,7 +14,6 @@ use Flarum\Api\Serializer\AbstractSerializer;
use Flarum\Api\Serializer\BasicDiscussionSerializer; use Flarum\Api\Serializer\BasicDiscussionSerializer;
use Flarum\Api\Serializer\NotificationSerializer; use Flarum\Api\Serializer\NotificationSerializer;
use Flarum\Event\ConfigureApiRoutes; use Flarum\Event\ConfigureApiRoutes;
use Flarum\Event\ConfigureMiddleware;
use Flarum\Event\ConfigureNotificationTypes; use Flarum\Event\ConfigureNotificationTypes;
use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Foundation\Application; use Flarum\Foundation\Application;
@ -71,8 +70,6 @@ class ApiServiceProvider extends AbstractServiceProvider
$pipe->pipe($this->app->make($middleware)); $pipe->pipe($this->app->make($middleware));
} }
event(new ConfigureMiddleware($pipe, 'api'));
$pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.api.routes'))); $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.api.routes')));
return $pipe; return $pipe;

58
framework/core/src/Event/ConfigureMiddleware.php
View File

@ -1,58 +0,0 @@
<?php
/*
* This file is part of Flarum.
*
* For detailed copyright and license information, please view the
* LICENSE file that was distributed with this source code.
*/
namespace Flarum\Event;
use Laminas\Stratigility\MiddlewarePipe;
/**
* @deprecated
*/
class ConfigureMiddleware
{
/**
* @var MiddlewarePipe
*/
public $pipe;
/**
* @var string
*/
public $stackName;
/**
* @param MiddlewarePipe $pipe
* @param string $stackName
*/
public function __construct(MiddlewarePipe $pipe, $stackName)
{
$this->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';
}
}

3
framework/core/src/Forum/ForumServiceProvider.php
View File

@ -10,7 +10,6 @@
namespace Flarum\Forum; namespace Flarum\Forum;
use Flarum\Event\ConfigureForumRoutes; use Flarum\Event\ConfigureForumRoutes;
use Flarum\Event\ConfigureMiddleware;
use Flarum\Extension\Event\Disabled; use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled; use Flarum\Extension\Event\Enabled;
use Flarum\Formatter\Formatter; use Flarum\Formatter\Formatter;
@ -86,8 +85,6 @@ class ForumServiceProvider extends AbstractServiceProvider
$pipe->pipe($this->app->make($middleware)); $pipe->pipe($this->app->make($middleware));
} }
event(new ConfigureMiddleware($pipe, 'forum'));
$pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.forum.routes'))); $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.forum.routes')));
return $pipe; return $pipe;