From 61217e371fc4076409f330e167e8d244874333f0 Mon Sep 17 00:00:00 2001
From: Pascal Baljet <pascal@pascalbaljet.nl>
Date: Sun, 19 Dec 2021 19:19:24 +0100
Subject: [PATCH] Support for PHP 8.1 (#54)

---
 .github/workflows/js.yml  | 22 +++++++++++-----------
 .github/workflows/php.yml | 34 +++++++++++++++++-----------------
 README.md                 |  2 +-
 composer.json             |  9 +++++----
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 27f9d43..a9fe136 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
@@ -19,12 +19,12 @@ jobs:
         node-version: [12.x]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm install
-    - run: npm run test:2
-    - run: npm run test:3
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm ci
+      - run: npm install
+      - run: npm run test:2
+      - run: npm run test:3
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index f9a7446..e0d291d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -8,30 +8,30 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [8.0, 7.4]
+                php: [8.1, 8.0, 7.4]
                 laravel: [8.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
-                    -   laravel: 8.*
-                        testbench: 6.*
+                    - laravel: 8.*
+                      testbench: 6.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
+            - name: Checkout code
+              uses: actions/checkout@v2
 
-            -   name: Setup 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, mysql, mysqli, pdo_mysql
-                    coverage: none
+            - name: Setup 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, mysql, mysqli, pdo_mysql
+                  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: 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: Execute tests
-                run: vendor/bin/phpunit
+            - name: Execute tests
+              run: vendor/bin/phpunit
diff --git a/README.md b/README.md
index 043c693..d3fca54 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ We proudly support the community by developing Laravel packages and giving them
 * [Laravel 8](https://laravel.com/)
 * [Inertia.js](https://inertiajs.com/)
 * [Tailwind CSS v2](https://tailwindcss.com/) + [Forms plugin](https://github.com/tailwindlabs/tailwindcss-forms)
-* PHP 7.4 + 8.0
+* PHP 7.4 + 8.0 + 8.1
 
 ## Roadmap
 
diff --git a/composer.json b/composer.json
index 3138dc0..a7e8617 100644
--- a/composer.json
+++ b/composer.json
@@ -11,12 +11,13 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/support": "^8.0"
+        "php": "^7.4|^8.0|^8.1",
+        "illuminate/support": "^8.67"
     },
     "require-dev": {
-        "inertiajs/inertia-laravel": "^0.4.0",
-        "orchestra/testbench": " ^6.0"
+        "inertiajs/inertia-laravel": "^0.4.5",
+        "orchestra/testbench": "^6.23",
+        "phpunit/phpunit": "^9.4"
     },
     "autoload": {
         "psr-4": {