Merge 4.0

soyuka · soyuka · commit 9bcbc1cca7b6 · 2024-10-04T08:17:21.000+02:00
diff --git a/features/hydra/collection.feature b/features/hydra/collection.feature
@@ -480,7 +480,7 @@ Feature: Collections support
 
     When I send a "GET" request to "/dummies?itemsPerPage=0&page=2"
     Then the response status code should be 400
-    And the JSON node "hydra:description" should be equal to "Page should not be greater than 1 if limit is equal to 0"
+    And the JSON node "description" should be equal to "Page should not be greater than 1 if limit is equal to 0"
 
   Scenario: Cursor-based pagination with an empty collection
     When I send a "GET" request to "/so_manies"
diff --git a/features/main/crud.feature b/features/main/crud.feature
@@ -95,7 +95,7 @@ Feature: Create-Retrieve-Update-Delete
     When I add "Content-Type" header equal to "application/ld+json"
     And I send a "POST" request to "/dummies"
     Then the response status code should be 400
-    And the JSON node "hydra:description" should be equal to "Syntax error"
+    And the JSON node "description" should be equal to "Syntax error"
 
   Scenario: Get a not found exception
     When I send a "GET" request to "/dummies/42"
@@ -552,7 +552,7 @@ Feature: Create-Retrieve-Update-Delete
     When I add "Content-Type" header equal to "application/ld+json"
     And I send a "PUT" request to "/dummies/1"
     Then the response status code should be 400
-    And the JSON node "hydra:description" should be equal to "Syntax error"
+    And the JSON node "description" should be equal to "Syntax error"
 
   Scenario: Delete a resource
     When I send a "DELETE" request to "/dummies/1"
diff --git a/features/main/not_exposed.feature b/features/main/not_exposed.feature
@@ -171,7 +171,7 @@ Feature: Expose only a collection of objects
     When I send a "GET" request to "<uri>"
     Then the response status code should be 404
     And the response should be in JSON
-    And the JSON node "hydra:description" should be equal to "<description>"
+    And the JSON node "description" should be equal to "<description>"
     Examples:
       | uri                      | description                                                                                                          |
       | /tables/12345            | This route does not aim to be called.                                                                                      |
