mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-26 03:01:22 +02:00
Code Issues Releases Wiki Activity

Additional functionality for Middleware extender

Browse Source 
Implements the remove, insertBefore, insertAfter and replace
functionality for middlewares.

The IoC container now holds one array of middleware (bindings) per
frontend stack - the extender operates on that array, before it is
wrapped in a middleware "pipe".

Fixes #1957, closes #1971.
This commit is contained in:
Matthew Kilgore
2020-01-24 21:20:08 +01:00
committed by Franz Liedke
parent 6f6958dd6b
commit 93c6babc61
5 changed files with 125 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
framework/core/src/Extend/Middleware.php
View File

@@ -11,11 +11,14 @@ namespace Flarum\Extend;
use Flarum\Extension\Extension;
use Illuminate\Contracts\Container\Container;
use Laminas\Stratigility\MiddlewarePipe;
class Middleware implements ExtenderInterface
{
protected $middlewares = [];
protected $addMiddlewares = [];
protected $removeMiddlewares = [];
protected $replaceMiddlewares = [];
protected $insertBeforeMiddlewares = [];
protected $insertAfterMiddlewares = [];
protected $frontend;
public function __construct(string $frontend)
@@ -25,17 +28,74 @@ class Middleware implements ExtenderInterface
public function add($middleware)
{
$this->middlewares[] = $middleware;
$this->addMiddlewares[] = $middleware;
return $this;
}
public function replace($originalMiddleware, $newMiddleware)
{
$this->replaceMiddlewares[$originalMiddleware] = $newMiddleware;
return $this;
}
public function remove($middleware)
{
$this->removeMiddlewares[] = $middleware;
return $this;
}
public function insertBefore($originalMiddleware, $newMiddleware)
{
$this->replaceMiddlewares[$originalMiddleware] = $newMiddleware;
return $this;
}
public function insertAfter($originalMiddleware, $newMiddleware)
{
$this->replaceMiddlewares[$originalMiddleware] = $newMiddleware;
return $this;
}
public function extend(Container $container, Extension $extension = null)
{
$container->resolving("flarum.{$this->frontend}.middleware", function (MiddlewarePipe $pipe) use ($container) {
foreach ($this->middlewares as $middleware) {
$pipe->pipe($container->make($middleware));
$container->extend("flarum.{$this->frontend}.middleware", function ($existingMiddleware) {
foreach ($this->addMiddlewares as $addMiddleware) {
$existingMiddleware[] = $addMiddleware;
}
foreach ($this->replaceMiddlewares as $originalMiddleware => $newMiddleware) {
$existingMiddleware = array_replace($existingMiddleware,
array_fill_keys(
array_keys($existingMiddleware, $originalMiddleware),
$newMiddleware
)
);
}
foreach ($this->insertBeforeMiddlewares as $originalMiddleware => $newMiddleware) {
array_splice($existingMiddleware,
array_search($originalMiddleware, $existingMiddleware),
0,
$newMiddleware
);
}
foreach ($this->insertAfterMiddlewares as $originalMiddleware => $newMiddleware) {
array_splice($existingMiddleware,
array_search($originalMiddleware, $existingMiddleware) + 1,
0,
$newMiddleware
);
}
$existingMiddleware = array_diff($existingMiddleware, $this->removeMiddlewares);
return $existingMiddleware;
});
}
}