replace psr middleware interface. some update

Author: inhere

composer.json

@@ -13,7 +13,7 @@
     }
   ],
   "require": {
-    "php": ">=7.0.0",
+    "php": ">7.0.0",
     "psr/http-server-middleware": "^1.0"
   },
   "autoload": {

examples/app.php renamed to example/app.php

@@ -7,11 +7,11 @@
  */
 
 use Inhere\Http\HttpFactory;
-use Inhere\Library\Helpers\Http;
+use Inhere\Http\HttpUtil;
 use Inhere\Middleware\MiddlewareStackAwareTrait;
-use Inhere\Middleware\RequestHandlerInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Inhere\Route\ORouter;
-use Inhere\Route\RouterInterface;
+use Inhere\Route\Base\RouterInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -29,7 +29,7 @@ public function run(ServerRequestInterface $request)
     {
         $response = $this->callStack($request);
 
-        Http::respond($response);
+        HttpUtil::respond($response);
     }
 
     /**

examples/test.php renamed to example/test.php

@@ -6,11 +6,10 @@
  * Time: 下午10:04
  */
 
-use Inhere\Http\Body;
 use Inhere\Http\HttpFactory;
 use Inhere\Middleware\MiddlewareStack;
-use Inhere\Middleware\RequestHandlerInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 require dirname(__DIR__) . '/../../autoload.php';
 
@@ -39,25 +38,28 @@ function (ServerRequestInterface $request, RequestHandlerInterface $handler) {
         $res = $handler->handle($request);
         $res->getBody()->write(' + node 1');
         echo "1 after >>> \n";
+
         return $res;
     },
     function (ServerRequestInterface $request, RequestHandlerInterface $handler) {
         echo ">>> 2 before \n";
         $res = $handler->handle($request);
         $res->getBody()->write(' + node 2');
         echo "2 after >>> \n";
+
         return $res;
     },
     function (ServerRequestInterface $request, RequestHandlerInterface $handler) {
         echo ">>> 3 before \n";
         $res = $handler->handle($request);
         $res->getBody()->write(' + node 3');
         echo "3 after >>> \n";
+
         return $res;
     },
     function (ServerRequestInterface $request, RequestHandlerInterface $handler) {
-//        $res = HttpFactory::createResponse();
-//        $res->getBody()->write('content');
+       // $res = HttpFactory::createResponse();
+       // $res->getBody()->write('content');
 
         echo ">>> 4 before \n";
         $res = $handler->handle($request);
@@ -71,10 +73,12 @@ function (ServerRequestInterface $request, RequestHandlerInterface $handler) {
 
 $request = HttpFactory::createServerRequest('GET', 'http://www.abc.com/home');
 
-$chain->setCoreHandler(function (ServerRequestInterface $request) {
+$chain->setCoreHandler(function () {
     echo " (this is core)\n";
+    $res = HttpFactory::createResponse();
+    $res->getBody()->write('-CORE-');
 
-    return HttpFactory::createResponse()->write('-CORE-');
+    return $res;
 });
 
 $res = $chain($request);

phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="./tests/boot.php"
+         bootstrap="test/boot.php"
          colors="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
@@ -12,13 +12,13 @@
 >
     <testsuites>
         <testsuite name="Inhere Middleware Test Suite">
-            <directory>./tests/</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory suffix=".php">./examples</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>

src/MiddlewareInterface.php

@@ -10,6 +10,8 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Class MiddlewareChain

src/MiddlewareStack.php

@@ -10,6 +10,8 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Trait MiddlewareChainAwareTrait
@@ -125,7 +127,9 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
 
         if (!$response instanceof ResponseInterface) {
-            throw new \UnexpectedValueException('Middleware must return instance of \Psr\Http\Message\ResponseInterface');
+            throw new \UnexpectedValueException(
+                'Middleware must return object and instance of \Psr\Http\Message\ResponseInterface'
+            );
         }
 
         return $response;