RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 23:59:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Guilhem Niot 2018-01-13 13:37:17 +01:00
commit b5fb133533
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ModelDescriber/PhpdocPropertyAnnotationReader.php
View File

@ -36,11 +36,8 @@ class PhpdocPropertyAnnotationReader
/** /**
* Update the Swagger information with information from the DocBlock comment. * 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 { try {
$docBlock = $this->docBlockFactory->create($reflectionProperty); $docBlock = $this->docBlockFactory->create($reflectionProperty);

16
ModelDescriber/SwaggerPropertyAnnotationReader.php
View File

@ -29,14 +29,12 @@ class SwaggerPropertyAnnotationReader
$this->annotationsReader = $annotationsReader; $this->annotationsReader = $annotationsReader;
} }
/** public function updateWithSwaggerPropertyAnnotation(\ReflectionProperty $reflectionProperty, Schema $property)
* @param \ReflectionProperty $reflectionProperty
* @param Items|Schema $property
*/
public function updateWithSwaggerPropertyAnnotation(\ReflectionProperty $reflectionProperty, $property)
{ {
$swgProperty = $this->annotationsReader->getPropertyAnnotation($reflectionProperty, SwgProperty::class); if (!$swgProperty = $this->annotationsReader->getPropertyAnnotation($reflectionProperty, SwgProperty::class)) {
if ($swgProperty instanceof SwgProperty) { return;
}
if (null !== $swgProperty->type) { if (null !== $swgProperty->type) {
$property->setType($swgProperty->type); $property->setType($swgProperty->type);
} }
@ -46,7 +44,7 @@ class SwaggerPropertyAnnotationReader
if (null !== $swgProperty->enum) { if (null !== $swgProperty->enum) {
$property->setEnum($swgProperty->enum); $property->setEnum($swgProperty->enum);
} }
if ($property instanceof Schema) {
if (null !== $swgProperty->description) { if (null !== $swgProperty->description) {
$property->setDescription($swgProperty->description); $property->setDescription($swgProperty->description);
} }
@ -61,5 +59,3 @@ class SwaggerPropertyAnnotationReader
} }
} }
} }
}
}