updated http-middleware interface to 0.3

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.0 - 2016-10-02
 
 First version

README.md

@@ -1,7 +1,7 @@
 # middlewares/http-authentication
 
 [![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]
@@ -12,8 +12,6 @@ Middleware to implement [RFC 2617 Http Authentication](https://tools.ietf.org/ht
 * [BasicAuthentication](#basicauthentication)
 * [DigestAuthentication](#digestauthentication)
 
-**Note:** This middleware is intended for server side only
-
 ## Requirements
 
 * PHP >= 5.6

composer.json

@@ -19,15 +19,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/DigestAuthentication.php

@@ -132,7 +132,7 @@ private function parseHeader($header)
             'qop' => 1,
             'username' => 1,
             'uri' => 1,
-            'response' => 1
+            'response' => 1,
         ];
 
         $data = [];

tests/BasicAuthenticationTest.php

@@ -3,9 +3,10 @@
 namespace Middlewares\Tests;
 
 use Middlewares\BasicAuthentication;
+use Middlewares\Utils\Dispatcher;
+use Middlewares\Utils\CallableMiddleware;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Response;
-use mindplay\middleman\Dispatcher;
 
 class BasicAuthenticationTest extends \PHPUnit_Framework_TestCase
 {
@@ -29,12 +30,12 @@ public function testSuccess()
                 ->realm('My realm')
                 ->attribute('auth-username'),
 
-            function ($request) {
+            new CallableMiddleware(function ($request) {
                 $response = new Response();
                 $response->getBody()->write($request->getAttribute('auth-username'));
 
                 return $response;
-            },
+            }),
         ]))->dispatch($request);
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);

tests/DigestAuthenticationTest.php

@@ -3,9 +3,10 @@
 namespace Middlewares\Tests;
 
 use Middlewares\DigestAuthentication;
+use Middlewares\Utils\Dispatcher;
+use Middlewares\Utils\CallableMiddleware;
 use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Response;
-use mindplay\middleman\Dispatcher;
 
 class DigestAuthenticationTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,12 +36,12 @@ public function testSuccess()
                 ->realm('My realm')
                 ->attribute('auth-username'),
 
-            function ($request) {
+            new CallableMiddleware(function ($request) {
                 $response = new Response();
                 $response->getBody()->write($request->getAttribute('auth-username'));
 
                 return $response;
-            },
+            }),
         ]))->dispatch($request);
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);