Merge pull request #1158 from michael-ow/8.x

[8.x] Replace deprecated package and namespaces

composer.json

@@ -27,10 +27,10 @@
         "illuminate/encryption": "^6.0|^7.0",
         "illuminate/http": "^6.0|^7.0",
         "illuminate/support": "^6.0|^7.0",
+        "laminas/laminas-diactoros": "^2.2",
         "league/oauth2-server": "^8.0",
         "phpseclib/phpseclib": "^2.0",
-        "symfony/psr-http-message-bridge": "^1.0",
-        "zendframework/zend-diactoros": "^2.0"
+        "symfony/psr-http-message-bridge": "^1.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",

src/Guards/TokenGuard.php

@@ -10,17 +10,17 @@
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Cookie\Middleware\EncryptCookies;
 use Illuminate\Http\Request;
+use Laminas\Diactoros\ResponseFactory;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\StreamFactory;
+use Laminas\Diactoros\UploadedFileFactory;
 use Laravel\Passport\ClientRepository;
 use Laravel\Passport\Passport;
 use Laravel\Passport\TokenRepository;
 use Laravel\Passport\TransientToken;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\ResourceServer;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
-use Zend\Diactoros\ResponseFactory;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\StreamFactory;
-use Zend\Diactoros\UploadedFileFactory;
 
 class TokenGuard
 {
@@ -172,7 +172,7 @@ protected function getPsrRequestViaBearerToken($request)
     {
         // First, we will convert the Symfony request to a PSR-7 implementation which will
         // be compatible with the base OAuth2 library. The Symfony bridge can perform a
-        // conversion for us to a Zend Diactoros implementation of the PSR-7 request.
+        // conversion for us to a new Diactoros implementation of this PSR-7 request.
         $psr = (new PsrHttpFactory(
             new ServerRequestFactory,
             new StreamFactory,

src/Http/Controllers/AccessTokenController.php

@@ -2,11 +2,11 @@
 
 namespace Laravel\Passport\Http\Controllers;
 
+use Laminas\Diactoros\Response as Psr7Response;
 use Laravel\Passport\TokenRepository;
 use Lcobucci\JWT\Parser as JwtParser;
 use League\OAuth2\Server\AuthorizationServer;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response as Psr7Response;
 
 class AccessTokenController
 {

src/Http/Controllers/ApproveAuthorizationController.php

@@ -3,8 +3,8 @@
 namespace Laravel\Passport\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Laminas\Diactoros\Response as Psr7Response;
 use League\OAuth2\Server\AuthorizationServer;
-use Zend\Diactoros\Response as Psr7Response;
 
 class ApproveAuthorizationController
 {

src/Http/Controllers/AuthorizationController.php

@@ -4,13 +4,13 @@
 
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
+use Laminas\Diactoros\Response as Psr7Response;
 use Laravel\Passport\Bridge\User;
 use Laravel\Passport\ClientRepository;
 use Laravel\Passport\Passport;
 use Laravel\Passport\TokenRepository;
 use League\OAuth2\Server\AuthorizationServer;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response as Psr7Response;
 
 class AuthorizationController
 {

src/Http/Controllers/HandlesOAuthErrors.php

@@ -2,9 +2,9 @@
 
 namespace Laravel\Passport\Http\Controllers;
 
+use Laminas\Diactoros\Response as Psr7Response;
 use Laravel\Passport\Exceptions\OAuthServerException;
 use League\OAuth2\Server\Exception\OAuthServerException as LeagueException;
-use Zend\Diactoros\Response as Psr7Response;
 
 trait HandlesOAuthErrors
 {

src/Http/Middleware/CheckCredentials.php

@@ -4,14 +4,14 @@
 
 use Closure;
 use Illuminate\Auth\AuthenticationException;
+use Laminas\Diactoros\ResponseFactory;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\StreamFactory;
+use Laminas\Diactoros\UploadedFileFactory;
 use Laravel\Passport\TokenRepository;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\ResourceServer;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
-use Zend\Diactoros\ResponseFactory;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\StreamFactory;
-use Zend\Diactoros\UploadedFileFactory;
 
 abstract class CheckCredentials
 {

src/PersonalAccessTokenFactory.php

@@ -2,10 +2,10 @@
 
 namespace Laravel\Passport;
 
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequest;
 use Lcobucci\JWT\Parser as JwtParser;
 use League\OAuth2\Server\AuthorizationServer;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequest;
 
 class PersonalAccessTokenFactory
 {
@@ -89,7 +89,7 @@ public function make($userId, $name, array $scopes = [])
      * @param  \Laravel\Passport\Client  $client
      * @param  mixed  $userId
      * @param  array  $scopes
-     * @return \Zend\Diactoros\ServerRequest
+     * @return \Laminas\Diactoros\ServerRequest
      */
     protected function createRequest($client, $userId, array $scopes)
     {
@@ -105,7 +105,7 @@ protected function createRequest($client, $userId, array $scopes)
     /**
      * Dispatch the given request to the authorization server.
      *
-     * @param  \Zend\Diactoros\ServerRequest  $request
+     * @param  \Laminas\Diactoros\ServerRequest  $request
      * @return array
      */
     protected function dispatchRequestToAuthorizationServer(ServerRequest $request)

tests/AccessTokenControllerTest.php

@@ -2,6 +2,7 @@
 
 namespace Laravel\Passport\Tests;
 
+use Laminas\Diactoros\Response;
 use Laravel\Passport\Exceptions\OAuthServerException;
 use Laravel\Passport\Http\Controllers\AccessTokenController;
 use Laravel\Passport\TokenRepository;
@@ -12,7 +13,6 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response;
 
 class AccessTokenControllerTest extends TestCase
 {

tests/ApproveAuthorizationControllerTest.php

@@ -3,13 +3,13 @@
 namespace Laravel\Passport\Tests;
 
 use Illuminate\Http\Request;
+use Laminas\Diactoros\Response;
 use Laravel\Passport\Http\Controllers\ApproveAuthorizationController;
 use League\OAuth2\Server\AuthorizationServer;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequest;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\Response;
 
 class ApproveAuthorizationControllerTest extends TestCase
 {