wip

spatie · Mar 11, 2024 · c46a2af · c46a2af
1 parent d130a23
commit c46a2af
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 64 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,19 +13,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.2, 8.1, 8.0]
-        laravel: [10.*, 9.*, 8.*]
-        dependency-version: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 10.*
-            testbench: ^8.0
-          - laravel: 9.*
-            testbench: ^7.0
-          - laravel: 8.*
-            testbench: ^6.23
-        exclude:
-          - laravel: 10.*
-            php: 8.0
+        php: [8.3, 8.2]
+        laravel: [11.*, 10.*]
+        dependency-version: [prefer-stable]
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -47,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/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ psalm.xml
 testbench.yaml
 tests/temp
 vendor
+.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -20,21 +20,20 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/cache": "^8.71|^9.0|^10.0",
-        "illuminate/container": "^8.71|^9.0|^10.0",
-        "illuminate/console": "^8.71|^9.0|^10.0",
-        "illuminate/http": "^8.71|^9.0|^10.0",
-        "illuminate/support": "^8.71|^9.0|^10.0",
+        "php": "^8.2",
+        "illuminate/cache": "^10.0|^11.0",
+        "illuminate/container": "^10.0|^11.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0",
         "nesbot/carbon": "^2.63",
         "spatie/laravel-package-tools": "^1.9"
     },
     "require-dev": {
-        "laravel/framework": "^9.0|^10.0",
+        "laravel/framework": "^10.0|^11.0",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^6.23|^7.0|^8.0",
-        "pestphp/pest": "^1.22",
-        "phpunit/phpunit": "^9.4"
+        "orchestra/testbench": "^8.0|^9.0",
+        "pestphp/pest": "^2.22"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,42 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
-    failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="VendorName Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
-    <php>
-        <env name="APP_DEBUG" value="true"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="VendorName Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <php>
+    <env name="APP_DEBUG" value="true"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>