fix(laravel): entrypoint serialization (#6541)

api-platform · Aug 23, 2024 · ebc61d5 · ebc61d5
1 parent 4ee209e
commit ebc61d5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/Documentation/Action/EntrypointAction.php b/src/Documentation/Action/EntrypointAction.php
@@ -37,13 +37,13 @@ public function __construct(
         private readonly ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory,
         private readonly ProviderInterface $provider,
         private readonly ProcessorInterface $processor,
-        private readonly array $documentationFormats = []
+        private readonly array $documentationFormats = [],
     ) {
     }
 
     public function __invoke(Request $request)
     {
-        static::$resourceNameCollection = $this->resourceNameCollectionFactory->create();
+        self::$resourceNameCollection = $this->resourceNameCollectionFactory->create();
         $context = [
             'request' => $request,
             'spec_version' => (string) $request->query->get(LegacyOpenApiNormalizer::SPEC_VERSION),
@@ -65,6 +65,6 @@ class: Entrypoint::class,
 
     public static function provide(): Entrypoint
     {
-        return new Entrypoint(static::$resourceNameCollection);
+        return new Entrypoint(self::$resourceNameCollection);
     }
 }
diff --git a/src/Laravel/ApiPlatformProvider.php b/src/Laravel/ApiPlatformProvider.php
@@ -535,8 +535,8 @@ public function register(): void
             return new DocumentationAction($app->make(ResourceNameCollectionFactoryInterface::class), $config->get('api-platform.title') ?? '', $config->get('api-platform.description') ?? '', $config->get('api-platform.version') ?? '', $app->make(OpenApiFactoryInterface::class), $app->make(ProviderInterface::class), $app->make(ProcessorInterface::class), $app->make(Negotiator::class), $config->get('api-platform.docs_formats'));
         });
 
-        $this->app->singleton(EntrypointAction::class, function (Application $app) {
-            return new EntrypointAction($app->make(ResourceNameCollectionFactoryInterface::class), $app->make(ProviderInterface::class), $app->make(ProcessorInterface::class), ['jsonld' => ['application/ld+json']]);
+        $this->app->singleton(EntrypointAction::class, function (Application $app) use ($config) {
+            return new EntrypointAction($app->make(ResourceNameCollectionFactoryInterface::class), $app->make(ProviderInterface::class), $app->make(ProcessorInterface::class), $config->get('api-platform.formats'));
         });
 
         $this->app->singleton(Pagination::class, function () use ($config) {

diff --git a/src/Laravel/Eloquent/Metadata/ModelMetadata.php b/src/Laravel/Eloquent/Metadata/ModelMetadata.php
@@ -179,7 +179,7 @@ public function getRelations(Model $model): Collection
                     $file->next();
                 }
 
-                return collect(static::RELATION_METHODS)
+                return collect(self::RELATION_METHODS)
                     ->contains(fn ($relationMethod) => str_contains($code, '$this->'.$relationMethod.'('));
             })
             ->map(function (\ReflectionMethod $method) use ($model) {

diff --git a/src/Laravel/Tests/JsonApiTest.php b/src/Laravel/Tests/JsonApiTest.php
@@ -38,6 +38,20 @@ protected function defineEnvironment($app): void
         });
     }
 
+    public function testGetEntrypoint(): void
+    {
+        $response = $this->get('/api/', ['accept' => ['application/vnd.api+json']]);
+        $response->assertStatus(200);
+        $response->assertHeader('content-type', 'application/vnd.api+json; charset=utf-8');
+        $this->assertJsonContains([
+            'links' => [
+                'self' => 'http://localhost/api',
+                'book' => 'http://localhost/api/books',
+            ],
+        ],
+            $response->json());
+    }
+
     public function testGetCollection(): void
     {
         $response = $this->get('/api/books', ['accept' => ['application/vnd.api+json']]);