feat: Laravel 11.x Compatibility (#21)

* Update composer.json * WIP * Update run-tests.yml * Update composer.json * Update composer.json * Update composer.json * WIP * Fix styling * Update TestCase.php * Update TestCase.php * Fix styling * Update TestCase.php * Fix styling * Update TestCase.php * Fix styling * Update TestCase.php * Fix styling * Update composer.json --------- Co-authored-by: ralphjsmit <[email protected]>
ralphjsmit · Mar 14, 2024 · e9f1531 · e9f1531
1 parent c06d4be
commit e9f1531
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 52 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -12,16 +12,19 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.1, 8.2 ]
-        laravel: [ 8.*, 9.*, 10.* ]
+        php: [ 8.1, 8.2, 8.3 ]
+        laravel: [ 9.*, 10.*, 11.* ]
         stability: [ prefer-lowest, prefer-stable ]
         include:
-          - laravel: 8.*
-            testbench: ^6.23
           - laravel: 9.*
             testbench: ^7.0
           - laravel: 10.*
             testbench: ^8.0
+          - laravel: 11.*
+            testbench: ^9.0
+        exclude:
+          - php: 8.1
+            laravel: 11.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ node_modules
 node_modules.nosync
 .php-cs-fixer.cache
 .DS_Store
+.phpunit.cache
+phpunit.xml.dist.bak
diff --git a/composer.json b/composer.json
@@ -18,17 +18,18 @@
   "require": {
     "php": "^8.0",
     "filament/filament": "^3.0",
-    "illuminate/contracts": "^8.73|^9.0|^10.0",
+    "illuminate/contracts": "^9.52|^10.0|^11.0",
     "ralphjsmit/laravel-seo": "^1.0.4",
     "spatie/laravel-package-tools": "^1.9.2"
   },
   "require-dev": {
-    "nesbot/carbon": "^2.66",
-    "nunomaduro/collision": "^5.10|^6.1|^7.0",
-    "orchestra/testbench": "^6.22|^7.0|^8.0",
-    "pestphp/pest": "^1.21",
-    "pestphp/pest-plugin-laravel": "^1.1",
-    "phpunit/phpunit": "^9.5",
+    "doctrine/dbal": "^3.8",
+    "nesbot/carbon": "^2.66|^3.0",
+    "nunomaduro/collision": "^6.1|^7.0|^8.0",
+    "orchestra/testbench": "^7.0|^8.0|^9.0",
+    "pestphp/pest": "^1.21|^2.0",
+    "pestphp/pest-plugin-laravel": "^1.1|^2.0",
+    "phpunit/phpunit": "^9.5|^10.5",
     "spatie/laravel-ray": "^1.26"
   },
   "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,34 +1,16 @@
 <?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="RalphJSmit Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
-    <php>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-    </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="RalphJSmit Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -1,6 +1,5 @@
 <?php
 
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use RalphJSmit\Filament\SEO\Tests\TestCase;
 
-uses(TestCase::class, RefreshDatabase::class)->in(__DIR__);
+uses(TestCase::class)->in(__DIR__);
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -6,6 +6,8 @@
 use Filament\Forms\FormsServiceProvider;
 use Filament\Support\SupportServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\View;
 use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
@@ -14,14 +16,25 @@
 
 class TestCase extends Orchestra
 {
+    use RefreshDatabase;
+
     protected function setUp(): void
     {
         parent::setUp();
 
         Factory::guessFactoryNamesUsing(fn (string $modelName) => 'RalphJSmit\\Filament\\SEO\\Database\\Factories\\' . class_basename($modelName) . 'Factory');
+
+        View::addLocation(__DIR__ . '/Fixtures/resources/views');
+
+        // Laravel 11 changed the way database migrations are loaded and removed the Doctrine DBAL dependency.
+        // That behaviour broke the previous way of running tests using `getEnvironmentSetUp()`.
+        if (version_compare(Application::VERSION, '11', '>=')) {
+            (include __DIR__ . '/Fixtures/migrations/create_test_tables.php')->up();
+            (include __DIR__ . '/../vendor/ralphjsmit/laravel-seo/database/migrations/create_seo_table.php.stub')->up();
+        }
     }
 
-    protected function getPackageProviders($app)
+    protected function getPackageProviders($app): array
     {
         return [
             LivewireServiceProvider::class,
@@ -33,13 +46,13 @@ protected function getPackageProviders($app)
         ];
     }
 
-    public function getEnvironmentSetUp($app)
+    protected function getEnvironmentSetUp($app): void
     {
-        config()->set('database.default', 'testing');
-
-        View::addLocation(__DIR__ . '/Fixtures/resources/views');
+        if (version_compare(Application::VERSION, '11', '<')) {
+            config()->set('database.default', 'testing');
 
-        (include __DIR__ . '/Fixtures/migrations/create_test_tables.php')->up();
-        (include __DIR__ . '/../vendor/ralphjsmit/laravel-seo/database/migrations/create_seo_table.php.stub')->up();
+            (include __DIR__ . '/Fixtures/migrations/create_test_tables.php')->up();
+            (include __DIR__ . '/../vendor/ralphjsmit/laravel-seo/database/migrations/create_seo_table.php.stub')->up();
+        }
     }
 }