Update JsonSchema usage (#120)

* Update JsonSchema usage * Fix test * Fix charset=UTF-8 Test * Fix charset=UTF-8 Test

Author: pushpak1300

rector.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Rector\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector;
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\Config\RectorConfig;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
@@ -14,6 +15,7 @@
  ->withSkip([
  ReadOnlyPropertyRector::class,
  EncapsedStringsToSprintfRector::class,
+ NewlineBetweenClassLikeStmtsRector::class,
  ])
  ->withPreparedSets(
  deadCode: true,

src/Server/Tool.php

@@ -4,7 +4,8 @@
 
 namespace Laravel\Mcp\Server;
 
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
+use Illuminate\JsonSchema\JsonSchema as JsonSchemaFactory;
 use Laravel\Mcp\Server\Concerns\HasAnnotations;
 use Laravel\Mcp\Server\Tools\Annotations\ToolAnnotation;
 
@@ -55,11 +56,11 @@ public function toArray(): array
  {
  $annotations = $this->annotations();
 
- $schema = JsonSchema::object(
+ $schema = JsonSchemaFactory::object(
  $this->schema(...),
  )->toArray();
 
- $outputSchema = JsonSchema::object(
+ $outputSchema = JsonSchemaFactory::object(
  $this->outputSchema(...),
  )->toArray();
 

stubs/tool.stub

@@ -2,7 +2,7 @@
 
 namespace {{ namespace }};
 
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Tool;
@@ -29,7 +29,7 @@ class {{ class }} extends Tool
  /**
  * Get the tool's input schema.
  *
- * @return array<string, \Illuminate\JsonSchema\JsonSchema>
+ * @return array<string, \Illuminate\Contracts\JsonSchema\JsonSchema>
  */
  public function schema(JsonSchema $schema): array
  {

tests/Feature/Console/StartCommandTest.php

@@ -104,7 +104,8 @@
  );
 
  $response->assertStatus(200);
- $response->assertHeader('Content-Type', 'text/event-stream; charset=UTF-8');
+
+ expect(strtolower((string) $response->headers->get('Content-Type')))->toBe('text/event-stream; charset=utf-8');
 
  $content = $response->streamedContent();
  $messages = parseJsonRpcMessagesFromSseStream($content);

tests/Fixtures/ResponseFactoryWithStructuredContentTool.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Fixtures;
 
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\ResponseFactory;

tests/Fixtures/SayHiTool.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Fixtures;
 
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Tool;

tests/Fixtures/SayHiTwiceTool.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Fixtures;
 
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Tool;

tests/Fixtures/SayHiWithMetaTool.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Fixtures;
 
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Tool;

tests/Fixtures/StreamingTool.php

@@ -3,7 +3,7 @@
 namespace Tests\Fixtures;
 
 use Generator;
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Tool;

tests/Fixtures/StructuredContentTool.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Fixtures;
 
-use Illuminate\JsonSchema\JsonSchema;
+use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\ResponseFactory;