Support PHP 8.1 and Laravel 9 (#37)

* Update composer.json

* Update test matrix

* Wip

* Wip

* Wip

* Wip

* Caching

Author: bakerkretzmar

.github/workflows/run-tests.yml

@@ -1,49 +1,48 @@
 name: Tests
-
 on:
   pull_request:
   push:
     branches: [main]
-
 jobs:
   test:
-    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+    name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, ${{ matrix.dependencies }}
     runs-on: ubuntu-latest
-
     strategy:
+      fail-fast: false
       matrix:
-        php: [8.0, 7.4, 7.3]
-        laravel: [8.*, 7.*, 6.*]
-        dependency-version: [prefer-lowest, prefer-stable]
+        php: ['7.3', '7.4', '8.0', '8.1']
+        laravel: [6.*, 7.*, 8.*, 'dev-master as 9.0']
+        dependencies: [prefer-lowest, prefer-stable]
+        exclude:
+          - php: '7.3'
+            laravel: 'dev-master as 9.0'
+          - php: '7.4'
+            laravel: 'dev-master as 9.0'
+          - php: '8.1'
+            laravel: 6.*
+          - php: '8.1'
+            laravel: 7.*
+          - php: '8.1'
+            laravel: 8.*
+            dependencies: prefer-lowest
         include:
-          - laravel: 8.*
-            testbench: 6.*
-          - laravel: 7.*
-            testbench: 5.*
-          - laravel: 6.*
-            testbench: 4.*
-
+          - php: '8.1'
+            laravel: ^8.65
+            dependencies: prefer-lowest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
           path: ~/.composer/cache/files
-          key: php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-composer-${{ hashFiles('composer.lock') }}
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
+          key: php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}
+          restore-keys: |
+            php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-composer-${{ matrix.dependencies }}-
+            php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-
+            php-${{ matrix.php }}-
+      - 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
-          coverage: none
-
-      - name: Install dependencies
-        run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
-
-      - name: Run tests
-        run: vendor/bin/phpunit --testdox --colors=always
+      - run: |
+          composer require laravel/framework:"${{ matrix.laravel }}" --no-update --no-interaction
+          composer update --${{ matrix.dependencies }} --prefer-dist --no-interaction
+      - run: vendor/bin/phpunit --testdox --colors=always

.gitignore

@@ -1,19 +1,3 @@
 vendor/
-node_modules/
 .phpunit.result.cache
-
-# Laravel 4 specific
-bootstrap/compiled.php
-app/storage/
-
-# Laravel 5 & Lumen specific
-bootstrap/cache/
-.env.*.php
-.env.php
-.env
-
-# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
-.rocketeer/
-/_ide_helper.php
-.idea/
 composer.lock

composer.json

@@ -22,18 +22,18 @@
         }
     ],
     "require": {
-        "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"
+        "php": "^7.1.3 || ~8.0.0 || ~8.1.0",
+        "illuminate/config": "~5.6 || ~5.7 || ~5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/console": "~5.6 || ~5.7 || ~5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/log": "~5.6 || ~5.7 || ~5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/support": "~5.6 || ~5.7 || ~5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
         "laravel/legacy-factories": "^1.0.4",
         "mockery/mockery": "^1.3.2",
-        "orchestra/testbench": "~3.0|~4.0|~5.0|~6.0",
-        "phpunit/phpunit": "~9.3"
+        "orchestra/testbench": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "phpunit/phpunit": "^8.5.21 || ^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -52,5 +52,12 @@
                 "Tightenco\\Quicksand\\QuicksandServiceProvider"
             ]
         }
-    }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

phpunit.xml

@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <testsuites>
-    <testsuite name="Package Test Suite">
-      <directory suffix="Test.php">./tests/</directory>
+    <testsuite name="Quicksand Tests">
+      <directory suffix="Test.php">./tests</directory>
     </testsuite>
   </testsuites>
 </phpunit>