updated http-middleware interface to 0.3

Author: oscarotero

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.2.0 - 2016-11-22
+
+### Changed
+
+* Updated to `http-interop/http-middleware#0.3`
+
 ## 0.1.1 - 2016-10-01
 
 ### Fixed

README.md

@@ -1,7 +1,7 @@
 # middlewares/trailing-slash
 
 [![Latest Version on Packagist][ico-version]][link-packagist]
-[![Software License][ico-license]](LICENSE.md)
+[![Software License][ico-license]](LICENSE)
 [![Build Status][ico-travis]][link-travis]
 [![Quality Score][ico-scrutinizer]][link-scrutinizer]
 [![Total Downloads][ico-downloads]][link-downloads]
@@ -31,7 +31,7 @@ $dispatcher = new Dispatcher([
 		->redirect()
 ]);
 
-$response = $dispatcher->dispatch(new Request());
+$response = $dispatcher->dispatch(new ServerRequest());
 ```
 
 ## Options

composer.json

@@ -18,15 +18,14 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "http-interop/http-middleware": "^0.2",
-        "middlewares/utils": "0.*"
+        "http-interop/http-middleware": "^0.3",
+        "middlewares/utils": "~0.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.5",
         "zendframework/zend-diactoros": "^1.3",
         "friendsofphp/php-cs-fixer": "^1.12",
-        "squizlabs/php_codesniffer": "^2.7",
-        "mindplay/middleman": "^2.0"
+        "squizlabs/php_codesniffer": "^2.7"
     },
     "autoload": {
         "psr-4": {

src/TrailingSlash.php

@@ -2,12 +2,12 @@
 
 namespace Middlewares;
 
-use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Interop\Http\Middleware\MiddlewareInterface;
+use Interop\Http\Middleware\ServerMiddlewareInterface;
 use Interop\Http\Middleware\DelegateInterface;
 
-class TrailingSlash implements MiddlewareInterface
+class TrailingSlash implements ServerMiddlewareInterface
 {
     /**
      * @var bool Add or remove the slash
@@ -46,12 +46,12 @@ public function redirect($redirect = true)
     /**
      * Process a request and return a response.
      *
-     * @param RequestInterface  $request
-     * @param DelegateInterface $delegate
+     * @param ServerRequestInterface $request
+     * @param DelegateInterface      $delegate
      *
      * @return ResponseInterface
      */
-    public function process(RequestInterface $request, DelegateInterface $delegate)
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
     {
         $uri = $request->getUri();
         $path = $this->normalize($uri->getPath());

tests/TrailingSlashTest.php

@@ -3,9 +3,10 @@
 namespace Middlewares\Tests;
 
 use Middlewares\TrailingSlash;
-use Zend\Diactoros\Request;
+use Middlewares\Utils\Dispatcher;
+use Middlewares\Utils\CallableMiddleware;
+use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Response;
-use mindplay\middleman\Dispatcher;
 
 class TrailingSlashTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,15 +28,15 @@ public function testRemove($url, $result)
         $dispatcher = new Dispatcher([
             new TrailingSlash(),
 
-            function ($request, $next) {
+            new CallableMiddleware(function ($request, $next) {
                 $response = new Response();
                 $response->getBody()->write((string) $request->getUri());
 
                 return $response;
-            },
+            }),
         ]);
 
-        $response = $dispatcher->dispatch(new Request($url));
+        $response = $dispatcher->dispatch(new ServerRequest([], [], $url));
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals($result, (string) $response->getBody());
@@ -61,15 +62,15 @@ public function testAdd($url, $result)
         $dispatcher = new Dispatcher([
             new TrailingSlash(true),
 
-            function ($request, $next) {
+            new CallableMiddleware(function ($request, $next) {
                 $response = new Response();
                 $response->getBody()->write((string) $request->getUri());
 
                 return $response;
-            },
+            }),
         ]);
 
-        $response = $dispatcher->dispatch(new Request($url));
+        $response = $dispatcher->dispatch(new ServerRequest([], [], $url));
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals($result, (string) $response->getBody());
@@ -81,7 +82,7 @@ public function testRedirect()
             (new TrailingSlash())->redirect(),
         ]);
 
-        $response = $dispatcher->dispatch(new Request('/foo/bar/'));
+        $response = $dispatcher->dispatch(new ServerRequest([], [], '/foo/bar/'));
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals(301, (string) $response->getStatusCode());