From b0fd63adc3ebac162af28cc64180828d5b00c78c Mon Sep 17 00:00:00 2001 From: Matt Kilgore Date: Fri, 27 Mar 2020 06:00:30 -0400 Subject: [PATCH] Fix test and extender for middleware (#2084) --- framework/core/src/Extend/Middleware.php | 4 ++-- framework/core/tests/integration/extenders/MiddlewareTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/core/src/Extend/Middleware.php b/framework/core/src/Extend/Middleware.php index 2dad16a4e..4022f7908 100644 --- a/framework/core/src/Extend/Middleware.php +++ b/framework/core/src/Extend/Middleware.php @@ -81,7 +81,7 @@ class Middleware implements ExtenderInterface foreach ($this->insertBeforeMiddlewares as $originalMiddleware => $newMiddleware) { array_splice( $existingMiddleware, - array_search($originalMiddleware, $existingMiddleware) + 1, + array_search($originalMiddleware, $existingMiddleware), 0, $newMiddleware ); @@ -90,7 +90,7 @@ class Middleware implements ExtenderInterface foreach ($this->insertAfterMiddlewares as $originalMiddleware => $newMiddleware) { array_splice( $existingMiddleware, - array_search($originalMiddleware, $existingMiddleware), + array_search($originalMiddleware, $existingMiddleware) + 1, 0, $newMiddleware ); diff --git a/framework/core/tests/integration/extenders/MiddlewareTest.php b/framework/core/tests/integration/extenders/MiddlewareTest.php index dca895be6..3057a3dd7 100644 --- a/framework/core/tests/integration/extenders/MiddlewareTest.php +++ b/framework/core/tests/integration/extenders/MiddlewareTest.php @@ -101,7 +101,7 @@ class MiddlewareTest extends TestCase $originalMiddlewarePosition = array_search('X-First-Test-Middleware', array_keys($headers)); $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)); $this->assertEquals(200, $response->getStatusCode()); - $this->assertGreaterThan($originalMiddlewarePosition, $newMiddlewarePosition); + $this->assertGreaterThan($newMiddlewarePosition, $originalMiddlewarePosition); } }