updated http-middleware interface to 0.3

middlewares · Nov 27, 2016 · fa8bc96 · fa8bc96
1 parent 56adb64
commit fa8bc96
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/CHANGELOG.md b/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-27
+
+### Changed
+
+* Updated to `http-interop/http-middleware#0.3`
+
 ## 0.1.0 - 2016-10-09
 
 First version
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # middlewares/cors
 
 [![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]
@@ -13,7 +13,7 @@ Middleware to implement Cross-Origin Resource Sharing (CORS) using [neomerx/cors
 
 * PHP >= 5.6
 * A [PSR-7](https://packagist.org/providers/psr/http-message-implementation) http mesage implementation ([Diactoros](https://github.com/zendframework/zend-diactoros), [Guzzle](https://github.com/guzzle/psr7), [Slim](https://github.com/slimphp/Slim), etc...)
-* A [PSR-15](https://github.com/http-interop/http-middleware) middleware dispatcher ([Middleman](https://github.com/mindplay-dk/middleman), etc...)
+* A [PSR-15 middleware dispatcher](https://github.com/middlewares/awesome-psr15-middlewares#dispatcher)
 
 ## Installation
 
@@ -39,7 +39,7 @@ $dispatcher = new Dispatcher([
 	new Middlewares\Cors($settings)
 ]);
 
-$response = $dispatcher->dispatch(new Request());
+$response = $dispatcher->dispatch(new ServerRequest());
 ```
 
 ## Options

diff --git a/composer.json b/composer.json
@@ -18,16 +18,15 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "http-interop/http-middleware": "^0.2",
+        "http-interop/http-middleware": "^0.3",
         "neomerx/cors-psr7": "^1.0",
-        "middlewares/utils": "~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": {

diff --git a/src/Cors.php b/src/Cors.php
@@ -2,15 +2,15 @@
 
 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;
 use Neomerx\Cors\Analyzer;
 use Neomerx\Cors\Contracts\AnalysisResultInterface;
 use Neomerx\Cors\Contracts\Strategies\SettingsStrategyInterface;
 
-class Cors implements MiddlewareInterface
+class Cors implements ServerMiddlewareInterface
 {
     /**
      * @var SettingsStrategyInterface
@@ -30,12 +30,12 @@ public function __construct(SettingsStrategyInterface $settings)
     /**
      * 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)
     {
         $cors = Analyzer::instance($this->settings)->analyze($request);
 

diff --git a/tests/CorsTest.php b/tests/CorsTest.php
@@ -3,9 +3,10 @@
 namespace Middlewares\Tests;
 
 use Middlewares\Cors;
-use Zend\Diactoros\Request;
+use Middlewares\Utils\Dispatcher;
+use Middlewares\Utils\CallableMiddleware;
+use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\Response;
-use mindplay\middleman\Dispatcher;
 use Neomerx\Cors\Strategies\Settings;
 use Neomerx\Cors\Contracts\Constants\CorsResponseHeaders;
 
@@ -61,10 +62,10 @@ public function testCors($url, $statusCode)
 
         $response = (new Dispatcher([
             new Cors($settings),
-            function () {
+            new CallableMiddleware(function () {
                 return new Response();
-            },
-        ]))->dispatch(new Request($url));
+            }),
+        ]))->dispatch(new ServerRequest([], [], $url));
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals($statusCode, $response->getStatusCode());