Merge branch '9.x' into master

laravel · Aug 25, 2020 · 8b41a82 · 8b41a82
2 parents 29f137a + 98ad679
commit 8b41a82
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick

diff --git a/composer.json b/composer.json
@@ -17,7 +17,6 @@
         "php": "^7.2",
         "ext-json": "*",
         "firebase/php-jwt": "^5.0",
-        "guzzlehttp/guzzle": "^6.0|^7.0",
         "illuminate/auth": "^6.18.31|^7.22.4",
         "illuminate/console": "^6.18.31|^7.22.4",
         "illuminate/container": "^6.18.31|^7.22.4",
@@ -35,7 +34,7 @@
     "require-dev": {
         "mockery/mockery": "^1.0",
         "orchestra/testbench": "^4.4|^5.0",
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": "^8.5|^9.3"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/Unit/AuthorizationControllerTest.php b/tests/Unit/AuthorizationControllerTest.php
@@ -2,7 +2,6 @@
 
 namespace Laravel\Passport\Tests\Unit;
 
-use GuzzleHttp\Psr7\Response;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
 use Laravel\Passport\Bridge\Scope;
@@ -17,6 +16,7 @@
 use League\OAuth2\Server\Exception\OAuthServerException as LeagueException;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequest;
 use Mockery as m;
+use Nyholm\Psr7\Response;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;