Merge branch '11.x'

Signed-off-by: Mior Muhammad Zaki <[email protected]>

composer.json

@@ -31,7 +31,7 @@
         "fruitcake/php-cors": "^1.3",
         "guzzlehttp/guzzle": "^7.8",
         "guzzlehttp/uri-template": "^1.0",
-        "laravel/prompts": "dev-l12",
+        "laravel/prompts": "^0.3.0",
         "laravel/serializable-closure": "^1.3",
         "league/commonmark": "^2.2.1",
         "league/flysystem": "^3.8.0",

phpstan.types.neon.dist

@@ -2,5 +2,3 @@ parameters:
     level: max
     paths:
         - types
-    ignoreErrors:
-        - identifier: argument.templateType

src/Illuminate/Collections/Collection.php

@@ -490,7 +490,7 @@ public function getOrPut($key, $value)
      *
      * @param  (callable(TValue, TKey): TGroupKey)|array|string  $groupBy
      * @param  bool  $preserveKeys
-     * @return static<TGroupKey, static<($preserveKeys is true ? TKey : int), TValue>>
+     * @return static<($groupBy is string ? array-key : ($groupBy is array ? array-key : TGroupKey)), static<($preserveKeys is true ? TKey : int), TValue>>
      */
     public function groupBy($groupBy, $preserveKeys = false)
     {
@@ -542,7 +542,7 @@ public function groupBy($groupBy, $preserveKeys = false)
      * @template TNewKey of array-key
      *
      * @param  (callable(TValue, TKey): TNewKey)|array|string  $keyBy
-     * @return static<TNewKey, TValue>
+     * @return static<($keyBy is string ? array-key : ($keyBy is array ? array-key : TNewKey)), TValue>
      */
     public function keyBy($keyBy)
     {

src/Illuminate/Collections/Enumerable.php

@@ -522,7 +522,7 @@ public function get($key, $default = null);
      *
      * @param  (callable(TValue, TKey): TGroupKey)|array|string  $groupBy
      * @param  bool  $preserveKeys
-     * @return static<TGroupKey, static<($preserveKeys is true ? TKey : int), TValue>>
+     * @return static<($groupBy is string ? array-key : ($groupBy is array ? array-key : TGroupKey)), static<($preserveKeys is true ? TKey : int), TValue>>
      */
     public function groupBy($groupBy, $preserveKeys = false);
 
@@ -532,7 +532,7 @@ public function groupBy($groupBy, $preserveKeys = false);
      * @template TNewKey of array-key
      *
      * @param  (callable(TValue, TKey): TNewKey)|array|string  $keyBy
-     * @return static<TNewKey, TValue>
+     * @return static<($keyBy is string ? array-key : ($keyBy is array ? array-key : TNewKey)), TValue>
      */
     public function keyBy($keyBy);
 

src/Illuminate/Collections/LazyCollection.php

@@ -548,7 +548,7 @@ public function get($key, $default = null)
      *
      * @param  (callable(TValue, TKey): TGroupKey)|array|string  $groupBy
      * @param  bool  $preserveKeys
-     * @return static<TGroupKey, static<($preserveKeys is true ? TKey : int), TValue>>
+     * @return static<($groupBy is string ? array-key : ($groupBy is array ? array-key : TGroupKey)), static<($preserveKeys is true ? TKey : int), TValue>>
      */
     public function groupBy($groupBy, $preserveKeys = false)
     {
@@ -561,7 +561,7 @@ public function groupBy($groupBy, $preserveKeys = false)
      * @template TNewKey of array-key
      *
      * @param  (callable(TValue, TKey): TNewKey)|array|string  $keyBy
-     * @return static<TNewKey, TValue>
+     * @return static<($keyBy is string ? array-key : ($keyBy is array ? array-key : TNewKey)), TValue>
      */
     public function keyBy($keyBy)
     {

src/Illuminate/Database/Schema/Blueprint.php

@@ -1452,6 +1452,18 @@ public function computed($column, $expression)
         return $this->addColumn('computed', $column, compact('expression'));
     }
 
+    /**
+     * Create a new vector column on the table.
+     *
+     * @param  string  $column
+     * @param  int  $dimensions
+     * @return \Illuminate\Database\Schema\ColumnDefinition
+     */
+    public function vector($column, $dimensions)
+    {
+        return $this->addColumn('vector', $column, compact('dimensions'));
+    }
+
     /**
      * Add the proper columns for a polymorphic table.
      *

src/Illuminate/Database/Schema/Grammars/Grammar.php

@@ -234,6 +234,17 @@ protected function typeComputed(Fluent $column)
         throw new RuntimeException('This database driver does not support the computed type.');
     }
 
+    /**
+     * Create the column definition for a vector type.
+     *
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string
+     */
+    protected function typeVector(Fluent $column)
+    {
+        throw new RuntimeException('This database driver does not support the vector type.');
+    }
+
     /**
      * Add the column modifiers to the definition.
      *

src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php

@@ -1103,6 +1103,17 @@ protected function typeComputed(Fluent $column)
         throw new RuntimeException('This database driver requires a type, see the virtualAs / storedAs modifiers.');
     }
 
+    /**
+     * Create the column definition for a vector type.
+     *
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string
+     */
+    protected function typeVector(Fluent $column)
+    {
+        return "vector($column->dimensions)";
+    }
+
     /**
      * Get the SQL for a generated virtual column modifier.
      *

src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php

@@ -1053,6 +1053,17 @@ protected function typeGeography(Fluent $column)
         return 'geography';
     }
 
+    /**
+     * Create the column definition for a vector type.
+     *
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string
+     */
+    protected function typeVector(Fluent $column)
+    {
+        return "vector($column->dimensions)";
+    }
+
     /**
      * Get the SQL for a collation column modifier.
      *

src/Illuminate/Foundation/Configuration/ApplicationBuilder.php

@@ -282,12 +282,14 @@ public function withMiddleware(?callable $callback = null)
      */
     public function withCommands(array $commands = [])
     {
-        if (empty($commands) && is_file($this->app->basePath('routes/console.php'))) {
-            $commands = [$this->app->basePath('routes/console.php')];
-        }
+        if (empty($commands)) {
+            if (is_file($this->app->basePath('routes/console.php'))) {
+                $commands = [$this->app->basePath('routes/console.php')];
+            }
 
-        if (empty($commands) && is_dir($this->app->path('Console/Commands'))) {
-            $commands = [$this->app->path('Console/Commands')];
+            if (is_dir($this->app->path('Console/Commands'))) {
+                $commands = [...$commands, $this->app->path('Console/Commands')];
+            }
         }
 
         $this->app->afterResolving(ConsoleKernel::class, function ($kernel) use ($commands) {

src/Illuminate/Foundation/Console/ListenerMakeCommand.php

@@ -104,7 +104,7 @@ protected function getStub()
      */
     protected function alreadyExists($rawName)
     {
-        return class_exists($rawName);
+        return class_exists($this->qualifyClass($rawName));
     }
 
     /**

src/Illuminate/Foundation/Console/VendorPublishCommand.php

@@ -31,7 +31,7 @@ class VendorPublishCommand extends Command
     /**
      * The provider to publish.
      *
-     * @var string
+     * @var string|null
      */
     protected $provider = null;
 

src/Illuminate/Http/FileHelpers.php

@@ -9,7 +9,7 @@ trait FileHelpers
     /**
      * The cache copy of the file's hash name.
      *
-     * @var string
+     * @var string|null
      */
     protected $hashName = null;
 

src/Illuminate/Support/Process/PhpExecutableFinder.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Support\Process;
 
+use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\PhpExecutableFinder as SymfonyPhpExecutableFinder;
 
 class PhpExecutableFinder extends SymfonyPhpExecutableFinder

src/Illuminate/Testing/TestResponse.php

@@ -28,6 +28,8 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
+ * @template TResponse of \Symfony\Component\HttpFoundation\Response
+ *
  * @mixin \Illuminate\Http\Response
  */
 class TestResponse implements ArrayAccess
@@ -46,7 +48,7 @@ class TestResponse implements ArrayAccess
     /**
      * The response to delegate to.
      *
-     * @var \Illuminate\Http\Response
+     * @var TResponse
      */
     public $baseResponse;
 
@@ -67,7 +69,7 @@ class TestResponse implements ArrayAccess
     /**
      * Create a new test response instance.
      *
-     * @param  \Illuminate\Http\Response  $response
+     * @param  TResponse  $response
      * @param  \Illuminate\Http\Request|null  $request
      * @return void
      */
@@ -81,9 +83,11 @@ public function __construct($response, $request = null)
     /**
      * Create a new TestResponse from another response.
      *
-     * @param  \Illuminate\Http\Response  $response
+     * @template R of TResponse
+     *
+     * @param  R  $response
      * @param  \Illuminate\Http\Request|null  $request
-     * @return static
+     * @return static<R>
      */
     public static function fromBaseResponse($response, $request = null)
     {

tests/Database/DatabaseMySqlSchemaGrammarTest.php

@@ -1322,6 +1322,16 @@ public function testAddingComment()
         $this->assertSame("alter table `users` add `foo` varchar(255) not null comment 'Escape \\' when using words like it\\'s'", $statements[0]);
     }
 
+    public function testAddingVector()
+    {
+        $blueprint = new Blueprint('embeddings');
+        $blueprint->vector('embedding', 384);
+        $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
+
+        $this->assertCount(1, $statements);
+        $this->assertSame('alter table `embeddings` add `embedding` vector(384) not null', $statements[0]);
+    }
+
     public function testCreateDatabase()
     {
         $connection = $this->getConnection();

tests/Database/DatabasePostgresSchemaGrammarTest.php

@@ -42,6 +42,16 @@ public function testBasicCreateTable()
         ], $statements);
     }
 
+    public function testAddingVector()
+    {
+        $blueprint = new Blueprint('embeddings');
+        $blueprint->vector('embedding', 384);
+        $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
+
+        $this->assertCount(1, $statements);
+        $this->assertSame('alter table "embeddings" add column "embedding" vector(384) not null', $statements[0]);
+    }
+
     public function testCreateTableWithAutoIncrementStartingValue()
     {
         $blueprint = new Blueprint('users');

types/Testing/TestResponse.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response;
+use Illuminate\Testing\TestResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+use function PHPStan\Testing\assertType;
+
+$response = TestResponse::fromBaseResponse(response('Laravel', 200));
+assertType(Response::class, $response->baseResponse);
+
+$response = TestResponse::fromBaseResponse(response()->redirectTo(''));
+assertType(RedirectResponse::class, $response->baseResponse);
+
+$response = TestResponse::fromBaseResponse(response()->download(''));
+assertType(BinaryFileResponse::class, $response->baseResponse);
+
+$response = TestResponse::fromBaseResponse(response()->json());
+assertType(JsonResponse::class, $response->baseResponse);
+
+$response = TestResponse::fromBaseResponse(response()->streamDownload(fn () => 1));
+assertType(StreamedResponse::class, $response->baseResponse);