diff --git a/features/main/validation.feature b/features/main/validation.feature
@@ -31,8 +31,8 @@ Feature: Using validations groups
     {
       "@context": "/contexts/ConstraintViolationList",
       "@type": "ConstraintViolationList",
-      "hydra:title": "An error occurred",
-      "hydra:description": "name: This value should not be null.",
+      "title": "An error occurred",
+      "description": "name: This value should not be null.",
       "violations": [
          {
              "propertyPath": "name",
@@ -60,8 +60,8 @@ Feature: Using validations groups
     {
       "@context": "/contexts/ConstraintViolationList",
       "@type": "ConstraintViolationList",
-      "hydra:title": "An error occurred",
-      "hydra:description": "title: This value should not be null.",
+      "title": "An error occurred",
+      "description": "title: This value should not be null.",
       "violations": [
          {
              "propertyPath": "title",
@@ -113,8 +113,8 @@ Feature: Using validations groups
     {
       "@context": "/contexts/ConstraintViolationList",
       "@type": "ConstraintViolationList",
-      "hydra:title": "An error occurred",
-      "hydra:description": "This value should be of type unknown.\nqux: This value should be of type string.\nfoo: This value should be of type bool.\nbar: This value should be of type int.\nuuid: This value should be of type uuid.\nrelatedDummy: This value should be of type array|string.\nrelatedDummies: This value should be of type array.",
+      "title": "An error occurred",
+      "description": "This value should be of type unknown.\nqux: This value should be of type string.\nfoo: This value should be of type bool.\nbar: This value should be of type int.\nuuid: This value should be of type uuid.\nrelatedDummy: This value should be of type array|string.\nrelatedDummies: This value should be of type array.",
       "violations": [
         {
           "propertyPath": "",
diff --git a/features/security/strong_typing.feature b/features/security/strong_typing.feature
@@ -54,9 +54,9 @@ Feature: Handle properly invalid data submitted to the API
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
     And the JSON node "@context" should be equal to "/contexts/Error"
-    And the JSON node "@type" should be equal to "hydra:Error"
-    And the JSON node "hydra:title" should be equal to "An error occurred"
-    And the JSON node "hydra:description" should be equal to 'The type of the "name" attribute must be "string", "NULL" given.'
+    And the JSON node "@type" should be equal to "Error"
+    And the JSON node "title" should be equal to "An error occurred"
+    And the JSON node "description" should be equal to 'The type of the "name" attribute must be "string", "NULL" given.'
 
   Scenario: Create a resource with wrong value type for relation
     When I add "Content-Type" header equal to "application/ld+json"
@@ -71,9 +71,9 @@ Feature: Handle properly invalid data submitted to the API
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
     And the JSON node "@context" should be equal to "/contexts/Error"
-    And the JSON node "@type" should be equal to "hydra:Error"
-    And the JSON node "hydra:title" should be equal to "An error occurred"
-    And the JSON node "hydra:description" should be equal to 'Invalid IRI "1".'
+    And the JSON node "@type" should be equal to "Error"
+    And the JSON node "title" should be equal to "An error occurred"
+    And the JSON node "description" should be equal to 'Invalid IRI "1".'
     And the JSON node "trace" should exist
 
   Scenario: Ignore invalid dates
@@ -102,9 +102,9 @@ Feature: Handle properly invalid data submitted to the API
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
     And the JSON node "@context" should be equal to "/contexts/Error"
-    And the JSON node "@type" should be equal to "hydra:Error"
-    And the JSON node "hydra:title" should be equal to "An error occurred"
-    And the JSON node "hydra:description" should be equal to 'The type of the "relatedDummies" attribute must be "array", "string" given.'
+    And the JSON node "@type" should be equal to "Error"
+    And the JSON node "title" should be equal to "An error occurred"
+    And the JSON node "description" should be equal to 'The type of the "relatedDummies" attribute must be "array", "string" given.'
     And the JSON node "trace" should exist
 
   Scenario: Send an object where an array is expected
@@ -120,9 +120,9 @@ Feature: Handle properly invalid data submitted to the API
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
     And the JSON node "@context" should be equal to "/contexts/Error"
-    And the JSON node "@type" should be equal to "hydra:Error"
-    And the JSON node "hydra:title" should be equal to "An error occurred"
-    And the JSON node "hydra:description" should be equal to 'The type of the key "a" must be "int", "string" given.'
+    And the JSON node "@type" should be equal to "Error"
+    And the JSON node "title" should be equal to "An error occurred"
+    And the JSON node "description" should be equal to 'The type of the key "a" must be "int", "string" given.'
 
   Scenario: Send a scalar having the bad type
     When I add "Content-Type" header equal to "application/ld+json"
@@ -136,9 +136,9 @@ Feature: Handle properly invalid data submitted to the API
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
     And the JSON node "@context" should be equal to "/contexts/Error"
-    And the JSON node "@type" should be equal to "hydra:Error"
-    And the JSON node "hydra:title" should be equal to "An error occurred"
-    And the JSON node "hydra:description" should be equal to 'The type of the "name" attribute must be "string", "integer" given.'
+    And the JSON node "@type" should be equal to "Error"
+    And the JSON node "title" should be equal to "An error occurred"
+    And the JSON node "description" should be equal to 'The type of the "name" attribute must be "string", "integer" given.'
 
   Scenario: According to the JSON spec, allow numbers without explicit floating point for JSON formats
     When I add "Content-Type" header equal to "application/ld+json"
diff --git a/features/security/validate_incoming_content-types.feature b/features/security/validate_incoming_content-types.feature
@@ -14,4 +14,4 @@ Feature: Validate incoming content type
     """
     Then the response status code should be 415
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
-    And the JSON node "hydra:description" should be equal to 'The content-type "text/plain" is not supported. Supported MIME types are "application/ld+json", "application/hal+json", "application/vnd.api+json", "application/xml", "text/xml", "application/json", "text/html", "application/graphql", "multipart/form-data".'
+    And the JSON node "description" should be equal to 'The content-type "text/plain" is not supported. Supported MIME types are "application/ld+json", "application/hal+json", "application/vnd.api+json", "application/xml", "text/xml", "application/json", "text/html", "application/graphql", "multipart/form-data".'
diff --git a/src/JsonSchema/DefinitionNameFactory.php b/src/JsonSchema/DefinitionNameFactory.php
@@ -21,6 +21,9 @@ final class DefinitionNameFactory implements DefinitionNameFactoryInterface
 {
     use ResourceClassInfoTrait;
 
+    private const GLUE = '.';
+    private array $prefixCache = [];
+
     public function __construct(private ?array $distinctFormats)
     {
     }
@@ -32,18 +35,18 @@ public function create(string $className, string $format = 'json', ?string $inpu
         }
 
         if (!isset($prefix)) {
-            $prefix = (new \ReflectionClass($className))->getShortName();
+            $prefix = $this->createPrefixFromClass($className);
         }
 
         if (null !== $inputOrOutputClass && $className !== $inputOrOutputClass) {
             $parts = explode('\\', $inputOrOutputClass);
             $shortName = end($parts);
-            $prefix .= '.'.$shortName;
+            $prefix .= self::GLUE.$shortName;
         }
 
         if ('json' !== $format && ($this->distinctFormats[$format] ?? false)) {
             // JSON is the default, and so isn't included in the definition name
-            $prefix .= '.'.$format;
+            $prefix .= self::GLUE.$format;
         }
 
         $definitionName = $serializerContext[SchemaFactory::OPENAPI_DEFINITION_NAME] ?? null;
@@ -61,4 +64,22 @@ private function encodeDefinitionName(string $name): string
     {
         return preg_replace('/[^a-zA-Z0-9.\-_]/', '.', $name);
     }
+
+    private function createPrefixFromClass(string $fullyQualifiedClassName, int $namespaceParts = 1): string
+    {
+        $parts = explode('\\', $fullyQualifiedClassName);
+        $name = implode(self::GLUE, \array_slice($parts, -$namespaceParts));
+
+        if (!isset($this->prefixCache[$name])) {
+            $this->prefixCache[$name] = $fullyQualifiedClassName;
+
+            return $name;
+        }
+
+        if ($this->prefixCache[$name] !== $fullyQualifiedClassName) {
+            $name = $this->createPrefixFromClass($fullyQualifiedClassName, ++$namespaceParts);
+        }
+
+        return $name;
+    }
 }
diff --git a/src/Laravel/Eloquent/Metadata/Factory/Property/EloquentPropertyMetadataFactory.php b/src/Laravel/Eloquent/Metadata/Factory/Property/EloquentPropertyMetadataFactory.php
@@ -77,7 +77,7 @@ public function create(string $resourceClass, string $property, array $options =
                 'collection', 'encrypted:collection' => new Type(Type::BUILTIN_TYPE_ITERABLE, $p['nullable'], Collection::class, true),
                 'encrypted:array' => new Type(Type::BUILTIN_TYPE_ARRAY, $p['nullable']),
                 'encrypted:object' => new Type(Type::BUILTIN_TYPE_OBJECT, $p['nullable']),
-                default => new Type(\in_array($builtinType, Type::$builtinTypes, true) ? $builtinType : Type::BUILTIN_TYPE_STRING, $p['nullable']),
+                default => new Type(\in_array($builtinType, Type::$builtinTypes, true) ? $builtinType : Type::BUILTIN_TYPE_STRING, $p['nullable'] ?? true),
             };
 
             return $propertyMetadata
diff --git a/src/Laravel/Eloquent/Metadata/Factory/Property/EloquentPropertyNameCollectionMetadataFactory.php b/src/Laravel/Eloquent/Metadata/Factory/Property/EloquentPropertyNameCollectionMetadataFactory.php
@@ -53,7 +53,7 @@ public function create(string $resourceClass, array $options = []): PropertyName
 
         // When it's an Eloquent model we read attributes from database (@see ShowModelCommand)
         foreach ($this->modelMetadata->getAttributes($model) as $property) {
-            if (!$property['primary'] && $property['hidden']) {
+            if (!($property['primary'] ?? null) && $property['hidden']) {
                 continue;
             }
 
diff --git a/src/Laravel/Tests/EloquentTest.php b/src/Laravel/Tests/EloquentTest.php
@@ -368,4 +368,10 @@ public function testWrongOrderFilter(): void
         $res = $this->get('/api/authors?order[name]=something', ['Accept' => ['application/ld+json']]);
         $this->assertEquals($res->getStatusCode(), 422);
     }
+
+    public function testWithAccessor(): void
+    {
+        $res = $this->get('/api/with_accessors/1', ['Accept' => ['application/ld+json']]);
+        $this->assertArraySubset(['name' => 'test'], $res->json());
+    }
 }
diff --git a/src/Laravel/workbench/app/Models/WithAccessor.php b/src/Laravel/workbench/app/Models/WithAccessor.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Workbench\App\Models;
+
+use ApiPlatform\Metadata\ApiResource;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+#[ApiResource]
+class WithAccessor extends Model
+{
+    use HasFactory;
+
+    protected $hidden = ['created_at', 'updated_at', 'id'];
+
+    protected function name(): Attribute
+    {
+        return Attribute::make(
+            get: fn (string $value) => 'test',
+        );
+    }
+}
diff --git a/src/Laravel/workbench/database/factories/WithAccessorFactory.php b/src/Laravel/workbench/database/factories/WithAccessorFactory.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Workbench\Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Workbench\App\Models\WithAccessor;
+
+/**
+ * @template TModel of \Workbench\App\Models\WithAccessor
+ *
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<TModel>
+ */
+class WithAccessorFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var class-string<TModel>
+     */
+    protected $model = WithAccessor::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => strtolower(fake()->name()),
+        ];
+    }
+}
diff --git a/src/Laravel/workbench/database/migrations/2024_09_24_065934_create_with_accessors_table.php b/src/Laravel/workbench/database/migrations/2024_09_24_065934_create_with_accessors_table.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('with_accessors', function (Blueprint $table): void {
+            $table->id();
+            $table->string('name');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('with_accessors');
+    }
+};
diff --git a/src/Laravel/workbench/database/seeders/DatabaseSeeder.php b/src/Laravel/workbench/database/seeders/DatabaseSeeder.php
@@ -20,6 +20,7 @@
 use Workbench\Database\Factories\PostFactory;
 use Workbench\Database\Factories\SluggableFactory;
 use Workbench\Database\Factories\UserFactory;
+use Workbench\Database\Factories\WithAccessorFactory;
 
 class DatabaseSeeder extends Seeder
 {
@@ -32,5 +33,6 @@ public function run(): void
         PostFactory::new()->has(CommentFactory::new()->count(10))->count(10)->create();
         SluggableFactory::new()->count(10)->create();
         UserFactory::new()->create();
+        WithAccessorFactory::new()->create();
     }
 }
diff --git a/src/State/Provider/ParameterProvider.php b/src/State/Provider/ParameterProvider.php
@@ -52,6 +52,10 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $context = ['operation' => $operation] + $context;
         $parameters = $operation->getParameters();
         foreach ($parameters ?? [] as $parameter) {
+            $extraProperties = $parameter->getExtraProperties();
+            unset($extraProperties['_api_values']);
+            $parameters->add($parameter->getKey(), $parameter = $parameter->withExtraProperties($extraProperties));
+
             $values = $this->getParameterValues($parameter, $request, $context);
             $value = $this->extractParameterValues($parameter, $values);
 
diff --git a/src/State/Tests/ParameterProviderTest.php b/src/State/Tests/ParameterProviderTest.php
@@ -18,6 +18,7 @@
 use ApiPlatform\Metadata\Parameter;
 use ApiPlatform\Metadata\Parameters;
 use ApiPlatform\Metadata\QueryParameter;
+use ApiPlatform\State\ParameterNotFound;
 use ApiPlatform\State\ParameterProviderInterface;
 use ApiPlatform\State\Provider\ParameterProvider;
 use PHPUnit\Framework\TestCase;
@@ -51,16 +52,20 @@ public function has(string $id): bool
             'order' => new QueryParameter(key: 'order', provider: 'test'),
             'search[:property]' => new QueryParameter(key: 'search[:property]', provider: [self::class, 'provide']),
             'foo' => new QueryParameter(key: 'foo', provider: [self::class, 'shouldNotBeCalled']),
+            'baz' => (new QueryParameter(key: 'baz'))->withExtraProperties(['_api_values' => 'test1']),
+            'fas' => (new QueryParameter(key: 'fas'))->withExtraProperties(['_api_values' => '42']),
         ]));
         $parameterProvider = new ParameterProvider(null, $locator);
-        $request = new Request(server: ['QUERY_STRING' => 'order[foo]=asc&search[a]=bar']);
+        $request = new Request(server: ['QUERY_STRING' => 'order[foo]=asc&search[a]=bar&baz=t42']);
         $context = ['request' => $request, 'operation' => $operation];
         $parameterProvider->provide($operation, [], $context);
         $operation = $request->attributes->get('_api_operation');
 
         $this->assertEquals('ok', $operation->getName());
         $this->assertEquals(['foo' => 'asc'], $operation->getParameters()->get('order', QueryParameter::class)->getValue());
         $this->assertEquals(['a' => 'bar'], $operation->getParameters()->get('search[:property]', QueryParameter::class)->getValue());
+        $this->assertEquals('t42', $operation->getParameters()->get('baz', QueryParameter::class)->getValue());
+        $this->assertEquals(new ParameterNotFound(), $operation->getParameters()->get('fas', QueryParameter::class)->getValue());
     }
 
     public static function provide(): void
diff --git a/tests/JsonSchema/DefinitionNameFactoryTest.php b/tests/JsonSchema/DefinitionNameFactoryTest.php
diff --git a/tests/JsonSchema/Dummy/NamespaceA/Module/DummyClass.php b/tests/JsonSchema/Dummy/NamespaceA/Module/DummyClass.php
diff --git a/tests/JsonSchema/Dummy/NamespaceB/Module/DummyClass.php b/tests/JsonSchema/Dummy/NamespaceB/Module/DummyClass.php
diff --git a/tests/JsonSchema/Dummy/NamespaceC/Module/DummyClass.php b/tests/JsonSchema/Dummy/NamespaceC/Module/DummyClass.php

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ Feature: Using validations groups`
`31`	`31`	`{`
`32`	`32`	`"@context": "/contexts/ConstraintViolationList",`
`33`	`33`	`"@type": "ConstraintViolationList",`
`34`		`- "hydra:title": "An error occurred",`
`35`		`- "hydra:description": "name: This value should not be null.",`
	`34`	`+ "title": "An error occurred",`
	`35`	`+ "description": "name: This value should not be null.",`
`36`	`36`	`"violations": [`
`37`	`37`	`{`
`38`	`38`	`"propertyPath": "name",`
`@@ -60,8 +60,8 @@ Feature: Using validations groups`
`60`	`60`	`{`
`61`	`61`	`"@context": "/contexts/ConstraintViolationList",`
`62`	`62`	`"@type": "ConstraintViolationList",`
`63`		`- "hydra:title": "An error occurred",`
`64`		`- "hydra:description": "title: This value should not be null.",`
	`63`	`+ "title": "An error occurred",`
	`64`	`+ "description": "title: This value should not be null.",`
`65`	`65`	`"violations": [`
`66`	`66`	`{`
`67`	`67`	`"propertyPath": "title",`
`@@ -113,8 +113,8 @@ Feature: Using validations groups`
`113`	`113`	`{`
`114`	`114`	`"@context": "/contexts/ConstraintViolationList",`
`115`	`115`	`"@type": "ConstraintViolationList",`
`116`		`- "hydra:title": "An error occurred",`
`117`		`- "hydra:description": "This value should be of type unknown.\nqux: This value should be of type string.\nfoo: This value should be of type bool.\nbar: This value should be of type int.\nuuid: This value should be of type uuid.\nrelatedDummy: This value should be of type array\|string.\nrelatedDummies: This value should be of type array.",`
	`116`	`+ "title": "An error occurred",`
	`117`	`+ "description": "This value should be of type unknown.\nqux: This value should be of type string.\nfoo: This value should be of type bool.\nbar: This value should be of type int.\nuuid: This value should be of type uuid.\nrelatedDummy: This value should be of type array\|string.\nrelatedDummies: This value should be of type array.",`
`118`	`118`	`"violations": [`
`119`	`119`	`{`
`120`	`120`	`"propertyPath": "",`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ final class DefinitionNameFactory implements DefinitionNameFactoryInterface`
`21`	`21`	`{`
`22`	`22`	`use ResourceClassInfoTrait;`
`23`	`23`
	`24`	`+ private const GLUE = '.';`
	`25`	`+ private array $prefixCache = [];`
	`26`	`+`
`24`	`27`	`public function __construct(private ?array $distinctFormats)`
`25`	`28`	`{`
`26`	`29`	`}`
`@@ -32,18 +35,18 @@ public function create(string $className, string $format = 'json', ?string $inpu`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`if (!isset($prefix)) {`
`35`		`- $prefix = (new \ReflectionClass($className))->getShortName();`
	`38`	`+ $prefix = $this->createPrefixFromClass($className);`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`if (null !== $inputOrOutputClass && $className !== $inputOrOutputClass) {`
`39`	`42`	`$parts = explode('\\', $inputOrOutputClass);`
`40`	`43`	`$shortName = end($parts);`
`41`		`- $prefix .= '.'.$shortName;`
	`44`	`+ $prefix .= self::GLUE.$shortName;`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`if ('json' !== $format && ($this->distinctFormats[$format] ?? false)) {`
`45`	`48`	`// JSON is the default, and so isn't included in the definition name`
`46`		`- $prefix .= '.'.$format;`
	`49`	`+ $prefix .= self::GLUE.$format;`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`$definitionName = $serializerContext[SchemaFactory::OPENAPI_DEFINITION_NAME] ?? null;`
`@@ -61,4 +64,22 @@ private function encodeDefinitionName(string $name): string`
`61`	`64`	`{`
`62`	`65`	`return preg_replace('/[^a-zA-Z0-9.\-_]/', '.', $name);`
`63`	`66`	`}`
	`67`	`+`
	`68`	`+ private function createPrefixFromClass(string $fullyQualifiedClassName, int $namespaceParts = 1): string`
	`69`	`+ {`
	`70`	`+ $parts = explode('\\', $fullyQualifiedClassName);`
	`71`	`+ $name = implode(self::GLUE, \array_slice($parts, -$namespaceParts));`
	`72`	`+`
	`73`	`+ if (!isset($this->prefixCache[$name])) {`
	`74`	`+ $this->prefixCache[$name] = $fullyQualifiedClassName;`
	`75`	`+`
	`76`	`+ return $name;`
	`77`	`+ }`
	`78`	`+`
	`79`	`+ if ($this->prefixCache[$name] !== $fullyQualifiedClassName) {`
	`80`	`+ $name = $this->createPrefixFromClass($fullyQualifiedClassName, ++$namespaceParts);`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ return $name;`
	`84`	`+ }`
`64`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function create(string $resourceClass, array $options = []): PropertyName`
`53`	`53`
`54`	`54`	`// When it's an Eloquent model we read attributes from database (@see ShowModelCommand)`
`55`	`55`	`foreach ($this->modelMetadata->getAttributes($model) as $property) {`
`56`		`- if (!$property['primary'] && $property['hidden']) {`
	`56`	`+ if (!($property['primary'] ?? null) && $property['hidden']) {`
`57`	`57`	`continue;`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -368,4 +368,10 @@ public function testWrongOrderFilter(): void`
`368`	`368`	`$res = $this->get('/api/authors?order[name]=something', ['Accept' => ['application/ld+json']]);`
`369`	`369`	`$this->assertEquals($res->getStatusCode(), 422);`
`370`	`370`	`}`
	`371`	`+`
	`372`	`+ public function testWithAccessor(): void`
	`373`	`+ {`
	`374`	`+ $res = $this->get('/api/with_accessors/1', ['Accept' => ['application/ld+json']]);`
	`375`	`+ $this->assertArraySubset(['name' => 'test'], $res->json());`
	`376`	`+ }`
`371`	`377`	`}`