Support Laravel 12 (#122)

* Support Laravel 12

* Support Laravel 12

* Support Laravel 12

* Support Laravel 12

Author: staudenmeir

.github/workflows/static-analysis.yml

@@ -34,4 +34,4 @@ jobs:
       - name: Analyse types
         run: |
           docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm php${{ matrix.php }} \
-            vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --error-format=github --memory-limit=-1 
+            vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --error-format=github --memory-limit=-1

composer.json

@@ -10,17 +10,17 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/database": "^11.0",
-        "staudenmeir/eloquent-has-many-deep-contracts": "^1.2"
+        "illuminate/database": "^12.0",
+        "staudenmeir/eloquent-has-many-deep-contracts": "^1.3"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^3.0",
         "larastan/larastan": "^3.0",
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^12.0",
         "mockery/mockery": "^1.5.1",
-        "orchestra/testbench-core": "^9.5",
+        "orchestra/testbench-core": "^10.0",
         "phpunit/phpunit": "^11.0",
-        "staudenmeir/eloquent-has-many-deep": "^1.20"
+        "staudenmeir/eloquent-has-many-deep": "^1.21"
     },
     "autoload": {
         "psr-4": {

src/Grammars/Traits/CompilesMySqlJsonQueries.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Database\Query\Expression;
 use Illuminate\Database\ConnectionInterface;
+use Illuminate\Database\MariaDbConnection;
 
 trait CompilesMySqlJsonQueries
 {
@@ -51,9 +52,9 @@ public function compileJsonValueSelect(string $column): string
      */
     public function supportsMemberOf(ConnectionInterface $connection): bool
     {
-        /** @var \Illuminate\Database\MySqlConnection $connection */
+        /** @var \Illuminate\Database\Connection $connection */
 
-        if ($connection->isMaria()) {
+        if ($connection instanceof MariaDbConnection) {
             return false;
         }
 

src/IdeHelperServiceProvider.php

@@ -12,7 +12,8 @@ class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProv
     /**
      * @var string
      */
-    const ModelsCommandAlias = __NAMESPACE__ . '\\' . ModelsCommand::class;
+    public const ModelsCommandAlias = __NAMESPACE__ . '\\' . ModelsCommand::class;
+
     public function register(): void
     {
         /** @var \Illuminate\Config\Repository $config */

src/Relations/Traits/IsJsonRelation.php

@@ -160,19 +160,14 @@ protected function getJsonGrammar(Builder $query): JsonGrammar
         /** @var \Illuminate\Database\Connection $connection */
         $connection = $query->getConnection();
 
-        /** @var \Staudenmeir\EloquentJsonRelations\Grammars\JsonGrammar $grammar */
-        $grammar = $connection->withTablePrefix(
-            match ($connection->getDriverName()) {
-                'mysql' => new MySqlGrammar(),
-                'mariadb' => new MariaDbGrammar(),
-                'pgsql' => new PostgresGrammar(),
-                'sqlite' => new SQLiteGrammar(),
-                'sqlsrv' => new SqlServerGrammar(),
-                default => throw new RuntimeException('This database is not supported.') // @codeCoverageIgnore
-            }
-        );
-
-        return $grammar;
+        return match ($connection->getDriverName()) {
+            'mysql' => new MySqlGrammar($connection),
+            'mariadb' => new MariaDbGrammar($connection),
+            'pgsql' => new PostgresGrammar($connection),
+            'sqlite' => new SQLiteGrammar($connection),
+            'sqlsrv' => new SqlServerGrammar($connection),
+            default => throw new RuntimeException('This database is not supported.') // @codeCoverageIgnore
+        };
     }
 
     /**

types/Relationships.php

@@ -15,7 +15,7 @@ function test(Role $role, User $user): void
         'Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson<Staudenmeir\EloquentJsonRelations\Types\Models\Role, Staudenmeir\EloquentJsonRelations\Types\Models\User>',
         $user->belongsToJson(Role::class, 'role_ids')
     );
-    
+
     assertType(
         'Staudenmeir\EloquentJsonRelations\Relations\HasManyJson<Staudenmeir\EloquentJsonRelations\Types\Models\User, Staudenmeir\EloquentJsonRelations\Types\Models\Role>',
         $role->hasManyJson(User::class, 'role_ids')