diff --git a/Changelog.md b/Changelog.md index 294d0627e..1b351b07d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ # Changelog +## 2.0.6-dev +- Add support for xml (and externalDocs and properties) inside a @SWG\Items. #279 + ## 2.0.5 - Removed JSON-Schema properties that are not supported in swagger. #273 - Added ordering filenames to guarantee a consistent output #263 diff --git a/VERSION b/VERSION index c3d06e924..541093765 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.4-dev +2.0.6-dev diff --git a/src/Annotations/ExternalDocumentation.php b/src/Annotations/ExternalDocumentation.php index 317e0d1db..63dea4885 100644 --- a/src/Annotations/ExternalDocumentation.php +++ b/src/Annotations/ExternalDocumentation.php @@ -49,6 +49,7 @@ class ExternalDocumentation extends AbstractAnnotation 'Swagger\Annotations\Delete', 'Swagger\Annotations\Patch', 'Swagger\Annotations\Head', - 'Swagger\Annotations\Options' + 'Swagger\Annotations\Options', + 'Swagger\Annotations\Items', ]; } diff --git a/src/Annotations/Items.php b/src/Annotations/Items.php index 2fcd9c7ed..a2ae50306 100644 --- a/src/Annotations/Items.php +++ b/src/Annotations/Items.php @@ -17,6 +17,9 @@ class Items extends Schema /** @inheritdoc */ public static $_nested = [ 'Swagger\Annotations\Items' => 'items', + 'Swagger\Annotations\Property' => ['properties', 'property'], + 'Swagger\Annotations\ExternalDocumentation' => 'externalDocs', + 'Swagger\Annotations\Xml' => 'xml' ]; /** @inheritdoc */ diff --git a/src/Annotations/Property.php b/src/Annotations/Property.php index 97ea55c16..644576ac8 100644 --- a/src/Annotations/Property.php +++ b/src/Annotations/Property.php @@ -22,5 +22,6 @@ class Property extends Schema 'Swagger\Annotations\Definition', 'Swagger\Annotations\Schema', 'Swagger\Annotations\Property', + 'Swagger\Annotations\Items', ]; } diff --git a/src/Annotations/Xml.php b/src/Annotations/Xml.php index fca8d22a7..b226b90c0 100644 --- a/src/Annotations/Xml.php +++ b/src/Annotations/Xml.php @@ -56,6 +56,7 @@ class Xml extends AbstractAnnotation public static $_parents = [ 'Swagger\Annotations\Schema', 'Swagger\Annotations\Property', - 'Swagger\Annotations\Definition' + 'Swagger\Annotations\Definition', + 'Swagger\Annotations\Items', ]; }