Merge branch 'feature/16-psr-15' into release-1.0.0

Close #16

Author: weierophinney

CHANGELOG.md

@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.0.0alpha1 - TBD
+## 1.0.0alpha1 - 2018-02-07
 
 ### Added
 
-- [#11](https://github.com/zendframework/zend-expressive-authorization/pull/11) adds
+- [#16](https://github.com/zendframework/zend-expressive-authorization/pull/16) adds
   support for PSR-15.
 
 ### Changed
@@ -19,8 +19,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- [#11](https://github.com/zendframework/zend-expressive-authorization/pull/11)
-  removes support for http-interop/http-middleware.
+- [#16](https://github.com/zendframework/zend-expressive-authorization/pull/16) and
+  [#11](https://github.com/zendframework/zend-expressive-authorization/pull/11)
+  remove support for http-interop/http-middleware and
+  http-interop/http-server-middleware.
 
 ### Fixed
 

composer.json

@@ -6,6 +6,7 @@
         "authorization",
         "middleware",
         "psr-7",
+        "psr-15",
         "zf",
         "zendframework",
         "zend-expressive"
@@ -20,10 +21,10 @@
     },
     "require": {
         "php": "^7.1",
-        "http-interop/http-server-middleware": "^1.0.1",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-expressive-authentication": "^1.0.0-dev"
+        "psr/http-server-middleware": "^1.0",
+        "zendframework/zend-expressive-authentication": "^1.0.0alpha1 || ^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5.3",

composer.lock

@@ -1,18 +1,18 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authorization for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authorization/blob/master/LICENSE.md New BSD License
  */
 
 declare(strict_types=1);
 
 namespace Zend\Expressive\Authorization;
 
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Expressive\Authentication\UserInterface;
 
 class AuthorizationMiddleware implements MiddlewareInterface

src/AuthorizationMiddleware.php

@@ -1,19 +1,19 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-authorization for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-authorization/blob/master/LICENSE.md New BSD License
  */
 
 declare(strict_types=1);
 
 namespace ZendTest\Expressive\Authorization;
 
-use Interop\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Expressive\Authentication\UserInterface;
 use Zend\Expressive\Authentication\UserRepository\UserTrait;
 use Zend\Expressive\Authorization\AuthorizationInterface;