Drop passport v9 support (#45)

Drop support for php v7.3 (EOL) Test on php 8.1
coderello · Dec 25, 2021 · ae25335 · ae25335
1 parent fc4ab16
commit ae25335
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 32 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,10 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4, 8.0]
-        composer-flag: [prefer-lowest, prefer-stable]
+        php: [7.4, 8.0, 8.1]
 
-    name: php v${{ matrix.php }} - ${{ matrix.composer-flag }}
+    name: php v${{ matrix.php }}
 
     steps:
       - name: Checkout code
@@ -35,9 +34,8 @@ jobs:
           coverage: pcov
 
       - name: Install dependencies
-        run: composer update --${{ matrix.composer-flag }} --no-interaction --no-progress
+        run: composer update  --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: composer test -- --coverage-clover=coverage.xml
-        continue-on-error: ${{ matrix.composer-flag == 'prefer-lowest' }}
 
diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
         }
     ],
     "require": {
-        "php": "^7.3||^8.0",
-        "laravel/passport": "^9.0||^10.0"
+        "php": "^7.4||^8.0",
+        "laravel/passport": "^10.2.2"
     },
     "require-dev": {
-        "mockery/mockery": "^1.3",
-        "orchestra/testbench": "^6.0",
-        "laminas/laminas-diactoros": "^2.4"
+        "mockery/mockery": "^1.4.4",
+        "orchestra/testbench": "^6.23.2",
+        "laminas/laminas-diactoros": "^2.8"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        bootstrap="vendor/autoload.php"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        processIsolation="false"
-        stopOnFailure="false">
-  <testsuites>
-    <testsuite name="Test Suite">
-      <directory suffix=".php">./tests</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">./src</directory>
-    </whitelist>
-  </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory suffix=".php">./tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/tests/SocialGrantTest.php b/tests/SocialGrantTest.php
@@ -3,7 +3,7 @@
 namespace Coderello\SocialGrant\Tests;
 
 use League\OAuth2\Server\CryptKey;
-use Zend\Diactoros\ServerRequest;
+use Laminas\Diactoros\ServerRequest;
 use Coderello\SocialGrant\Tests\Stubs\User;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Coderello\SocialGrant\Grants\SocialGrant;