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

Fix test and extender for middleware (#2084)

Browse Source
This commit is contained in:
Matt Kilgore 2020-03-27 06:00:30 -04:00 committed by GitHub
parent 13e20c2ced
commit b0fd63adc3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ class Middleware implements ExtenderInterface
foreach ($this->insertBeforeMiddlewares as $originalMiddleware => $newMiddleware) { foreach ($this->insertBeforeMiddlewares as $originalMiddleware => $newMiddleware) {
array_splice( array_splice(
$existingMiddleware, $existingMiddleware,
array_search($originalMiddleware, $existingMiddleware) + 1, array_search($originalMiddleware, $existingMiddleware),
0, 0,
$newMiddleware $newMiddleware
); );
@ -90,7 +90,7 @@ class Middleware implements ExtenderInterface
foreach ($this->insertAfterMiddlewares as $originalMiddleware => $newMiddleware) { foreach ($this->insertAfterMiddlewares as $originalMiddleware => $newMiddleware) {
array_splice( array_splice(
$existingMiddleware, $existingMiddleware,
array_search($originalMiddleware, $existingMiddleware), array_search($originalMiddleware, $existingMiddleware) + 1,
0, 0,
$newMiddleware $newMiddleware
); );

4
framework/core/tests/integration/extenders/MiddlewareTest.php
View File

@ -101,7 +101,7 @@ class MiddlewareTest extends TestCase
$originalMiddlewarePosition = array_search('X-First-Test-Middleware', array_keys($headers)); $originalMiddlewarePosition = array_search('X-First-Test-Middleware', array_keys($headers));
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode());
$this->assertLessThan($originalMiddlewarePosition, $newMiddlewarePosition); $this->assertLessThan($newMiddlewarePosition, $originalMiddlewarePosition);
} }
/** /**
@ -120,7 +120,7 @@ class MiddlewareTest extends TestCase
$originalMiddlewarePosition = array_search('X-First-Test-Middleware', array_keys($headers)); $originalMiddlewarePosition = array_search('X-First-Test-Middleware', array_keys($headers));
$this->assertEquals(200, $response->getStatusCode()); $this->assertEquals(200, $response->getStatusCode());
$this->assertGreaterThan($originalMiddlewarePosition, $newMiddlewarePosition); $this->assertGreaterThan($newMiddlewarePosition, $originalMiddlewarePosition);
} }
} }