diff --git a/ModelDescriber/PhpdocPropertyAnnotationReader.php b/ModelDescriber/PhpdocPropertyAnnotationReader.php index 6811e8a..5c4bab3 100644 --- a/ModelDescriber/PhpdocPropertyAnnotationReader.php +++ b/ModelDescriber/PhpdocPropertyAnnotationReader.php @@ -36,11 +36,8 @@ class PhpdocPropertyAnnotationReader /** * Update the Swagger information with information from the DocBlock comment. - * - * @param \ReflectionProperty $reflectionProperty - * @param Items|Schema $property */ - public function updateWithPhpdoc(\ReflectionProperty $reflectionProperty, $property) + public function updateWithPhpdoc(\ReflectionProperty $reflectionProperty, Schema $property) { try { $docBlock = $this->docBlockFactory->create($reflectionProperty); diff --git a/ModelDescriber/SwaggerPropertyAnnotationReader.php b/ModelDescriber/SwaggerPropertyAnnotationReader.php index f2c05bc..13f4c40 100644 --- a/ModelDescriber/SwaggerPropertyAnnotationReader.php +++ b/ModelDescriber/SwaggerPropertyAnnotationReader.php @@ -29,37 +29,33 @@ class SwaggerPropertyAnnotationReader $this->annotationsReader = $annotationsReader; } - /** - * @param \ReflectionProperty $reflectionProperty - * @param Items|Schema $property - */ - public function updateWithSwaggerPropertyAnnotation(\ReflectionProperty $reflectionProperty, $property) + public function updateWithSwaggerPropertyAnnotation(\ReflectionProperty $reflectionProperty, Schema $property) { - $swgProperty = $this->annotationsReader->getPropertyAnnotation($reflectionProperty, SwgProperty::class); - if ($swgProperty instanceof SwgProperty) { - if (null !== $swgProperty->type) { - $property->setType($swgProperty->type); - } - if (UNDEFINED !== $swgProperty->default) { - $property->setDefault($swgProperty->default); - } - if (null !== $swgProperty->enum) { - $property->setEnum($swgProperty->enum); - } - if ($property instanceof Schema) { - if (null !== $swgProperty->description) { - $property->setDescription($swgProperty->description); - } - if (null !== $swgProperty->title) { - $property->setTitle($swgProperty->title); - } - if (null !== $swgProperty->example) { - $property->setExample($swgProperty->example); - } - if (null !== $swgProperty->readOnly) { - $property->setReadOnly($swgProperty->readOnly); - } - } + if (!$swgProperty = $this->annotationsReader->getPropertyAnnotation($reflectionProperty, SwgProperty::class)) { + return; + } + + if (null !== $swgProperty->type) { + $property->setType($swgProperty->type); + } + if (UNDEFINED !== $swgProperty->default) { + $property->setDefault($swgProperty->default); + } + if (null !== $swgProperty->enum) { + $property->setEnum($swgProperty->enum); + } + + if (null !== $swgProperty->description) { + $property->setDescription($swgProperty->description); + } + if (null !== $swgProperty->title) { + $property->setTitle($swgProperty->title); + } + if (null !== $swgProperty->example) { + $property->setExample($swgProperty->example); + } + if (null !== $swgProperty->readOnly) { + $property->setReadOnly($swgProperty->readOnly); } } }