Merge pull request #50 from eXolnet/feature/laravel11-support

build(deps): add Laravel 11 support
eXolnet · Mar 26, 2024 · c2c2895 · c2c2895
2 parents 3d9348d + ea16d74
commit c2c2895
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,11 +10,16 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.1, 8.2]
-        laravel: [10.*]
+        laravel: [10.*, 11.*]
         dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - php: 8.1
+            laravel: 11.*
         include:
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

diff --git a/composer.json b/composer.json
@@ -16,17 +16,17 @@
     },
     "require": {
         "php": "^8.1",
-        "illuminate/contracts": "^10.0",
-        "illuminate/http": "^10.0",
-        "illuminate/support": "^10.0",
-        "illuminate/view": "^10.0"
+        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0",
+        "illuminate/view": "^10.0|^11.0"
     },
     "require-dev": {
         "exolnet/phpcs-config": "^2.0",
         "laravel/pint": "^1.1",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^9.3.3",
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+>
     <testsuites>
         <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">src/</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/tests/Feature/BladeTest.php b/tests/Feature/BladeTest.php
@@ -30,7 +30,7 @@ public function testDirective(string $directive, bool $state): void
     /**
      * @return \Generator
      */
-    public function provideTestDirective(): Generator
+    public static function provideTestDirective(): Generator
     {
         yield ['launch', true];
         yield ['launch', false];

diff --git a/tests/Unit/Strategy/CallbackTest.php b/tests/Unit/Strategy/CallbackTest.php
@@ -26,7 +26,7 @@ public function testLaunch($expected): void
     /**
      * @return \Generator
      */
-    public function provideTestLaunch(): Generator
+    public static function provideTestLaunch(): Generator
     {
         yield [true];
         yield [false];

diff --git a/tests/Unit/Strategy/ConfigTest.php b/tests/Unit/Strategy/ConfigTest.php
@@ -44,7 +44,7 @@ public function testLaunch(bool $expected): void
     /**
      * @return array
      */
-    public function provideTestLaunch(): array
+    public static function provideTestLaunch(): array
     {
         return [
             [true],

diff --git a/tests/Unit/Strategy/DateTest.php b/tests/Unit/Strategy/DateTest.php
@@ -49,7 +49,7 @@ public function testLaunch($date, $operator, $expected): void
     /**
      * @return \Generator
      */
-    public function provideTestLaunch(): Generator
+    public static function provideTestLaunch(): Generator
     {
         yield ['2019-12-31', '<', true];
         yield ['2020-01-01', '<', false];

diff --git a/tests/Unit/Strategy/EnvironmentTest.php b/tests/Unit/Strategy/EnvironmentTest.php
@@ -46,7 +46,7 @@ public function testLaunch($environments, string $actualEnvironment, bool $expec
     /**
      * @return \Generator
      */
-    public function provideTestLaunch(): Generator
+    public static function provideTestLaunch(): Generator
     {
         yield ['local', 'local', true];
         yield ['local', 'production', false];

diff --git a/tests/Unit/Strategy/HostnameTest.php b/tests/Unit/Strategy/HostnameTest.php
@@ -33,7 +33,7 @@ public function testLaunch($hosts, string $actualHost, bool $expectedLaunch): vo
     /**
      * @return \Generator
      */
-    public function provideTestLaunch(): Generator
+    public static function provideTestLaunch(): Generator
     {
         yield ['localhost', 'localhost', true];
         yield ['localhost', 'bento.dev', false];