chore(deps): php 8.3 and laravel 11

mvanduijker · Mar 13, 2024 · ebbed2c · ebbed2c
1 parent 2d2886d
commit ebbed2c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,6 +1,6 @@
 name: Run tests
 
-on: [ push, pull_request ]
+on: [ push ]
 
 jobs:
     test:
@@ -9,10 +9,12 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ ubuntu-latest ]
-                php: [ 7.3, 7.4, 8.0, 8.1, 8.2 ]
-                laravel: [ 6.*, 7.*, 8.*, 9.*, 10.* ]
+                php: [ 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 ]
+                laravel: [ 6.*, 7.*, 8.*, 9.*, 10.*, 11.* ]
                 dependency-version: [ prefer-stable ]
                 include:
+                    -   testbench: 9.*
+                        laravel: 11.*
                     -   testbench: 8.*
                         laravel: 10.*
                     -   testbench: 7.*
@@ -24,25 +26,36 @@ jobs:
                     -   testbench: 4.*
                         laravel: 6.*
                 exclude:
-                    -   php: 8.1
-                        laravel: 6.*
-                    -   php: 8.1
-                        laravel: 7.*
-                    -   php: 8.2
-                        laravel: 6.*
-                    -   php: 8.2
-                        laravel: 7.*
                     -   php: 7.3
                         laravel: 9.*
-                    -   php: 7.4
-                        laravel: 9.*
                     -   php: 7.3
                         laravel: 10.*
+                    -   php: 7.3
+                        laravel: 11.*
+                    -   php: 7.4
+                        laravel: 9.*
                     -   php: 7.4
                         laravel: 10.*
+                    -   php: 7.4
+                        laravel: 11.*
                     -   php: 8.0
                         laravel: 10.*
-
+                    -   php: 8.0
+                        laravel: 11.*
+                    -   php: 8.1
+                        laravel: 6.*
+                    -   php: 8.1
+                        laravel: 7.*
+                    -   php: 8.1
+                        laravel: 11.*
+                    -   php: 8.2
+                        laravel: 6.*
+                    -   php: 8.2
+                        laravel: 7.*
+                    -   php: 8.3
+                        laravel: 6.*
+                    -   php: 8.3
+                        laravel: 7.*
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
         steps:

diff --git a/composer.json b/composer.json
@@ -21,12 +21,12 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/database": "~6.0,!=6.9.0|~7.0|~8.0|~9.0|~10.0"
+        "illuminate/database": "~6.0,!=6.9.0|~7.0|~8.0|~9.0|~10.0|~11.0"
     },
     "require-dev": {
         "larapack/dd": "^1.0",
-        "orchestra/testbench": "~4.0|~5.0|~6.0|~7.0|~8.0",
-        "phpunit/phpunit": "^9.3"
+        "orchestra/testbench": "~4.0|~5.0|~6.0|~7.0|~8.0|~9.0",
+        "phpunit/phpunit": "^9.3|^10.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,9 +1,6 @@
 <?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">
+<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">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage"/>
@@ -18,4 +15,9 @@
   <logging>
     <junit outputFile="build/report.junit.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>