Merge 794d7a6 into c37641b

api-platform · Jan 14, 2021 · 618c419 · 618c419
2 parents c37641b + 794d7a6
commit 618c419
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/JsonSchema/SchemaFactory.php b/src/JsonSchema/SchemaFactory.php
@@ -226,7 +226,11 @@ private function buildPropertySchema(Schema $schema, string $definitionName, str
             $valueSchema = $this->typeFactory->getType(new Type($builtinType, $type->isNullable(), $className, $isCollection), $format, $propertyMetadata->isReadableLink(), $serializerContext, $schema);
         }
 
-        $propertySchema = new \ArrayObject($propertySchema + $valueSchema);
+        if (\count($propertySchema) > 0 && \array_key_exists('$ref', $valueSchema)) {
+            $propertySchema = new \ArrayObject($propertySchema);
+        } else {
+            $propertySchema = new \ArrayObject($propertySchema + $valueSchema);
+        }
         $schema->getDefinitions()[$definitionName]['properties'][$normalizedPropertyName] = $propertySchema;
     }
 

diff --git a/tests/Swagger/Serializer/DocumentationNormalizerV2Test.php b/tests/Swagger/Serializer/DocumentationNormalizerV2Test.php
@@ -2339,7 +2339,6 @@ public function testNormalizeWithNestedNormalizationGroups(): void
                         ]),
                         'relatedDummy' => new \ArrayObject([
                             'description' => 'This is a related dummy \o/.',
-                            '$ref' => '#/definitions/'.$relatedDummyRef,
                         ]),
                     ],
                 ]),