Merge pull request #121 from sunrise-php/release/v3.0.2

v3.0.2

Author: fenric

src/OpenApi/PhpTypeSchemaResolver/ArrayAccessPhpTypeSchemaResolver.php

@@ -68,17 +68,16 @@ public function resolvePhpTypeSchema(Type $phpType, Reflector $phpTypeHolder): a
             ->resolvePhpTypeSchema($arrayPhpType, $phpTypeHolder);
 
         if (
-            $phpTypeHolder instanceof ReflectionParameter ||
-            $phpTypeHolder instanceof ReflectionProperty
+            ! $phpTypeHolder instanceof ReflectionParameter
+            && ! $phpTypeHolder instanceof ReflectionProperty
+            || $phpTypeHolder->getAttributes(Subtype::class) === []
         ) {
-            if ($phpTypeHolder->getAttributes(Subtype::class) === []) {
-                $collectionElementPhpType = self::getCollectionElementPhpType($phpTypeName);
-                $collectionElementPhpTypeSchema = $this->openApiPhpTypeSchemaResolverManager
-                    ->resolvePhpTypeSchema($collectionElementPhpType, $phpTypeHolder);
-
-                $phpTypeSchema['oneOf'][0]['items'] = $collectionElementPhpTypeSchema;
-                $phpTypeSchema['oneOf'][1]['additionalProperties'] = $collectionElementPhpTypeSchema;
-            }
+            $collectionElementPhpType = self::getCollectionElementPhpType($phpTypeName);
+            $collectionElementPhpTypeSchema = $this->openApiPhpTypeSchemaResolverManager
+                ->resolvePhpTypeSchema($collectionElementPhpType, $phpTypeHolder);
+
+            $phpTypeSchema['oneOf'][0]['items'] = $collectionElementPhpTypeSchema;
+            $phpTypeSchema['oneOf'][1]['additionalProperties'] = $collectionElementPhpTypeSchema;
         }
 
         return $phpTypeSchema;

tests/Fixture/App/openapi.json

@@ -183,10 +183,16 @@
                 "schema": {
                   "oneOf": [
                     {
-                      "type": "array"
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/Sunrise.Http.Router.Tests.Fixture.App.View.PageView"
+                      }
                     },
                     {
-                      "type": "object"
+                      "type": "object",
+                      "additionalProperties": {
+                        "$ref": "#/components/schemas/Sunrise.Http.Router.Tests.Fixture.App.View.PageView"
+                      }
                     }
                   ]
                 }