adding psr-15

composer.json

@@ -42,6 +42,7 @@
         "egulias/email-validator"                            : "^2.1",
         "filp/whoops"                                        : "^2.0",
         "http-interop/http-factory"                          : "dev-master",
+        "http-interop/http-middleware"                       : "^0.2",
         "league/flysystem"                                   : "^1.0.27",
         "monolog/monolog"                                    : "^1.17",
         "narrowspark/arr"                                    : "^2.1",

src/Viserio/Contracts/Routing/Route.php

@@ -2,9 +2,9 @@
 declare(strict_types=1);
 namespace Viserio\Contracts\Routing;
 
+use Interop\Http\Middleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Viserio\Contracts\Middleware\Middleware as MiddlewareContract;
 
 interface Route
 {
@@ -60,14 +60,14 @@ public function where($name, string $expression = null): Route;
      *
      * @return $this
      */
-    public function withMiddleware(MiddlewareContract $middleware): Route;
+    public function withMiddleware(MiddlewareInterface $middleware): Route;
 
     /**
      * Remove a middleware from route.
      *
      * @return $this
      */
-    public function withoutMiddleware(MiddlewareContract $middleware): Route;
+    public function withoutMiddleware(MiddlewareInterface $middleware): Route;
 
     /**
      * Get all middleware, including the ones from the controller.

src/Viserio/Contracts/Routing/Router.php

@@ -2,9 +2,9 @@
 declare(strict_types=1);
 namespace Viserio\Contracts\Routing;
 
+use Interop\Http\Middleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Viserio\Contracts\Middleware\Middleware as MiddlewareContract;
 
 interface Router
 {
@@ -170,14 +170,14 @@ public function getParameters(): array;
      *
      * @return $this
      */
-    public function withMiddleware(MiddlewareContract $middleware): Router;
+    public function withMiddleware(MiddlewareInterface $middleware): Router;
 
     /**
      * Remove a middleware from all routes.
      *
      * @return $this
      */
-    public function withoutMiddleware(MiddlewareContract $middleware): Router;
+    public function withoutMiddleware(MiddlewareInterface $middleware): Router;
 
     /**
      * Get all with and without middlewares.

src/Viserio/Cookie/Middleware/AddQueuedCookiesToResponse.php

@@ -2,13 +2,12 @@
 declare(strict_types=1);
 namespace Viserio\Cookie\Middleware;
 
-use Psr\Http\Message\ResponseInterface;
+use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\Middleware\MiddlewareInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Viserio\Contracts\Cookie\QueueingFactory as CookieJar;
-use Viserio\Contracts\Middleware\Delegate as DelegateContract;
-use Viserio\Contracts\Middleware\Middleware as MiddlewareContract;
 
-class AddQueuedCookiesToResponse implements MiddlewareContract
+class AddQueuedCookiesToResponse implements MiddlewareInterface
 {
     /**
      * The cookie jar instance.
@@ -30,10 +29,8 @@ public function __construct(CookieJar $cookies)
     /**
      * {@inheritdoc}
      */
-    public function handle(
-        ServerRequestInterface $request,
-        DelegateContract $frame
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $frame)
+    {
         $response = $frame->next($request);
 
         foreach ($this->cookies->getQueuedCookies() as $cookie) {

src/Viserio/Cookie/Middleware/EncryptedCookie.php

@@ -4,15 +4,15 @@
 
 use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
 use Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException;
+use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\Middleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Viserio\Contracts\Cookie\Cookie as CookieContract;
 use Viserio\Contracts\Encryption\Encrypter as EncrypterContract;
-use Viserio\Contracts\Middleware\Delegate as DelegateContract;
-use Viserio\Contracts\Middleware\Middleware as MiddlewareContract;
 use Viserio\Cookie\Cookie;
 
-class EncryptCookies implements MiddlewareContract
+class EncryptCookies implements MiddlewareInterface
 {
     /**
      * The encrypter instance.
@@ -41,10 +41,8 @@ public function __construct(EncrypterContract $encrypter)
     /**
      * {@inheritdoc}
      */
-    public function handle(
-        ServerRequestInterface $request,
-        DelegateContract $frame
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $frame)
+    {
         return $this->encrypt($frame->next($this->decrypt($request)));
     }
 

src/Viserio/Filesystem/Tests/Traits/FilesystemHelperTraitTest.php

@@ -9,7 +9,9 @@
 
 class FilesystemHelperTraitTest extends \PHPUnit_Framework_TestCase
 {
-    use FilesystemHelperTrait;
+    use FilesystemHelperTrait {
+        isWritable as filesystemIsWritable;
+    }
     use NormalizePathAndDirectorySeparatorTrait;
 
     /**
@@ -47,11 +49,11 @@ public function testIsWritable()
     {
         $file = vfsStream::newFile('foo.txt', 0444)->withContent('foo')->at($this->root);
 
-        $this->assertFalse($this->isWritable($file->url()));
+        $this->assertFalse($this->filesystemIsWritable($file->url()));
 
         $file->chmod(0777);
 
-        $this->assertTrue($this->isWritable($file->url()));
+        $this->assertTrue($this->filesystemIsWritable($file->url()));
     }
 
     public function testIsFile()

src/Viserio/Middleware/Dispatcher.php

@@ -2,13 +2,13 @@
 declare(strict_types=1);
 namespace Viserio\Middleware;
 
+use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\Middleware\MiddlewareInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use SplDoublyLinkedList;
 use SplStack;
 use Viserio\Contracts\Container\Traits\ContainerAwareTrait;
-use Viserio\Contracts\Middleware\Delegate as DelegateContract;
-use Viserio\Contracts\Middleware\Middleware as MiddlewareContract;
 use Viserio\Contracts\Middleware\Stack as StackContract;
 
 class Dispatcher implements StackContract
@@ -47,7 +47,7 @@ public function __construct(ResponseInterface $response)
     /**
      * {@inheritdoc}
      */
-    public function withMiddleware(MiddlewareContract $middleware): StackContract
+    public function withMiddleware(MiddlewareInterface $middleware): StackContract
     {
         $this->stack->push($this->isContainerAware($middleware));
 
@@ -57,7 +57,7 @@ public function withMiddleware(MiddlewareContract $middleware): StackContract
     /**
      * {@inheritdoc}
      */
-    public function withoutMiddleware(MiddlewareContract $middleware): StackContract
+    public function withoutMiddleware(MiddlewareInterface $middleware): StackContract
     {
         foreach ($this->stack as $key => $stackMiddleware) {
             if (get_class($this->stack[$key]) === get_class($middleware)) {
@@ -73,7 +73,7 @@ public function withoutMiddleware(MiddlewareContract $middleware): StackContract
      */
     public function process(RequestInterface $request): ResponseInterface
     {
-        return (new class($this->stack, $this->response) implements DelegateContract {
+        return (new class($this->stack, $this->response) implements DelegateInterface {
             private $middlewares;
 
             private $response;
@@ -113,7 +113,7 @@ private function nextFrame()
      *
      * @return \Viserio\Contracts\Middleware\Middleware
      */
-    private function isContainerAware($middleware): MiddlewareContract
+    private function isContainerAware($middleware): MiddlewareInterface
     {
         if (method_exists($middleware, 'setContainer')) {
             $middleware->setContainer($this->getContainer());

src/Viserio/Middleware/Tests/Fixture/FakeContainerMiddleware.php

@@ -2,19 +2,19 @@
 declare(strict_types=1);
 namespace Viserio\Middleware\Tests\Fixture;
 
+use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\Middleware\ServerMiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Viserio\Contracts\Container\Traits\ContainerAwareTrait;
-use Viserio\Contracts\Middleware\Delegate as DelegateContract;
-use Viserio\Contracts\Middleware\ServerMiddleware as ServerMiddlewareContract;
 
-class FakeContainerMiddleware implements ServerMiddlewareContract
+class FakeContainerMiddleware implements ServerMiddlewareInterface
 {
     use ContainerAwareTrait;
 
     public function process(
         ServerRequestInterface $request,
-        DelegateContract $frame
+        DelegateInterface $frame
     ): ResponseInterface {
         $response = $frame->next($request);
         $response = $response->withAddedHeader('X-Foo', $this->getcontainer()->get('doo'));

src/Viserio/Middleware/Tests/Fixture/FakeMiddleware.php

@@ -2,17 +2,14 @@
 declare(strict_types=1);
 namespace Viserio\Middleware\Tests\Fixture;
 
-use Psr\Http\Message\ResponseInterface;
+use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\Middleware\ServerMiddlewareInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Viserio\Contracts\Middleware\Delegate as DelegateContract;
-use Viserio\Contracts\Middleware\ServerMiddleware as ServerMiddlewareContract;
 
-class FakeMiddleware implements ServerMiddlewareContract
+class FakeMiddleware implements ServerMiddlewareInterface
 {
-    public function process(
-        ServerRequestInterface $request,
-        DelegateContract $frame
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $frame)
+    {
         $response = $frame->next($request);
 
         $response = $response->withAddedHeader('X-Foo', 'modified');

src/Viserio/Middleware/Tests/Fixture/FakeMiddleware2.php

@@ -2,16 +2,16 @@
 declare(strict_types=1);
 namespace Viserio\Middleware\Tests\Fixture;
 
+use Interop\Http\Middleware\DelegateInterface;
+use Interop\Http\Middleware\ServerMiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Viserio\Contracts\Middleware\Delegate as DelegateContract;
-use Viserio\Contracts\Middleware\ServerMiddleware as ServerMiddlewareContract;
 
-class FakeMiddleware2 implements ServerMiddlewareContract
+class FakeMiddleware2 implements ServerMiddlewareInterface
 {
     public function process(
         ServerRequestInterface $request,
-        DelegateContract $frame
+        DelegateInterface $frame
     ): ResponseInterface {
         $response = $frame->next($request);
 

src/Viserio/Routing/AbstractController.php

@@ -2,7 +2,7 @@
 declare(strict_types=1);
 namespace Viserio\Routing;
 
-use Viserio\Contracts\Middleware\Middleware as MiddlewareContract;
+use Interop\Http\Middleware\MiddlewareInterface;
 
 abstract class AbstractController
 {
@@ -21,7 +21,7 @@ abstract class AbstractController
      *
      * @return $this
      */
-    public function withMiddleware(MiddlewareContract $middleware)
+    public function withMiddleware(MiddlewareInterface $middleware)
     {
         $this->middleware['with'][] = $middleware;
 
@@ -33,7 +33,7 @@ public function withMiddleware(MiddlewareContract $middleware)
      *
      * @return $this
      */
-    public function withoutMiddleware(MiddlewareContract $middleware)
+    public function withoutMiddleware(MiddlewareInterface $middleware)
     {
         $this->middleware['without'][] = $middleware;