Merge pull request #35 from tighten/jtb-php-8

Add PHP 8 support

Author: imjohnbon

.github/workflows/run-tests.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4, 7.3]
+        php: [8.0, 7.4, 7.3]
         laravel: [8.*, 7.*, 6.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:

composer.json

@@ -22,18 +22,18 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.1.3|^8.0",
         "illuminate/config": "~5.6|~5.7|~5.8|~6.0|~7.0|~8.0",
         "illuminate/console": "~5.6|~5.7|~5.8|~6.0|~7.0|~8.0",
         "illuminate/log": "~5.6|~5.7|~5.8|~6.0|~7.0|~8.0",
         "illuminate/support": "~5.6|~5.7|~5.8|~6.0|~7.0|~8.0"
     },
     "require-dev": {
-        "fzaninotto/faker": "^1.8",
+        "fakerphp/faker": "^1.9.1",
         "laravel/legacy-factories": "^1.0.4",
-        "mockery/mockery": "^1.0.0",
+        "mockery/mockery": "^1.3.2",
         "orchestra/testbench": "~3.0|~4.0|~5.0|~6.0",
-        "phpunit/phpunit": "~8.0"
+        "phpunit/phpunit": "~9.3"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,25 +1,16 @@
 <?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"
->
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="false">
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <file>./src/QuicksandServiceProvider.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
+<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 includeUncoveredFiles="false">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <file>./src/QuicksandServiceProvider.php</file>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>