From bc0aca315b84c7d59abf925d6f4cee43a388fee3 Mon Sep 17 00:00:00 2001 From: Antonio Pauletich Date: Thu, 20 Aug 2020 15:47:52 +0200 Subject: [PATCH 1/3] Remove Guzzle dependency (#1327) --- composer.json | 1 - tests/Unit/AuthorizationControllerTest.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 738a77f17..892a867cf 100644 --- 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", diff --git a/tests/Unit/AuthorizationControllerTest.php b/tests/Unit/AuthorizationControllerTest.php index 333bb1101..4fd7c6a42 100644 --- 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; From 7792cd6eebb4a5b7870862d212b0f70253db587f Mon Sep 17 00:00:00 2001 From: Antonio Pauletich Date: Thu, 20 Aug 2020 21:23:33 +0200 Subject: [PATCH 2/3] Use newer Github actions (#1329) --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1443e4ed7..36ef2a9d2 100644 --- 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 From 98ad6792287dd0025482d58eb39e38e420c2f86a Mon Sep 17 00:00:00 2001 From: Antonio Pauletich Date: Thu, 20 Aug 2020 21:23:48 +0200 Subject: [PATCH 3/3] Allow PHPUnit 9 (#1328) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 892a867cf..07c74c1df 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,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": {