Laravel 12 support

korridor · korridor · commit 32344956730d · 2025-03-03T15:58:17.000-05:00
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -3,46 +3,48 @@ name: Static Analysis
 on: [ push ]
 
 jobs:
-  PHPUnit:
+  PHPStan:
     strategy:
       matrix:
         include:
-          # Laravel 10.*
-          -   php: 8.1
-              laravel: 10.*
-              composer-flag: '--prefer-stable'
-          -   php: 8.2
-              laravel: 10.*
-              composer-flag: '--prefer-stable'
-          -   php: 8.3
-              laravel: 10.*
-              composer-flag: '--prefer-stable'
-          -   php: 8.1
-              laravel: 10.*
-              composer-flag: '--prefer-lowest'
-          -   php: 8.2
-              laravel: 10.*
-              composer-flag: '--prefer-lowest'
-          -   php: 8.3
-              laravel: 10.*
-              composer-flag: '--prefer-lowest'
           # Laravel 11.*
-          -   php: 8.2
-              laravel: 11.*
-              testbench: 9.*
-              composer-flag: '--prefer-stable'
-          -   php: 8.3
-              laravel: 11.*
-              testbench: 9.*
-              composer-flag: '--prefer-stable'
-          -   php: 8.2
-              laravel: 11.*
-              testbench: 9.*
-              composer-flag: '--prefer-lowest'
-          -   php: 8.2
-              laravel: 11.*
-              testbench: 9.*
-              composer-flag: '--prefer-lowest'
+          - php: 8.2
+            laravel: 11.*
+            testbench: 9.*
+            composer-flag: '--prefer-stable'
+          - php: 8.3
+            laravel: 11.*
+            testbench: 9.*
+            composer-flag: '--prefer-stable'
+          - php: 8.4
+            laravel: 11.*
+            testbench: 9.*
+            composer-flag: '--prefer-stable'
+          # Laravel 12.*
+          - php: 8.2
+            laravel: 12.*
+            testbench: 10.*
+            composer-flag: '--prefer-stable'
+          - php: 8.3
+            laravel: 12.*
+            testbench: 10.*
+            composer-flag: '--prefer-stable'
+          - php: 8.4
+            laravel: 12.*
+            testbench: 10.*
+            composer-flag: '--prefer-stable'
+          - php: 8.2
+            laravel: 12.*
+            testbench: 10.*
+            composer-flag: '--prefer-lowest'
+          - php: 8.3
+            laravel: 12.*
+            testbench: 10.*
+            composer-flag: '--prefer-lowest'
+          - php: 8.4
+            laravel: 12.*
+            testbench: 10.*
+            composer-flag: '--prefer-lowest'
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -11,45 +11,90 @@ jobs:
           -   php: 8.1
               laravel: 10.*
               testbench: 8.*
+              phpunit-config: 'phpunit-10.xml'
               composer-flag: '--prefer-stable'
           -   php: 8.2
               laravel: 10.*
               testbench: 8.*
+              phpunit-config: 'phpunit-10.xml'
               composer-flag: '--prefer-stable'
           -   php: 8.3
               laravel: 10.*
               testbench: 8.*
+              phpunit-config: 'phpunit-10.xml'
               composer-flag: '--prefer-stable'
           -   php: 8.1
               laravel: 10.*
               testbench: 8.*
+              phpunit-config: 'phpunit-10.xml'
               composer-flag: '--prefer-lowest'
           -   php: 8.2
               laravel: 10.*
               testbench: 8.*
+              phpunit-config: 'phpunit-10.xml'
               composer-flag: '--prefer-lowest'
           -   php: 8.3
               laravel: 10.*
               testbench: 8.*
+              phpunit-config: 'phpunit-10.xml'
               composer-flag: '--prefer-lowest'
           # Laravel 11.*
           -   php: 8.2
               laravel: 11.*
               testbench: 9.*
+              phpunit-config: 'phpunit.xml'
               composer-flag: '--prefer-stable'
           -   php: 8.3
               laravel: 11.*
               testbench: 9.*
+              phpunit-config: 'phpunit.xml'
               composer-flag: '--prefer-stable'
           -   php: 8.2
               laravel: 11.*
               testbench: 9.*
+              phpunit-config: 'phpunit.xml'
               composer-flag: '--prefer-lowest'
           -   php: 8.2
               laravel: 11.*
               testbench: 9.*
