Merge pull request #6 from glhd/laravel-11

Laravel 11 Support
glhd · Jul 23, 2024 · 65d53d1 · 65d53d1
2 parents 7c53de3 + be29190
commit 65d53d1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 39 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -8,14 +8,15 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4, 7.3]
-        laravel: [6, 7]
+        laravel: [10, 11]
         dependency-version: [lowest, stable]
         include:
-          - laravel: 7
-            testbench: 5
-          - laravel: 6
-            testbench: 4
+          - laravel: 10
+            testbench: 8
+            php: 8.1
+          - laravel: 11
+            testbench: 9
+            php: 8.3
 
     name: ${{ matrix.laravel }}.x on ${{ matrix.php }} (${{ matrix.dependency-version }} deps)
 
@@ -24,7 +25,7 @@ jobs:
         uses: actions/checkout@v1
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, libxml, mbstring

diff --git a/composer.json b/composer.json
@@ -16,13 +16,13 @@
 	"require": {
 		"php": ">=7.3.0",
 		"microsoft/tolerant-php-parser": "dev-main",
-		"illuminate/support": "^6.0|^7.0|^8.0|^9.0|10.*",
-		"illuminate/console": "^6.0|^7.0|^8.0|^9.0|10.*"
+		"illuminate/support": "^6.0|^7.0|^8.0|^9.0|10.*|^11.0",
+		"illuminate/console": "^6.0|^7.0|^8.0|^9.0|10.*|^11.0"
 	},
 	"require-dev": {
-		"laravel/framework": "^6.0|^7.0|^8.0|^9.0|10.*",
-		"orchestra/testbench": "^4.0|^5.0|^7.0|^8.0",
-		"phpunit/phpunit": "^9.0"
+		"laravel/framework": "^6.0|^7.0|^8.0|^9.0|10.*|^11.0",
+		"orchestra/testbench": "^4.0|^5.0|^7.0|^8.0|^9.0",
+		"phpunit/phpunit": "^9.0|^10.0"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,29 +1,21 @@
 <?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">
-	<testsuites>
-		<testsuite name="Tests">
-			<directory suffix="Test.php">./tests</directory>
-		</testsuite>
-	</testsuites>
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">./src</directory>
-		</whitelist>
-	</filter>
-	<php>
-		<env name="APP_ENV" value="testing"/>
-		<env name="BCRYPT_ROUNDS" value="4"/>
-		<env name="CACHE_DRIVER" value="array"/>
-		<env name="SESSION_DRIVER" value="array"/>
-		<env name="QUEUE_DRIVER" value="sync"/>
-		<env name="MAIL_DRIVER" value="array"/>
-	</php>
+<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 processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Tests">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="BCRYPT_ROUNDS" value="4"/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="QUEUE_DRIVER" value="sync"/>
+    <env name="MAIL_DRIVER" value="array"/>
+  </php>
 </phpunit>