Merge pull request #71 from mnapoli/update-from-psr

Update interfaces to the latest version of PSR-15

Author: shadowhand

composer.json

@@ -23,7 +23,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Interop\\Http\\ServerMiddleware\\": "src/"
+            "Interop\\Http\\Server\\": "src/"
         }
     },
     "extra": {

src/DelegateInterface.php

@@ -1,20 +1,25 @@
 <?php
 
-namespace Interop\Http\ServerMiddleware;
+namespace Interop\Http\Server;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
+/**
+ * An HTTP middleware component participates in processing an HTTP message,
+ * either by acting on the request or the response. This interface defines the
+ * methods required to use the middleware.
+ */
 interface MiddlewareInterface
 {
     /**
      * Process an incoming server request and return a response, optionally delegating
-     * to the next middleware component to create the response.
+     * response creation to a handler.
      *
      * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
      *
      * @return ResponseInterface
      */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate);
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler);
 }

src/MiddlewareInterface.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Interop\Http\Server;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * An HTTP request handler process a HTTP request and produces an HTTP response.
+ * This interface defines the methods require to use the request handler.
+ */
+interface RequestHandlerInterface
+{
+    /**
+     * Handle the request and return a response.
+     *
+     * @param ServerRequestInterface $request
+     *
+     * @return ResponseInterface
+     */
+    public function handle(ServerRequestInterface $request);
+}