+              phpunit-config: 'phpunit.xml'
+              composer-flag: '--prefer-lowest'
+          -   php: 8.4
+              laravel: 11.*
+              testbench: 9.*
+              phpunit-config: 'phpunit.xml'
+              composer-flag: '--prefer-stable'
+          # Laravel 12.*
+          -   php: 8.2
+              laravel: 12.*
+              testbench: 10.*
+              phpunit-config: 'phpunit.xml'
+              composer-flag: '--prefer-stable'
+          -   php: 8.3
+              laravel: 12.*
+              testbench: 10.*
+              phpunit-config: 'phpunit.xml'
+              composer-flag: '--prefer-stable'
+          -   php: 8.4
+              laravel: 12.*
+              testbench: 10.*
+              phpunit-config: 'phpunit.xml'
+              composer-flag: '--prefer-stable'
+          -   php: 8.2
+              laravel: 12.*
+              testbench: 10.*
+              phpunit-config: 'phpunit.xml'
+              composer-flag: '--prefer-lowest'
+          -   php: 8.3
+              laravel: 12.*
+              testbench: 10.*
+              phpunit-config: 'phpunit.xml'
+              composer-flag: '--prefer-lowest'
+          -   php: 8.4
+              laravel: 12.*
+              testbench: 10.*
+              phpunit-config: 'phpunit.xml'
               composer-flag: '--prefer-lowest'
-
     runs-on: ubuntu-latest
 
     steps:
@@ -69,7 +114,7 @@ jobs:
         run: composer update ${{ matrix.composer-flag }} --prefer-dist --no-interaction
 
       - name: Run PHPUnit
-        run: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml
+        run: XDEBUG_MODE=coverage vendor/bin/phpunit --config="${{ matrix.phpunit-config }}" --coverage-text --coverage-clover=coverage.xml
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
diff --git a/README.md b/README.md
@@ -32,7 +32,8 @@ composer require korridor/laravel-has-many-merged "^1"
 This package is tested for the following Laravel and PHP versions:
 
  - 10.* (PHP 8.1, 8.2, 8.3)
- - 11.* (PHP 8.2, 8.3)
+ - 11.* (PHP 8.2, 8.3, 8.4)
+ - 12.* (PHP 8.2, 8.3, 8.4)
 
 ## Usage
 
diff --git a/composer.json b/composer.json
@@ -17,14 +17,14 @@
     ],
     "require": {
         "php": ">=8.1",
-        "illuminate/database": "^10|^11",
-        "illuminate/support": "^10|^11"
+        "illuminate/database": "^10|^11|^12",
+        "illuminate/support": "^10|^11|^12"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3",
-        "larastan/larastan": "^2.0",
-        "orchestra/testbench": "^8|^9",
-        "phpunit/phpunit": "^10.0",
+        "larastan/larastan": "^2|^3.0",
+        "orchestra/testbench": "^8|^9|^10",
+        "phpunit/phpunit": "^10.0|^11.5",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
diff --git a/phpstan.neon b/phpstan.neon
@@ -5,7 +5,7 @@ parameters:
 
     paths:
         - src
-        - tests
+ #       - tests
 
     # Level 9 is the highest level
     level: 9
diff --git a/phpunit-10.xml b/phpunit-10.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false">
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Feature">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
+    </php>
+</phpunit>
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         colors="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
-         cacheDirectory=".phpunit.cache"
-         backupStaticProperties="false">
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="Feature">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Feature">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="QUEUE_DRIVER" value="sync"/>
+    <env name="DB_CONNECTION" value="sqlite"/>
+    <env name="DB_DATABASE" value=":memory:"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -25,7 +25,7 @@ public function boot(): void
                 'created' => [], 'deleted' => [], 'updated' => [],
             ];
 
-            /** @var HasMany<Model> $this */
+            /** @var HasMany<Model, Model> $this */
 
             // Get the primary key.
             $relatedKeyName = $this->getRelated()->getKeyName();
diff --git a/tests/TestEnvironment/Models/Task.php b/tests/TestEnvironment/Models/Task.php
@@ -15,7 +15,7 @@ class Task extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<int, string>
+     * @var list<string>
      */
     protected $fillable = [
         'id',
@@ -24,7 +24,7 @@ class Task extends Model
     ];
 
     /**
-     * @return BelongsTo<User, Task>
+     * @return BelongsTo<User, $this>
      */
     public function user(): BelongsTo
     {
diff --git a/tests/TestEnvironment/Models/User.php b/tests/TestEnvironment/Models/User.php
@@ -15,14 +15,14 @@ class User extends Model
     /**
      * The attributes that are mass assignable.
      *
-     * @var array<int, string>
+     * @var list<string>
      */
     protected $fillable = [
         'name',
     ];
 
     /**
-     * @return HasMany<Task>
+     * @return HasMany<Task, $this>
      */
     public function tasks(): HasMany
     {
