fix

Author: soyuka

src/JsonSchema/Metadata/Property/Factory/SchemaPropertyMetadataFactory.php

@@ -21,7 +21,6 @@
 use ApiPlatform\Metadata\Util\ResourceClassInfoTrait;
 use Doctrine\Common\Collections\ArrayCollection;
 use Ramsey\Uuid\UuidInterface;
-use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Uid\Ulid;
 use Symfony\Component\Uid\Uuid;
@@ -38,7 +37,6 @@ final class SchemaPropertyMetadataFactory implements PropertyMetadataFactoryInte
     public function __construct(
         ResourceClassResolverInterface $resourceClassResolver,
         private readonly ?PropertyMetadataFactoryInterface $decorated = null,
-        private readonly ?PropertyInfoExtractorInterface $propertyInfo = null,
     ) {
         $this->resourceClassResolver = $resourceClassResolver;
     }
@@ -270,17 +268,7 @@ private function getClassType(?string $className, bool $nullable, ?bool $readabl
             ];
         }
 
-        if (!$this->propertyInfo) {
-            return ['type' => 'object'];
-        }
-
-        $properties = $this->propertyInfo->getProperties($className, ['serializer_groups' => null]);
-        $propertiesSchema = [];
-        foreach ($properties as $property) {
-            $propertiesSchema[$property] = $this->create($className, $property)->getSchema();
-        }
-
-        return ['type' => 'object', 'properties' => $propertiesSchema];
+        return ['type' => Schema::UNKNOWN_TYPE];
     }
 
     /**

src/JsonSchema/SchemaFactory.php

@@ -183,7 +183,8 @@ private function buildPropertySchema(Schema $schema, string $definitionName, str
         $propertySchemaType = $propertySchema['type'] ?? false;
 
         $isUnknown = Schema::UNKNOWN_TYPE === $propertySchemaType
-            || ('array' === $propertySchemaType && Schema::UNKNOWN_TYPE === ($propertySchema['items']['type'] ?? null));
+            || ('array' === $propertySchemaType && Schema::UNKNOWN_TYPE === ($propertySchema['items']['type'] ?? null))
+            || ('object' === $propertySchemaType && Schema::UNKNOWN_TYPE === ($propertySchema['additionalProperties']['type'] ?? null));
 
         if (
             !$isUnknown && (
@@ -241,8 +242,9 @@ private function buildPropertySchema(Schema $schema, string $definitionName, str
             }
 
             if ($isCollection) {
-                $propertySchema['items']['$ref'] = $subSchema['$ref'];
-                unset($propertySchema['items']['type']);
+                $key = ($propertySchema['type'] ?? null) === 'object' ? 'additionalProperties' : 'items';
+                $propertySchema[$key]['$ref'] = $subSchema['$ref'];
+                unset($propertySchema[$key]['type']);
                 break;
             }
 

src/OpenApi/Factory/OpenApiFactory.php

@@ -33,7 +33,6 @@
 use ApiPlatform\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use ApiPlatform\OpenApi\Attributes\Webhook;
-use ApiPlatform\OpenApi\Model;
 use ApiPlatform\OpenApi\Model\Components;
 use ApiPlatform\OpenApi\Model\Contact;
 use ApiPlatform\OpenApi\Model\ExternalDocumentation;
@@ -512,11 +511,11 @@ private function buildOpenApiResponse(array $existingResponses, int|string $stat
     }
 
     /**
-     * @return \ArrayObject<Model\MediaType>
+     * @return \ArrayObject<MediaType>
      */
     private function buildContent(array $responseMimeTypes, array $operationSchemas): \ArrayObject
     {
-        /** @var \ArrayObject<Model\MediaType> $content */
+        /** @var \ArrayObject<MediaType> $content */
         $content = new \ArrayObject();
 
         foreach ($responseMimeTypes as $mimeType => $format) {
@@ -603,11 +602,11 @@ private function getPathDescription(string $resourceShortName, string $method, b
     /**
      * @see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#linkObject.
      *
-     * @return \ArrayObject<Model\Link>
+     * @return \ArrayObject<Link>
      */
     private function getLinks(ResourceMetadataCollection $resourceMetadataCollection, HttpOperation $currentOperation): \ArrayObject
     {
-        /** @var \ArrayObject<Model\Link> $links */
+        /** @var \ArrayObject<Link> $links */
         $links = new \ArrayObject();
 
         // Only compute get links for now

src/Symfony/Bundle/Resources/config/json_schema.xml

@@ -36,7 +36,6 @@
         <service id="api_platform.json_schema.metadata.property.metadata_factory.schema" decorates="api_platform.metadata.property.metadata_factory" decoration-priority="10" class="ApiPlatform\JsonSchema\Metadata\Property\Factory\SchemaPropertyMetadataFactory" public="false">
             <argument type="service" id="api_platform.resource_class_resolver" />
             <argument type="service" id="api_platform.json_schema.metadata.property.metadata_factory.schema.inner" />
-            <argument type="service" id="api_platform.property_info" on-invalid="null" />
         </service>
 
         <service id="api_platform.json_schema.backward_compatible_schema_factory" decorates="api_platform.json_schema.schema_factory" decoration-priority="-2" class="ApiPlatform\JsonSchema\BackwardCompatibleSchemaFactory">

tests/JsonSchema/Command/JsonSchemaGenerateCommandTest.php

@@ -377,15 +377,7 @@ public static function arrayPropertyTypeSyntaxProvider(): \Generator
             [
                 'type' => 'array',
                 'items' => [
-                    'type' => 'object',
-                    'properties' => [
-                        'bar' => [
-                            'type' => 'string',
-                        ],
-                        'baz' => [
-                            'type' => 'integer',
-                        ],
-                    ],
+                    '$ref' => '#/definitions/Foo.jsonld',
                 ],
             ],
         ];
@@ -394,15 +386,7 @@ public static function arrayPropertyTypeSyntaxProvider(): \Generator
             [
                 'type' => 'array',
                 'items' => [
-                    'type' => 'object',
-                    'properties' => [
-                        'bar' => [
-                            'type' => 'string',
-                        ],
-                        'baz' => [
-                            'type' => 'integer',
-                        ],
-                    ],
+                    '$ref' => '#/definitions/Foo.jsonld',
                 ],
             ],
         ];
@@ -411,15 +395,7 @@ public static function arrayPropertyTypeSyntaxProvider(): \Generator
             [
                 'type' => 'object',
                 'additionalProperties' => [
-                    'type' => 'object',
-                    'properties' => [
-                        'bar' => [
-                            'type' => 'string',
-                        ],
-                        'baz' => [
-                            'type' => 'integer',
-                        ],
-                    ],
+                    '$ref' => '#/definitions/Foo.jsonld',
                 ],
             ],
         ];