From 763275bdac2dffbf737c8878678c23b147de87dd Mon Sep 17 00:00:00 2001
From: Freek Van der Herten <freek@spatie.be>
Date: Fri, 8 Mar 2024 16:05:54 +0100
Subject: [PATCH] Update PHP and Laravel versions in test workflow and
 composer.json

---
 .github/workflows/run-tests.yml | 20 +++-----------------
 composer.json                   | 11 +++++------
 phpunit.xml.dist                | 12 ++++++------
 3 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 31a6b13..27ce350 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -12,23 +12,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1, 8.2]
-        laravel: ['9.*', '10.*', '11.*']
+        php: [8.2]
+        laravel: ['10.*', '11.*']
         dependency-version: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 10.*
-            testbench: 8.*
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 11.*
-            testbench: 9.*
-        exclude:
-          - laravel: 10.*
-            php: 8.0
-          - laravel: 11.*
-            php: 8.0
-          - laravel: 11.*
-            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -51,7 +37,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}"  --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
diff --git a/composer.json b/composer.json
index 533a566..7a00dfd 100644
--- a/composer.json
+++ b/composer.json
@@ -17,18 +17,17 @@
     ],
     "require": {
         "ext-json": "*",
-        "php": "^8.0",
+        "php": "^8.2",
         "guzzlehttp/guzzle": "^7.0",
-        "laravel/framework": "^9.0|^10.0|^11.0",
+        "laravel/framework": "^10.0|^11.0",
         "spatie/laravel-blink": "^1.3",
-        "spatie/regex": "^1.1|^3.1",
+        "spatie/regex": "^3.1",
         "symfony/process": "^6.0|^7.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^7.0|^8.0|^9.0",
-        "pestphp/pest": "^1.22|^2.34",
-        "phpunit/phpunit": "^9.3|^10.5"
+        "orchestra/testbench": "^8.0|^9.0",
+        "pestphp/pest": "^2.34"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 22da30c..a2f2eff 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="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>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <testsuites>
     <testsuite name="Spatie Test Suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>