added per element update of foudnatio headers

jshannon63 · Dec 1, 2017 · 3f383b4 · 3f383b4
1 parent 2cea600
commit 3f383b4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/Psr15MiddlewareDispatcher.php b/src/Psr15MiddlewareDispatcher.php
@@ -33,6 +33,22 @@ function ($carry, $item) use ($psr7request, $requestHandler) {
             $requestHandler->handle($psr7request)
         );
 
-        return (new HttpFoundationFactory())->createResponse($psr7response);
+        return $this->convertResponse($psr7response, $response);
     }
-}
+
+    private function convertResponse($psr7response, $original)
+    {
+        $foundation_response = (new HttpFoundationFactory())->createResponse($psr7response);
+
+        foreach ($foundation_response->headers as $key => $value) {
+            $original->headers->set($key, $value);
+        }
+        $original->setContent($foundation_response->getContent());
+        $original->setProtocolVersion($foundation_response->getProtocolVersion());
+        $original->setStatusCode($foundation_response->getStatusCode());
+        $original->setCharset($foundation_response->getCharset());
+
+        return $original;
+    }
+}
+
diff --git a/src/Psr15MiddlewareServiceProvider.php b/src/Psr15MiddlewareServiceProvider.php
@@ -25,7 +25,7 @@ public function boot()
                 $this->app->singleton('Psr15Middleware', function () use ($config) {
                     return new \Jshannon63\Psr15Middleware\Psr15Middleware($config, 'middleware');
                 });
-                $this->app[\Illuminate\Contracts\Http\Kernel::class]->prependMiddleware('Psr15Middleware');
+                $this->app[\Illuminate\Contracts\Http\Kernel::class]->pushMiddleware('Psr15Middleware');
             }
 
             foreach ($config->get('psr15middleware.groups') as $key => $group) {
@@ -35,7 +35,7 @@ public function boot()
                 $this->app->singleton('Psr15MiddlewareGroup'.title_case($key), function () use ($config, $key) {
                     return new \Jshannon63\Psr15Middleware\Psr15Middleware($config, 'groups.'.$key);
                 });
-                $this->app['router']->prependMiddlewareToGroup($key, 'Psr15MiddlewareGroup'.title_case($key));
+                $this->app['router']->pushMiddlewareToGroup($key, 'Psr15MiddlewareGroup'.title_case($key));
             }
 
             foreach ($config->get('psr15middleware.aliases') as $key => $alias) {