Add php 8 support #39 (#40)

coderello · Dec 14, 2020 · fc4ab16 · fc4ab16
1 parent 2b55a31
commit fc4ab16
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,9 +15,9 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4]
+        php: [7.3, 7.4, 8.0]
         composer-flag: [prefer-lowest, prefer-stable]
 
     name: php v${{ matrix.php }} - ${{ matrix.composer-flag }}
@@ -26,7 +26,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -40,4 +39,5 @@ jobs:
 
       - 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,12 +11,12 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "laravel/passport": "^8.0||^9.0||^10.0"
+        "php": "^7.3||^8.0",
+        "laravel/passport": "^9.0||^10.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3",
-        "orchestra/testbench": "^5.0||^6.0",
+        "orchestra/testbench": "^6.0",
         "laminas/laminas-diactoros": "^2.4"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-  </coverage>
+<phpunit
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        bootstrap="vendor/autoload.php"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false">
   <testsuites>
-    <testsuite name="Laravel Passport Social Grant Test Suite">
-      <directory suffix=".php">./tests/</directory>
+    <testsuite name="Test Suite">
+      <directory suffix=".php">./tests</directory>
     </testsuite>
   </testsuites>
+
+  <filter>
+    <whitelist>
+      <directory suffix=".php">./src</directory>
+    </whitelist>
+  </filter>
 </phpunit>