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

build(deps): add Laravel 11 support
eXolnet · Mar 26, 2024 · 3ea1aa3 · 3ea1aa3
2 parents 5b35e4f + 1df6718
commit 3ea1aa3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 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
@@ -20,13 +20,13 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/database": "^10.0"
+        "illuminate/database": "^10.0|^11.0"
     },
     "require-dev": {
         "exolnet/phpcs-config": "^2.0",
         "mockery/mockery": "^1.4.3",
-        "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^9.3.3",
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.6.0"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +1,22 @@
 <?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>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
     <php>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
         <env name="DB_FOREIGN_KEYS" value="true"/>
     </php>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/tests/Unit/Model/NodeUnorderedTest.php b/tests/Unit/Model/NodeUnorderedTest.php
@@ -4,9 +4,9 @@
 
 use Exolnet\ClosureTable\Models\NodeUnordered;
 use Exolnet\ClosureTable\Tests\Mocks\NodeMock;
-use Exolnet\ClosureTable\Tests\Unit\UnitTest;
+use Exolnet\ClosureTable\Tests\Unit\UnitTestCase;
 
-class NodeUnorderedTest extends UnitTest
+class NodeUnorderedTest extends UnitTestCase
 {
     /**
      * @var \Exolnet\ClosureTable\Tests\Mocks\NodeMock

diff --git a/tests/Unit/UnitTest.php → tests/Unit/UnitTestCase.php b/tests/Unit/UnitTest.php → tests/Unit/UnitTestCase.php
@@ -5,7 +5,7 @@
 use Mockery;
 use PHPUnit\Framework\TestCase;
 
-abstract class UnitTest extends TestCase
+abstract class UnitTestCase extends TestCase
 {
     public function tearDown(): void
     {