Merge pull request #97 from basz/laminas-migration

Laminas migration

README.md

@@ -143,7 +143,7 @@ $response = $authorizationServer->handleRequest($request, $user);
 
 The AuthorizationServerMiddleware is able to do this for you and retrieve a user instance from a (configurable) request attribute. It is up to you to provide middleware which runs with a higher priority to add a TokenOwnerInterface instance to the request attribute. 
 
-Example of such a implementation which uses ZendAuthentication and a TemplateRenderer from ZendExpressive.
+Example of such a implementation which uses LaminasAuthentication and a TemplateRenderer from Mezzio.
 
 ```
 final class OAuth2AuthorizationFlow
@@ -232,7 +232,7 @@ if (!$token = $resourceServer->getAccessToken($request, ['write']) {
 
 The ResourceServerMiddleware is able to do this for you, simply have it run before any other middleware.
 
-Example zend expressive route configuration.
+Example mezzio expressive route configuration.
 
 ```
 [

composer.json

@@ -23,7 +23,7 @@
   ],
   "require": {
     "php": "^7.0",
-    "zendframework/zend-diactoros": "^1.1",
+    "laminas/laminas-diactoros": "^1.1",
     "psr/container": "^1.0",
     "ramsey/uuid": "^3.1",
     "roave/security-advisories": "dev-master",

src/AuthorizationServer.php

@@ -21,10 +21,10 @@
 
 namespace ZfrOAuth2\Server;
 
+use Laminas\Diactoros\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
-use Zend\Diactoros\Response;
 use ZfrOAuth2\Server\Exception\OAuth2Exception;
 use ZfrOAuth2\Server\Grant\AuthorizationServerAwareInterface;
 use ZfrOAuth2\Server\Grant\GrantInterface;

src/Grant/AbstractGrant.php

@@ -21,8 +21,8 @@
 
 namespace ZfrOAuth2\Server\Grant;
 
+use Laminas\Diactoros\Response;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\Response;
 use ZfrOAuth2\Server\Model\AccessToken;
 use ZfrOAuth2\Server\Model\RefreshToken;
 

src/Grant/AuthorizationGrant.php

@@ -21,9 +21,9 @@
 
 namespace ZfrOAuth2\Server\Grant;
 
+use Laminas\Diactoros\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response;
 use ZfrOAuth2\Server\AuthorizationServerInterface;
 use ZfrOAuth2\Server\Exception\OAuth2Exception;
 use ZfrOAuth2\Server\Model\Client;

src/Middleware/ResourceServerMiddleware.php

@@ -21,11 +21,11 @@
 
 namespace ZfrOAuth2\Server\Middleware;
 
+use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\JsonResponse;
 use ZfrOAuth2\Server\Exception\InvalidAccessTokenException;
 use ZfrOAuth2\Server\ResourceServerInterface;
 

tests/src/Middleware/ResourceServerMiddlewareTest.php

@@ -20,11 +20,11 @@
 
 namespace ZfrOAuth2Test\Server\Middleware;
 
+use Laminas\Diactoros\Response\JsonResponse;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as RequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\JsonResponse;
 use ZfrOAuth2\Server\Exception\InvalidAccessTokenException;
 use ZfrOAuth2\Server\Middleware\ResourceServerMiddleware;
 use ZfrOAuth2\Server\Model\AccessToken;

tests/src/Model/AuthorizationCodeTest.php

@@ -22,7 +22,6 @@
 
 use PHPUnit\Framework\TestCase;
 use ZfrOAuth2\Server\Model\AuthorizationCode;
-use ZfrOAuth2\Server\Model\Client;
 
 /**
  * @author  Michaël Gallego <mic.gallego@gmail.com>