fix conflicts

taylorotwell · taylorotwell · commit 74b721dff956 · 2026-02-26T15:32:31.000-06:00
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "source": "https://github.com/laravel/ai"
     },
     "require": {
-        "php": "^8.4",
+        "php": "^8.3",
         "illuminate/console": "^12.0|^13.0",
         "illuminate/container": "^12.0|^13.0",
         "illuminate/contracts": "^12.0|^13.0",
diff --git a/src/AiManager.php b/src/AiManager.php
@@ -441,8 +441,6 @@ public function createXaiDriver(array $config): XaiProvider
 
     /**
      * Get the default instance name.
-     *
-     * @return string
      */
     public function getDefaultInstance(): string
     {
@@ -455,7 +453,6 @@ public function getDefaultInstance(): string
      * Set the default instance name.
      *
      * @param  string  $name
-     * @return void
      */
     public function setDefaultInstance($name): void
     {
@@ -466,7 +463,6 @@ public function setDefaultInstance($name): void
      * Get the instance specific configuration.
      *
      * @param  string  $name
-     * @return array
      */
     public function getInstanceConfig($name): array
     {
diff --git a/src/AiServiceProvider.php b/src/AiServiceProvider.php
@@ -17,8 +17,6 @@ class AiServiceProvider extends ServiceProvider
 {
     /**
      * Register the package's services.
-     *
-     * @return void
      */
     public function register(): void
     {
@@ -30,8 +28,6 @@ public function register(): void
 
     /**
      * Bootstrap the package's services.
-     *
-     * @return void
      */
     public function boot(): void
     {
diff --git a/src/Files/Document.php b/src/Files/Document.php
@@ -59,9 +59,9 @@ public static function fromStorage(string $path, ?string $disk = null): StoredDo
      */
     public static function fromUpload(UploadedFile $file, ?string $mimeType = null): Base64Document
     {
-        return new Base64Document(
+        return (new Base64Document(
             base64_encode($file->getContent()),
             $mimeType ?? $file->getClientMimeType(),
-        )->as($file->getClientOriginalName());
+        ))->as($file->getClientOriginalName());
     }
 }
diff --git a/src/Files/Image.php b/src/Files/Image.php
@@ -51,9 +51,9 @@ public static function fromStorage(string $path, ?string $disk = null): StoredIm
      */
     public static function fromUpload(UploadedFile $file, ?string $mimeType = null): Base64Image
     {
-        return new Base64Image(
+        return (new Base64Image(
             base64_encode($file->getContent()),
             $mimeType ?? $file->getClientMimeType(),
-        )->as($file->getClientOriginalName());
+        ))->as($file->getClientOriginalName());
     }
 }
diff --git a/src/Gateway/Prism/PrismGateway.php b/src/Gateway/Prism/PrismGateway.php
@@ -316,7 +316,7 @@ public function generateTranscription(
 
         return new TranscriptionResponse(
             $response->text,
-            new Collection($response->additionalContent['segments'] ?? [])->map(function ($segment) {
+            (new Collection($response->additionalContent['segments'] ?? []))->map(function ($segment) {
                 return new TranscriptionSegment(
                     $segment['text'],
                     $segment['speaker'],
@@ -371,7 +371,7 @@ protected static function toPrismProvider(Provider $provider): PrismProvider
     {
         return match ($provider->driver()) {
             'anthropic' => PrismProvider::Anthropic,
-            'azure' => PrismProvider::OpenAI, 
+            'azure' => PrismProvider::OpenAI,
             'deepseek' => PrismProvider::DeepSeek,
             'gemini' => PrismProvider::Gemini,
             'groq' => PrismProvider::Groq,
diff --git a/src/Jobs/BroadcastAgent.php b/src/Jobs/BroadcastAgent.php
@@ -38,8 +38,6 @@ public function handle(): void
 
     /**
      * Get the display name for the queued job.
-     *
-     * @return string
      */
     public function displayName(): string
     {
diff --git a/src/Jobs/Concerns/InvokesQueuedResponseCallbacks.php b/src/Jobs/Concerns/InvokesQueuedResponseCallbacks.php
@@ -47,9 +47,6 @@ public function catch(Closure $callback): self
 
     /**
      * Handle a job failure.
-     *
-     * @param  \Throwable  $e
-     * @return void
      */
     public function failed(\Throwable $e): void
     {
diff --git a/src/Jobs/InvokeAgent.php b/src/Jobs/InvokeAgent.php
@@ -36,8 +36,6 @@ public function handle(): void
 
     /**
      * Get the display name for the queued job.
-     *
-     * @return string
      */
     public function displayName(): string
     {
diff --git a/src/Migrations/AiMigration.php b/src/Migrations/AiMigration.php
@@ -8,8 +8,6 @@ abstract class AiMigration extends Migration
 {
     /**
      * Get the migration connection name.
-     *
-     * @return string|null
      */
     public function getConnection(): ?string
     {
diff --git a/src/Providers/Provider.php b/src/Providers/Provider.php
@@ -67,7 +67,7 @@ public static function formatProviderAndModelList(Lab|array|string $providers, ?
                 : [($key instanceof Lab ? $key->value : $key) => $value];
         })->all();
     }
-    
+
     /**
      * Convert the provider to its string representation.
      */
diff --git a/src/Responses/StreamableAgentResponse.php b/src/Responses/StreamableAgentResponse.php
@@ -4,13 +4,13 @@
 
 use Closure;
 use Illuminate\Contracts\Support\Responsable;
-use Symfony\Component\HttpFoundation\Response;
 use Illuminate\Support\Collection;
 use IteratorAggregate;
 use Laravel\Ai\Responses\Data\Meta;
 use Laravel\Ai\Responses\Data\Usage;
 use Laravel\Ai\Streaming\Events\StreamEnd;
 use Laravel\Ai\Streaming\Events\TextDelta;
+use Symfony\Component\HttpFoundation\Response;
 use Traversable;
 
 class StreamableAgentResponse implements IteratorAggregate, Responsable
@@ -96,7 +96,6 @@ public function usingVercelDataProtocol(bool $value = true): self
      * Create an HTTP response that represents the object.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function toResponse($request): Response
     {
diff --git a/src/Responses/StructuredAgentResponse.php b/src/Responses/StructuredAgentResponse.php
@@ -35,7 +35,6 @@ public function toArray(): array
      * Convert the object to its JSON representation.
      *
      * @param  int  $options
-     * @return string
      */
     public function toJson($options = 0): string
     {
diff --git a/src/Store.php b/src/Store.php
@@ -8,6 +8,7 @@
 use Laravel\Ai\Contracts\Files\StorableFile;
 use Laravel\Ai\Contracts\Providers\FileProvider;
 use Laravel\Ai\Contracts\Providers\StoreProvider;
+use Laravel\Ai\Files\Base64Document;
 use Laravel\Ai\Files\ProviderDocument;
 use Laravel\Ai\Responses\AddedDocumentResponse;
 use Laravel\Ai\Responses\Data\StoreFileCounts;
diff --git a/src/Streaming/Events/ReasoningDelta.php b/src/Streaming/Events/ReasoningDelta.php
@@ -36,7 +36,7 @@ public function toArray(): array
     public function toVercelProtocolArray(): ?array
     {
         return [
-            'type' => 'reasoning-start',
+            'type' => 'reasoning-delta',
             'id' => $this->reasoningId,
             'delta' => $this->delta,
         ];
diff --git a/tests/Unit/Gateway/Prism/AddsToolsToPrismRequestsTest.php b/tests/Unit/Gateway/Prism/AddsToolsToPrismRequestsTest.php
@@ -49,7 +49,7 @@ public function __construct()
                 $this->toolInvokedCallback = fn () => null;
             }
 
-            public function test_invoke_tool(Tool $tool, array $arguments): string
+            public function testInvokeTool(Tool $tool, array $arguments): string
             {
                 return $this->invokeTool($tool, $arguments);
             }
@@ -98,7 +98,7 @@ public function __construct()
                 $this->toolInvokedCallback = fn () => null;
             }
 
-            public function test_invoke_tool(Tool $tool, array $arguments): string
+            public function testInvokeTool(Tool $tool, array $arguments): string
             {
                 return $this->invokeTool($tool, $arguments);
             }
@@ -147,7 +147,7 @@ public function __construct()
                 $this->toolInvokedCallback = fn () => null;
             }
 
-            public function test_invoke_tool(Tool $tool, array $arguments): string
+            public function testInvokeTool(Tool $tool, array $arguments): string
             {
                 return $this->invokeTool($tool, $arguments);
             }

Original file line number	Diff line number	Diff line change
`@@ -441,8 +441,6 @@ public function createXaiDriver(array $config): XaiProvider`
`441`	`441`
`442`	`442`	`/**`
`443`	`443`	`* Get the default instance name.`
`444`		`- *`
`445`		`- * @return string`
`446`	`444`	`*/`
`447`	`445`	`public function getDefaultInstance(): string`
`448`	`446`	`{`
`@@ -455,7 +453,6 @@ public function getDefaultInstance(): string`
`455`	`453`	`* Set the default instance name.`
`456`	`454`	`*`
`457`	`455`	`* @param string $name`
`458`		`- * @return void`
`459`	`456`	`*/`
`460`	`457`	`public function setDefaultInstance($name): void`
`461`	`458`	`{`
`@@ -466,7 +463,6 @@ public function setDefaultInstance($name): void`
`466`	`463`	`* Get the instance specific configuration.`
`467`	`464`	`*`
`468`	`465`	`* @param string $name`
`469`		`- * @return array`
`470`	`466`	`*/`
`471`	`467`	`public function getInstanceConfig($name): array`
`472`	`468`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ class AiServiceProvider extends ServiceProvider`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* Register the package's services.`
`20`		`- *`
`21`		`- * @return void`
`22`	`20`	`*/`
`23`	`21`	`public function register(): void`
`24`	`22`	`{`
`@@ -30,8 +28,6 @@ public function register(): void`
`30`	`28`
`31`	`29`	`/**`
`32`	`30`	`* Bootstrap the package's services.`
`33`		`- *`
`34`		`- * @return void`
`35`	`31`	`*/`
`36`	`32`	`public function boot(): void`
`37`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ public static function fromStorage(string $path, ?string $disk = null): StoredDo`
`59`	`59`	`*/`
`60`	`60`	`public static function fromUpload(UploadedFile $file, ?string $mimeType = null): Base64Document`
`61`	`61`	`{`
`62`		`- return new Base64Document(`
	`62`	`+ return (new Base64Document(`
`63`	`63`	`base64_encode($file->getContent()),`
`64`	`64`	`$mimeType ?? $file->getClientMimeType(),`
`65`		`- )->as($file->getClientOriginalName());`
	`65`	`+ ))->as($file->getClientOriginalName());`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ public static function fromStorage(string $path, ?string $disk = null): StoredIm`
`51`	`51`	`*/`
`52`	`52`	`public static function fromUpload(UploadedFile $file, ?string $mimeType = null): Base64Image`
`53`	`53`	`{`
`54`		`- return new Base64Image(`
	`54`	`+ return (new Base64Image(`
`55`	`55`	`base64_encode($file->getContent()),`
`56`	`56`	`$mimeType ?? $file->getClientMimeType(),`
`57`		`- )->as($file->getClientOriginalName());`
	`57`	`+ ))->as($file->getClientOriginalName());`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ public function handle(): void`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* Get the display name for the queued job.`
`41`		`- *`
`42`		`- * @return string`
`43`	`41`	`*/`
`44`	`42`	`public function displayName(): string`
`45`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,6 @@ public function catch(Closure $callback): self`
`47`	`47`
`48`	`48`	`/**`
`49`	`49`	`* Handle a job failure.`
`50`		`- *`
`51`		`- * @param \Throwable $e`
`52`		`- * @return void`
`53`	`50`	`*/`
`54`	`51`	`public function failed(\Throwable $e): void`
`55`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public function handle(): void`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* Get the display name for the queued job.`
`39`		`- *`
`40`		`- * @return string`
`41`	`39`	`*/`
`42`	`40`	`public function displayName(): string`
`43`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ abstract class AiMigration extends Migration`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Get the migration connection name.`
`11`		`- *`
`12`		`- * @return string\|null`
`13`	`11`	`*/`
`14`	`12`	`public function getConnection(): ?string`
`15`	`13`	`{`