Merge branch 'master' into fix/get-columns-data

Author: taka-oyama

composer.json

@@ -11,14 +11,14 @@
     "php": "^8.2",
     "ext-grpc": "*",
     "ext-json": "*",
-    "laravel/framework": "^11.31.0",
+    "laravel/framework": "^12.0",
     "google/cloud-spanner": "^1.58.4",
     "grpc/grpc": "^1.42",
     "symfony/cache": "~7",
     "symfony/lock": "~7"
   },
   "require-dev": {
-    "orchestra/testbench": "~9",
+    "orchestra/testbench": "~10",
     "phpunit/phpunit": "~11.0",
     "phpstan/phpstan": "^2"
   },

phpstan.neon

@@ -2,3 +2,7 @@ parameters:
     level: 9
     paths:
         - src
+    ignoreErrors:
+        - message: "#^Call to an undefined method Illuminate\\\\Database\\\\ConnectionInterface\\:\\:recordsHaveBeenModified\\(\\)\\.$#"
+          count: 1
+          path: src/Query/Processor.php

src/Concerns/ManagesMutations.php

@@ -29,7 +29,7 @@
 use InvalidArgumentException;
 
 /**
- * @phpstan-type TDataSet list<array<string, array<array-key, mixed>>>|array<string, array<array-key, mixed>>
+ * @phpstan-type TDataSet list<array<string, mixed>>|array<string, mixed>
  */
 trait ManagesMutations
 {
@@ -129,7 +129,7 @@ protected function prepareForMutation(array $dataSet): array
             return [];
         }
 
-        if (Arr::isAssoc($dataSet)) {
+        if (!array_is_list($dataSet)) {
             $dataSet = [$dataSet];
         }
 

src/Connection.php

@@ -202,10 +202,7 @@ public function disconnect()
      */
     protected function getDefaultQueryGrammar(): QueryGrammar
     {
-        $grammar = new QueryGrammar();
-        $grammar->setConnection($this);
-        $this->withTablePrefix($grammar);
-        return $grammar;
+        return new QueryGrammar($this);
     }
 
     /**
@@ -214,10 +211,7 @@ protected function getDefaultQueryGrammar(): QueryGrammar
      */
     protected function getDefaultSchemaGrammar(): SchemaGrammar
     {
-        $grammar = new SchemaGrammar();
-        $grammar->setConnection($this);
-        $this->withTablePrefix($grammar);
-        return $grammar;
+        return new SchemaGrammar($this);
     }
 
     /**
@@ -427,16 +421,6 @@ public function getReadPdo()
         $this->markAsNotSupported('PDO access');
     }
 
-    /**
-     * TODO: Remove in v9
-     * @deprecated Parent method no longer exists. This will be removed in v9.
-     * @return never
-     */
-    public function getDoctrineConnection()
-    {
-        $this->markAsNotSupported('Doctrine');
-    }
-
     /**
      * {@inheritDoc}
      * @param array<array-key, mixed> $bindings

src/Eloquent/Concerns/DoesNotAutoIncrement.php

@@ -28,8 +28,7 @@
  */
 class Model extends BaseModel
 {
-    use Concerns\InterleaveKeySupport,
-        Concerns\DoesNotAutoIncrement;
+    use Concerns\InterleaveKeySupport;
 
     /**
      * @var list<string>

src/Eloquent/Model.php

@@ -53,10 +53,11 @@ public function compileUpsert(Builder $query, array $values, array $uniqueBy, ar
     /**
      * {@inheritDoc}
      * @param array<array-key, mixed> $values
+     * @param string|null $sequence
      */
     public function compileInsertGetId(Builder $query, $values, $sequence)
     {
-        $this->markAsNotSupported('insertGetId');
+        return $this->compileInsert($query, $values) . ' then return ' . $this->wrap($sequence ?? 'id');
     }
 
     /**

src/Query/Grammar.php

@@ -23,11 +23,41 @@
 use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Query\Processors\Processor as BaseProcessor;
 use Illuminate\Support\Carbon;
+use LogicException;
 
 class Processor extends BaseProcessor
 {
     /**
      * {@inheritDoc}
+     * @param array<array-key, mixed> $values
+     */
+    public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
+    {
+        $connection = $query->getConnection();
+
+        $connection->recordsHaveBeenModified();
+
+        $queryCall = static fn() => $connection->selectOne($sql, $values);
+
+        $result = $connection->transactionLevel() > 0
+            ? $queryCall()
+            : $connection->transaction($queryCall);
+
+        $sequence ??= 'id';
+
+        $id = match(true) {
+            is_object($result) => $result->{$sequence},
+            is_array($result) => $result[$sequence],
+            default => throw new LogicException('Unknown result type : ' . gettype($result)),
+        };
+
+        assert(is_int($id));
+
+        return $id;
+    }
+
+    /**
+     * @inheritDoc
      * @param array<array-key, array<array-key, mixed>> $results
      * @return array<array-key, array<array-key, mixed>>
      */

src/Query/Processor.php

@@ -262,16 +262,6 @@ public function tokenList(string $column, TokenizerFunction $function, string $t
         ])->invisible()->nullable();
     }
 
-    /**
-     * @deprecated use interleaveInParent instead.
-     * @param string $parentTableName
-     * @return InterleaveDefinition
-     */
-    public function interleave(string $parentTableName)
-    {
-        throw new LogicException('This method is not longer valid. Use interleaveInParent() instead.');
-    }
-
     /**
      * @param string $table
      * @return InterleaveDefinition

src/Schema/Blueprint.php

@@ -41,15 +41,16 @@ class Builder extends BaseBuilder
     public static $defaultMorphKeyType = 'uuid';
 
     /**
+     * @param null $schema
      * @inheritDoc Adds a parent key, for tracking interleaving
      *
      * @return list<array{ name: string, type: string, parent: string }>
      */
-    public function getTables()
+    public function getTables($schema = null)
     {
         /** @var list<array{ name: string, type: string, parent: string }> */
         return $this->connection->select(
-            $this->grammar->compileTables(),
+            $this->grammar->compileTables(null),
         );
     }
 
@@ -87,7 +88,7 @@ protected function createBlueprint($table, ?Closure $callback = null)
         /** @phpstan-ignore isset.property */
         return isset($this->resolver)
             ? ($this->resolver)($table, $callback)
-            : new Blueprint($table, $callback);
+            : new Blueprint($this->connection, $table, $callback);
     }
 
     /**
@@ -135,7 +136,7 @@ public function dropAllTables()
             foreach ($foreigns as $foreign) {
                 $blueprint->dropForeign($foreign);
             }
-            array_push($queries, ...$blueprint->toSql($connection, $this->grammar));
+            array_push($queries, ...$blueprint->toSql());
         }
         /** @var Connection $connection */
         $connection->runDdlBatch($queries);
@@ -153,7 +154,7 @@ public function dropAllTables()
                 $blueprint->dropIndex($index);
             }
             $blueprint->drop();
-            array_push($queries, ...$blueprint->toSql($connection, $this->grammar));
+            array_push($queries, ...$blueprint->toSql());
         }
         $connection->runDdlBatch($queries);
     }