Makes imports consistent (#253)

nunomaduro · web-flow · commit 8c35ed04ebde · 2026-03-10T14:58:47.000-05:00
diff --git a/src/Ai.php b/src/Ai.php
@@ -5,7 +5,7 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @see \Laravel\Ai\AiManager
+ * @see AiManager
  */
 class Ai extends Facade
 {
diff --git a/src/Contracts/ConversationStore.php b/src/Contracts/ConversationStore.php
@@ -3,6 +3,7 @@
 namespace Laravel\Ai\Contracts;
 
 use Illuminate\Support\Collection;
+use Laravel\Ai\Messages\Message;
 use Laravel\Ai\Prompts\AgentPrompt;
 use Laravel\Ai\Responses\AgentResponse;
 
@@ -31,7 +32,7 @@ public function storeAssistantMessage(string $conversationId, string|int|null $u
     /**
      * Get the latest messages for the given conversation.
      *
-     * @return \Illuminate\Support\Collection<int, \Laravel\Ai\Messages\Message>
+     * @return Collection<int, Message>
      */
     public function getLatestConversationMessages(string $conversationId, int $limit): Collection;
 }
diff --git a/src/Contracts/Conversational.php b/src/Contracts/Conversational.php
@@ -2,12 +2,14 @@
 
 namespace Laravel\Ai\Contracts;
 
+use Laravel\Ai\Messages\Message;
+
 interface Conversational
 {
     /**
      * Get the list of messages comprising the conversation so far.
      *
-     * @return \Laravel\Ai\Messages\Message[]
+     * @return Message[]
      */
     public function messages(): iterable;
 }
diff --git a/src/Contracts/Gateway/TextGateway.php b/src/Contracts/Gateway/TextGateway.php
@@ -4,18 +4,21 @@
 
 use Closure;
 use Generator;
+use Illuminate\JsonSchema\Types\Type;
 use Laravel\Ai\Contracts\Providers\TextProvider;
+use Laravel\Ai\Contracts\Tool;
 use Laravel\Ai\Gateway\TextGenerationOptions;
+use Laravel\Ai\Messages\Message;
 use Laravel\Ai\Responses\TextResponse;
 
 interface TextGateway
 {
     /**
      * Generate text representing the next message in a conversation.
      *
-     * @param  \Laravel\Ai\Messages\Message[]  $messages
-     * @param  \Laravel\Ai\Contracts\Tool[]  $tools
-     * @param  array<string, \Illuminate\JsonSchema\Types\Type>|null  $schema
+     * @param  Message[]  $messages
+     * @param  Tool[]  $tools
+     * @param  array<string, Type>|null  $schema
      */
     public function generateText(
         TextProvider $provider,
@@ -31,9 +34,9 @@ public function generateText(
     /**
      * Stream text representing the next message in a conversation.
      *
-     * @param  \Laravel\Ai\Messages\Message[]  $messages
-     * @param  \Laravel\Ai\Contracts\Tool[]  $tools
-     * @param  array<string, \Illuminate\JsonSchema\Types\Type>|null  $schema
+     * @param  Message[]  $messages
+     * @param  Tool[]  $tools
+     * @param  array<string, Type>|null  $schema
      */
     public function streamText(
         string $invocationId,
diff --git a/src/Contracts/HasStructuredOutput.php b/src/Contracts/HasStructuredOutput.php
@@ -3,13 +3,14 @@
 namespace Laravel\Ai\Contracts;
 
 use Illuminate\Contracts\JsonSchema\JsonSchema;
+use Illuminate\JsonSchema\Types\Type;
 
 interface HasStructuredOutput
 {
     /**
      * Get the agent's structured output schema definition.
      *
-     * @return array<string, \Illuminate\JsonSchema\Types\Type>
+     * @return array<string, Type>
      */
     public function schema(JsonSchema $schema): array;
 }
diff --git a/src/Contracts/Tool.php b/src/Contracts/Tool.php
@@ -3,6 +3,7 @@
 namespace Laravel\Ai\Contracts;
 
 use Illuminate\Contracts\JsonSchema\JsonSchema;
+use Illuminate\JsonSchema\Types\Type;
 use Laravel\Ai\Tools\Request;
 use Stringable;
 
@@ -21,7 +22,7 @@ public function handle(Request $request): Stringable|string;
     /**
      * Get the tool's schema definition.
      *
-     * @return array<string, \Illuminate\JsonSchema\Types\Type>
+     * @return array<string, Type>
      */
     public function schema(JsonSchema $schema): array;
 }
diff --git a/src/Gateway/FakeTextGateway.php b/src/Gateway/FakeTextGateway.php
@@ -5,6 +5,7 @@
 use Closure;
 use Generator;
 use Illuminate\JsonSchema\Types\ObjectType;
+use Illuminate\JsonSchema\Types\Type;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Laravel\Ai\Contracts\Gateway\TextGateway;
@@ -37,7 +38,7 @@ public function __construct(
     /**
      * Generate text representing the next message in a conversation.
      *
-     * @param  array<string, \Illuminate\JsonSchema\Types\Type>|null  $schema
+     * @param  array<string, Type>|null  $schema
      */
     public function generateText(
         TextProvider $provider,
@@ -61,7 +62,7 @@ public function generateText(
     /**
      * Stream text representing the next message in a conversation.
      *
-     * @param  array<string, \Illuminate\JsonSchema\Types\Type>|null  $schema
+     * @param  array<string, Type>|null  $schema
      */
     public function streamText(
         string $invocationId,
diff --git a/src/PendingResponses/PendingImageGeneration.php b/src/PendingResponses/PendingImageGeneration.php
@@ -8,6 +8,7 @@
 use Laravel\Ai\Events\ProviderFailedOver;
 use Laravel\Ai\Exceptions\FailoverableException;
 use Laravel\Ai\FakePendingDispatch;
+use Laravel\Ai\Files\Image;
 use Laravel\Ai\Files\LocalImage;
 use Laravel\Ai\Files\StoredImage;
 use Laravel\Ai\Jobs\GenerateImage;
@@ -36,7 +37,7 @@ public function __construct(
     /**
      * Provide the reference images that should be sent with the request.
      *
-     * @param  array<\Laravel\Ai\Files\Image>  $attachments
+     * @param  array<Image>  $attachments
      */
     public function attachments(array $attachments): self
     {
diff --git a/src/Providers/Tools/FileSearch.php b/src/Providers/Tools/FileSearch.php
@@ -18,7 +18,7 @@ class FileSearch extends ProviderTool
     /**
      * Create a new file search tool instance.
      *
-     * @param  array|(\Closure(FileSearchQuery): mixed)|null  $where
+     * @param  array|(Closure(FileSearchQuery): mixed)|null  $where
      */
     public function __construct(
         public array $stores,
@@ -43,7 +43,7 @@ public function ids(): array
     /**
      * Resolve the filters from the given value.
      *
-     * @param  (\Closure(FileSearchQuery): mixed)|array|null  $where
+     * @param  (Closure(FileSearchQuery): mixed)|array|null  $where
      * @return array<int, array{type: string, key: string, value: mixed}>
      */
     protected function resolveFilters(Closure|array|null $where): array
diff --git a/src/Responses/Concerns/CanStreamUsingVercelProtocol.php b/src/Responses/Concerns/CanStreamUsingVercelProtocol.php
@@ -2,18 +2,20 @@
 
 namespace Laravel\Ai\Responses\Concerns;
 
+use Illuminate\Http\Request;
 use Laravel\Ai\Streaming\Events\StreamEnd;
 use Laravel\Ai\Streaming\Events\StreamStart;
 use Laravel\Ai\Streaming\Events\ToolCall;
 use Laravel\Ai\Streaming\Events\ToolResult;
+use Symfony\Component\HttpFoundation\Response;
 
 trait CanStreamUsingVercelProtocol
 {
     /**
      * Create an HTTP response that represents the object using the Vercel AI SDK protocol
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @param  Request  $request
+     * @return Response
      */
     protected function toVercelProtocolResponse()
     {
diff --git a/src/Responses/StreamableAgentResponse.php b/src/Responses/StreamableAgentResponse.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use IteratorAggregate;
 use Laravel\Ai\Responses\Data\Meta;
@@ -98,7 +99,7 @@ public function usingVercelDataProtocol(bool $value = true): self
     /**
      * Create an HTTP response that represents the object.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      */
     public function toResponse($request): Response
     {
diff --git a/src/Storage/DatabaseConversationStore.php b/src/Storage/DatabaseConversationStore.php
@@ -96,7 +96,7 @@ public function storeAssistantMessage(string $conversationId, string|int|null $u
     /**
      * Get the latest messages for the given conversation.
      *
-     * @return \Illuminate\Support\Collection<int, \Laravel\Ai\Messages\Message>
+     * @return Collection<int, Message>
      */
     public function getLatestConversationMessages(string $conversationId, int $limit): Collection
     {
diff --git a/stubs/structured-agent.stub b/stubs/structured-agent.stub
@@ -12,7 +12,7 @@ use Laravel\Ai\Messages\Message;
 use Laravel\Ai\Promptable;
 use Stringable;
 
-class {{ class }} implements Agent, Conversational, HasTools, HasStructuredOutput
+class {{ class }} implements Agent, Conversational, HasStructuredOutput, HasTools
 {
     use Promptable;
 
diff --git a/tests/Feature/AgentAttributeTest.php b/tests/Feature/AgentAttributeTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature;
 
+use Laravel\Ai\Enums\Lab;
 use Laravel\Ai\Gateway\TextGenerationOptions;
 use Laravel\Ai\Prompts\AgentPrompt;
 use Tests\Feature\Agents\AssistantAgent;
@@ -35,7 +36,7 @@ public function test_provider_attribute_is_used_when_prompting(): void
         (new AttributeAgent)->prompt('Hello');
 
         AttributeAgent::assertPrompted(function (AgentPrompt $prompt) {
-            return $prompt->provider->name() === \Laravel\Ai\Enums\Lab::Anthropic->value;
+            return $prompt->provider->name() === Lab::Anthropic->value;
         });
     }
 }
diff --git a/tests/Feature/AgentFakeTest.php b/tests/Feature/AgentFakeTest.php
@@ -11,6 +11,7 @@
 use Laravel\Ai\Responses\Data\Usage;
 use Laravel\Ai\Responses\StructuredTextResponse;
 use Laravel\Ai\Responses\TextResponse;
+use PHPUnit\Framework\AssertionFailedError;
 use RuntimeException;
 use Tests\Feature\Agents\AssistantAgent;
 use Tests\Feature\Agents\StructuredAgent;
@@ -208,7 +209,7 @@ public function test_assert_queued_does_not_throw_undefined_key_when_agent_was_n
         try {
             AssistantAgent::assertQueued('Some prompt');
             $this->fail('Expected assertion to fail.');
-        } catch (\PHPUnit\Framework\AssertionFailedError $e) {
+        } catch (AssertionFailedError $e) {
             $this->assertStringContainsString('An expected queued prompt was not received.', $e->getMessage());
         }
     }
diff --git a/tests/Feature/AgentIntegrationTest.php b/tests/Feature/AgentIntegrationTest.php
@@ -257,7 +257,7 @@ public function test_agent_tool_exception_handling_is_not_magical(): void
             );
 
             $text = $response->text;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $caught = true;
 
             $this->assertInstanceOf(Exception::class, $e);
diff --git a/tests/Feature/AgentMiddlewareTest.php b/tests/Feature/AgentMiddlewareTest.php
@@ -7,6 +7,8 @@
 use Laravel\Ai\Events\AgentPrompted;
 use Laravel\Ai\Prompts\AgentPrompt;
 use Laravel\Ai\Responses\AgentResponse;
+use Laravel\Ai\Responses\Data\Meta;
+use Laravel\Ai\Responses\Data\Usage;
 use Laravel\Ai\Responses\StreamedAgentResponse;
 use Tests\Feature\Agents\AssistantAgent;
 use Tests\TestCase;
@@ -79,8 +81,8 @@ public function handle(AgentPrompt $prompt, Closure $next)
                 return new AgentResponse(
                     'test-invocation-id',
                     'Short-circuited response',
-                    new \Laravel\Ai\Responses\Data\Usage,
-                    new \Laravel\Ai\Responses\Data\Meta,
+                    new Usage,
+                    new Meta,
                 );
             }
         };
diff --git a/tests/Unit/Gateway/Prism/AddsToolsToPrismRequestsTest.php b/tests/Unit/Gateway/Prism/AddsToolsToPrismRequestsTest.php
@@ -147,7 +147,7 @@ public function __construct()
                 $this->toolInvokedCallback = fn () => null;
             }
 
-            public function testInvokeTool(Tool $tool, array $arguments): string
+            public function test_invoke_tool(Tool $tool, array $arguments): string
             {
                 return $this->invokeTool($tool, $arguments);
             }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Illuminate\Support\Facades\Facade;`
`6`	`6`
`7`	`7`	`/**`
`8`		`- * @see \Laravel\Ai\AiManager`
	`8`	`+ * @see AiManager`
`9`	`9`	`*/`
`10`	`10`	`class Ai extends Facade`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Laravel\Ai\Contracts;`
`4`	`4`
`5`	`5`	`use Illuminate\Support\Collection;`
	`6`	`+use Laravel\Ai\Messages\Message;`
`6`	`7`	`use Laravel\Ai\Prompts\AgentPrompt;`
`7`	`8`	`use Laravel\Ai\Responses\AgentResponse;`
`8`	`9`
`@@ -31,7 +32,7 @@ public function storeAssistantMessage(string $conversationId, string\|int\|null $u`
`31`	`32`	`/**`
`32`	`33`	`* Get the latest messages for the given conversation.`
`33`	`34`	`*`
`34`		`- * @return \Illuminate\Support\Collection<int, \Laravel\Ai\Messages\Message>`
	`35`	`+ * @return Collection<int, Message>`
`35`	`36`	`*/`
`36`	`37`	`public function getLatestConversationMessages(string $conversationId, int $limit): Collection;`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace Laravel\Ai\Contracts;`
`4`	`4`
	`5`	`+use Laravel\Ai\Messages\Message;`
	`6`	`+`
`5`	`7`	`interface Conversational`
`6`	`8`	`{`
`7`	`9`	`/**`
`8`	`10`	`* Get the list of messages comprising the conversation so far.`
`9`	`11`	`*`
`10`		`- * @return \Laravel\Ai\Messages\Message[]`
	`12`	`+ * @return Message[]`
`11`	`13`	`*/`
`12`	`14`	`public function messages(): iterable;`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,14 @@`
`3`	`3`	`namespace Laravel\Ai\Contracts;`
`4`	`4`
`5`	`5`	`use Illuminate\Contracts\JsonSchema\JsonSchema;`
	`6`	`+use Illuminate\JsonSchema\Types\Type;`
`6`	`7`
`7`	`8`	`interface HasStructuredOutput`
`8`	`9`	`{`
`9`	`10`	`/**`
`10`	`11`	`* Get the agent's structured output schema definition.`
`11`	`12`	`*`
`12`		`- * @return array<string, \Illuminate\JsonSchema\Types\Type>`
	`13`	`+ * @return array<string, Type>`
`13`	`14`	`*/`
`14`	`15`	`public function schema(JsonSchema $schema): array;`
`15`	`16`	`}`