Open theofidry opened 3 years ago
Sure, this is definitely a good refactoring. You can also take example of how the GraphQL subsystem has done it (for instance to choose the same names or conventions):
PropertyInfo is quite limited regarding the support of generics and union types; There is symfony/symfony#38093 for partially addressing this
Actually this is an API-Platform limitation: https://github.com/api-platform/core/blob/da500b2/src/Bridge/Symfony/PropertyInfo/Metadata/Property/PropertyInfoPropertyMetadataFactory.php#L52-L57
Is anybody working on this one or can I try making a PR for this? :-)
Follow up of https://github.com/api-platform/core/issues/3918.
When building the doc or dumping the schema, API-Platform does a lot of work to translate the known type of a property into the format we dump it into. For example:
Trying to solve #3918 in a more correct way, I'm running into two limitations:
*The current (2.5.9) set supported (for JsonSchema):
DateTimeInterface
DateInterval
Ramsey\Uuid\UuidInterface
The first limitation needs to first be addressed in PropertyInfo so there is no direct actionable right now. However for the second one, IMO there should be an extension point to allow one to hook in their own type resolver. I would avoid a inheritance hell there so I would like to suggest to introduce a new interface:
From there the
TypeFactory
can be rewritten:TypeFactory.php
```php final class TypeFactory implements TypeFactoryInterface { use ResourceClassInfoTrait; /** * @var SchemaFactoryInterface|null */ private $schemaFactory; /** * @var ClassTypeResolver */ private ClassTypeResolver $typeResolver; public function __construct( ResourceClassResolverInterface $resourceClassResolver = null, // We inject the type resolver as a service ClassTypeResolver $typeResolver = null ) { $this->resourceClassResolver = $resourceClassResolver; // I don't get why everything is nullable here but so be it $this->typeResolver = $typeResolver ?? new ApiPlatformCoreClassTypeResolver($resourceClassResolver); } // ... private function makeBasicType(Type $type, string $format = 'json', ?bool $readableLink = null, ?array $serializerContext = null, Schema $schema = null): array { switch ($type->getBuiltinType()) { case Type::BUILTIN_TYPE_INT: return ['type' => 'integer']; case Type::BUILTIN_TYPE_FLOAT: return ['type' => 'number']; case Type::BUILTIN_TYPE_BOOL: return ['type' => 'boolean']; case Type::BUILTIN_TYPE_OBJECT: // This is the changed code return $this->typeResolver->getClassType($type->getClassName(), $format, $readableLink, $serializerContext, $schema, $this->schemaFactory); default: return ['type' => 'string']; } } // ... } ```And the existing type resolution extracted:
ApiPlatformCoreClassTypeResolver.php
```php final class ApiPlatformCoreClassTypeResolver implements ClassTypeResolver { use ResourceClassInfoTrait; public function __construct(ResourceClassResolverInterface $resourceClassResolver = null) { $this->resourceClassResolver = $resourceClassResolver; } public function getClassType( ?string $className, string $format, ?bool $readableLink, ?array $serializerContext, ?Schema $schema, ?SchemaFactoryInterface $schemaFactory ): array { if (null === $className) { return ['type' => 'string']; } if (is_a($className, \DateTimeInterface::class, true)) { return [ 'type' => 'string', 'format' => 'date-time', ]; } if (is_a($className, \DateInterval::class, true)) { return [ 'type' => 'string', 'format' => 'duration', ]; } if (is_a($className, UuidInterface::class, true)) { return [ 'type' => 'string', 'format' => 'uuid', ]; } // Skip if $schema is null (filters only support basic types) if (null === $schema) { return ['type' => 'string']; } if ($this->isResourceClass($className) && true !== $readableLink) { return [ 'type' => 'string', 'format' => 'iri-reference', ]; } $version = $schema->getVersion(); $subSchema = new Schema($version); $subSchema->setDefinitions($schema->getDefinitions()); // Populate definitions of the main schema if (null === $schemaFactory) { throw new \LogicException('The schema factory must be injected by calling the "setSchemaFactory" method.'); } $subSchema = $schemaFactory->buildSchema($className, $format, Schema::TYPE_OUTPUT, null, null, $subSchema, $serializerContext); return ['$ref' => $subSchema['$ref']]; } } ```From there it is easy to hook your own type resolver, e.g. mine:
IdClassTypeResolver
```php final class IdClassTypeResolver implements ClassTypeResolver { private ClassTypeResolver $decoratedClassTypeResolver; public function __construct(ClassTypeResolver $decoratedClassTypeResolver) { $this->decoratedClassTypeResolver = $decoratedClassTypeResolver; } public function getClassType( ?string $className, string $format, ?bool $readableLink, ?array $serializerContext, ?Schema $schema, ?SchemaFactoryInterface $schemaFactory ): array { if (null === $className) { return $this->decoratedClassTypeResolver->getClassType( $className, $format, $readableLink, $serializerContext, $schema, $schemaFactory, ); } if (is_a($className, IntId::class, true)) { return [ 'type' => 'number', ]; } if (is_a($className, UuidId::class, true)) { return [ 'type' => 'string', 'format' => 'uuid', ]; } if (is_a($className, StringId::class, true)) { return [ 'type' => 'string', 'format' => 'string', ]; } if (is_a($className, Id::class, true)) { return [ 'type' => 'string', 'format' => 'string', ]; } return $this->decoratedClassTypeResolver->getClassType( $className, $format, $readableLink, $serializerContext, $schema, $schemaFactory, ); } } ```Note that I did this only for the JsonSchema and not 100% sure of the implications for the other one.
WDYT?