Fix issue if ServerRequestInterface is an argument

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to `Slytherin` will be documented in this file.
 ### Fixed
 - Type hinting of all classes using `PHPStan`
 - Checking of available instances in `Container::value`
+- Changed `ServerRequestInterface` in middleware does not reflect if the said interface is defined as an argument
 
 ## [0.9.6](https://github.com/rougin/slytherin/compare/v0.9.5...v0.9.6) - 2023-11-16
 

src/Application/FinalCallback.php

@@ -16,6 +16,8 @@
  */
 class FinalCallback
 {
+    const REQUEST = 'Psr\Http\Message\ServerRequestInterface';
+
     const RESPONSE = 'Psr\Http\Message\ResponseInterface';
 
     /**
@@ -54,6 +56,10 @@ public function __invoke(ServerRequestInterface $request)
             return $this->finalize($this->function);
         }
 
+        // Attach the request again in the container to reflect from stack ---
+        $this->container->set(self::REQUEST, $request);
+        // -------------------------------------------------------------------
+
         /** @var array<int, \Closure|string|array<int, string>> */
         $function = $this->function;
 

tests/Forward/Fixture/Builder.php → tests/Sample/Builder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rougin\Slytherin\Forward\Fixture;
+namespace Rougin\Slytherin\Sample;
 
 use Rougin\Slytherin\Application;
 use Rougin\Slytherin\Configuration;
@@ -16,23 +16,46 @@ class Builder
 
     protected $files = array();
 
+    protected $handlers = array();
+
     protected $query = array();
 
     protected $parsed = array();
 
     protected $server = array();
 
+    public function addHandler($handler)
+    {
+        $this->handlers[] = $handler;
+
+        return $this;
+    }
+
     public function make()
     {
         $config = new Configuration;
 
         $config->load(__DIR__ . '/Config');
 
+        // Set the server request globals -----------------
         $config->set('app.http.cookies', $this->cookies);
+
         $config->set('app.http.files', $this->files);
-        $config->set('app.http.get', $this->query);
+
+        $config->set('app.http.get', (array) $this->query);
+
         $config->set('app.http.post', $this->parsed);
+
         $config->set('app.http.server', $this->server);
+        // ------------------------------------------------
+
+        // Set the custom middlewares ----------------
+        $items = $config->get('app.middlewares');
+
+        $items = array_merge($items, $this->handlers);
+
+        $config->set('app.middlewares', $items);
+        // -------------------------------------------
 
         $container = new Container;
 

tests/Sample/Config/app.php

@@ -0,0 +1,27 @@
+<?php
+
+use Rougin\Slytherin\Sample\Router;
+
+$packages = array();
+
+// Testing Packages -----------------------------------------------
+$packages[] = 'Rougin\Slytherin\Sample\Packages\HttpPackage';
+$packages[] = 'Rougin\Slytherin\Sample\Packages\MiddlewarePackage';
+$packages[] = 'Rougin\Slytherin\Sample\Packages\RoutingPackage';
+// ----------------------------------------------------------------
+
+$config = array('name' => 'Slytherin');
+
+$config['base_url'] = 'http://localhost:8000';
+
+$config['environment'] = 'development';
+
+$config['timezone'] = 'Asia/Manila';
+
+$config['router'] = new Router;
+
+$config['middlewares'] = array();
+
+$config['packages'] = $packages;
+
+return (array) $config;

tests/Forward/Fixture/Depots/SestDepot.php → tests/Sample/Depots/SestDepot.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rougin\Slytherin\Forward\Fixture\Depots;
+namespace Rougin\Slytherin\Sample\Depots;
 
 /**
  * @package Slytherin

tests/Forward/Fixture/Depots/TestDepot.php → tests/Sample/Depots/TestDepot.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rougin\Slytherin\Forward\Fixture\Depots;
+namespace Rougin\Slytherin\Sample\Depots;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

tests/Sample/Handlers/Parsed.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Rougin\Slytherin\Sample\Handlers;
+
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * @package Slytherin
+ * @author  Rougin Gutib <rougingutib@gmail.com>
+ */
+class Parsed implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    {
+        $data = array('name' => 'Slytherin');
+
+        $request = $request->withParsedBody($data);
+
+        return $delegate->process($request);
+    }
+}

tests/Sample/Handlers/ToJson.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rougin\Slytherin\Sample\Handlers;
+
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * @package Slytherin
+ * @author  Rougin Gutib <rougingutib@gmail.com>
+ */
+class ToJson implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    {
+        $response = $delegate->process($request);
+
+        return $response->withHeader('Content-Type', 'application/json');
+    }
+}

tests/Forward/Fixture/Packages/HttpPackage.php → tests/Sample/Packages/HttpPackage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rougin\Slytherin\Forward\Fixture\Packages;
+namespace Rougin\Slytherin\Sample\Packages;
 
 use Rougin\Slytherin\Http\HttpIntegration;
 

tests/Forward/Fixture/Packages/MiddlewarePackage.php → tests/Sample/Packages/MiddlewarePackage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rougin\Slytherin\Forward\Fixture\Packages;
+namespace Rougin\Slytherin\Sample\Packages;
 
 use Rougin\Slytherin\Middleware\MiddlewareIntegration;
 

tests/Forward/Fixture/Packages/RoutingPackage.php → tests/Sample/Packages/RoutingPackage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rougin\Slytherin\Forward\Fixture\Packages;
+namespace Rougin\Slytherin\Sample\Packages;
 
 use Rougin\Slytherin\Routing\RoutingIntegration;