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.3.0 - 2016-11-22
+
+### Changed
+
+* Updated to `http-interop/http-middleware#0.3`
+
 ## 0.2.0 - 2016-11-19
 
 ### Changed

README.md

@@ -1,16 +1,14 @@
 # middlewares/error-handler
 
 [![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]
 [![SensioLabs Insight][ico-sensiolabs]][link-sensiolabs]
 
 Middleware to execute a handler if the response returned by the next middlewares has any error (status code 400-599). It can also catch the exceptions.
 
-**Note:** This middleware is intended for server side only
-
 ## Requirements
 
 * PHP >= 5.6

composer.json

@@ -16,15 +16,14 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "http-interop/http-middleware": "^0.2",
-        "middlewares/utils": "~0.3"
+        "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": {

tests/ErrorHandlerTest.php

@@ -3,9 +3,10 @@
 namespace Middlewares\Tests;
 
 use Middlewares\ErrorHandler;
+use Middlewares\Utils\Dispatcher;
+use Middlewares\Utils\CallableMiddleware;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Response;
-use mindplay\middleman\Dispatcher;
 use Exception;
 
 class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
@@ -18,9 +19,9 @@ public function testError()
 
                 return (new Response())->withStatus($request->getAttribute('error')['status_code']);
             }),
-            function () {
+            new CallableMiddleware(function () {
                 return (new Response())->withStatus(404);
-            },
+            }),
         ]))->dispatch(new ServerRequest());
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
@@ -36,9 +37,9 @@ public function testAttribute()
 
                 return (new Response())->withStatus($request->getAttribute('foo')['status_code']);
             }))->attribute('foo'),
-            function () {
+            new CallableMiddleware(function () {
                 return (new Response())->withStatus(404);
-            },
+            }),
         ]))->dispatch(new ServerRequest());
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
@@ -56,10 +57,10 @@ public function testException()
 
                 return (new Response())->withStatus($request->getAttribute('error')['status_code']);
             }))->catchExceptions(),
-            function ($request) use ($exception) {
+            new CallableMiddleware(function ($request) use ($exception) {
                 echo 'not showed text';
                 throw $exception;
-            },
+            }),
         ]))->dispatch(new ServerRequest());
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
@@ -90,9 +91,9 @@ public function testFormats($type)
         $request = (new ServerRequest())->withHeader('Accept', $type);
         $response = (new Dispatcher([
             new ErrorHandler(),
-            function () {
+            new CallableMiddleware(function () {
                 return (new Response())->withStatus(500);
-            },
+            }),
         ]))->dispatch($request);
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
@@ -104,9 +105,9 @@ public function testDefaultFormat()
     {
         $response = (new Dispatcher([
             new ErrorHandler(),
-            function () {
+            new CallableMiddleware(function () {
                 return (new Response())->withStatus(500);
-            },
+            }),
         ]))->dispatch(new ServerRequest());
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
@@ -123,9 +124,9 @@ public function testArguments()
 
                 return $response;
             }))->arguments('Hello world'),
-            function () {
+            new CallableMiddleware(function () {
                 return (new Response())->withStatus(500);
-            },
+            }),
         ]))->dispatch(new ServerRequest());
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
@@ -141,25 +142,25 @@ public function testValidators()
 
         $response = (new Dispatcher([
             (new ErrorHandler())->statusCode($validator),
-            function () {
+            new CallableMiddleware(function () {
                 $response = (new Response())->withStatus(500);
                 $response->getBody()->write('Content');
 
                 return $response;
-            },
+            }),
         ]))->dispatch(new ServerRequest());
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals('Content', (string) $response->getBody());
 
         $response = (new Dispatcher([
             (new ErrorHandler())->statusCode($validator),
-            function () {
+            new CallableMiddleware(function () {
                 $response = (new Response())->withStatus(404);
                 $response->getBody()->write('Content');
 
                 return $response;
-            },
+            }),
         ]))->dispatch(new ServerRequest());
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);