Consider oneOf, allOf and anyOf when deciding on whether to modify the schema type (#1847)

Author: DerManoMann

src/Generator.php

@@ -75,9 +75,15 @@ public function __construct(?LoggerInterface $logger = null)
         $this->setNamespaces(self::DEFAULT_NAMESPACES);
     }
 
-    public static function isDefault($value): bool
+    public static function isDefault(...$value): bool
     {
-        return $value === Generator::UNDEFINED;
+        foreach ($value as $v) {
+            if ($v !== Generator::UNDEFINED) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     /**

src/Type/AbstractTypeResolver.php

@@ -41,7 +41,7 @@ protected function augmentItems(OA\Schema $schema, Analysis $analysis): void
                     $schema->items->ref = $schema->ref;
                     $schema->ref = Generator::UNDEFINED;
                 }
-            } elseif (Generator::isDefault($schema->items->type)) {
+            } elseif (Generator::isDefault($schema->items->type, $schema->items->oneOf, $schema->items->allOf, $schema->items->anyOf)) {
                 $schema->items->type = $schema->type;
 
                 $this->type2ref($schema->items, $analysis);

src/Type/LegacyTypeResolver.php

@@ -28,7 +28,7 @@ protected function doAugment(Analysis $analysis, OA\Schema $schema, \Reflector $
             $schema->nullable = true;
         }
 
-        if (Generator::isDefault($schema->type) && ($docblockDetails->explicitType || $reflectionTypeDetails->explicitType)) {
+        if (Generator::isDefault($schema->type, $schema->oneOf, $schema->allOf, $schema->anyOf) && ($docblockDetails->explicitType || $reflectionTypeDetails->explicitType)) {
             $details = $docblockDetails->types ? $docblockDetails : $reflectionTypeDetails;
 
             // for now

src/Type/TypeInfoTypeResolver.php

@@ -50,7 +50,7 @@ protected function doAugment(Analysis $analysis, OA\Schema $schema, \Reflector $
         $docblockType = $docblockType instanceof NullableType ? $docblockType->getWrappedType() : $docblockType;
         $reflectionType = $reflectionType instanceof NullableType ? $reflectionType->getWrappedType() : $reflectionType;
 
-        if (Generator::isDefault($schema->type) && ($docblockType || $reflectionType)) {
+        if (Generator::isDefault($schema->type, $schema->oneOf, $schema->allOf, $schema->anyOf) && ($docblockType || $reflectionType)) {
             $type = $docblockType ?? $reflectionType;
 
             $isNonZeroInt = false;

tests/Fixtures/PHP/DocblockAndTypehintTypes.php

@@ -137,10 +137,10 @@ class DocblockAndTypehintTypes
      * @param bool $bool
      */
     public function __construct(
-        private OAT\Tag $tag,
+        private OAT\Tag     $tag,
         #[OAT\Property]
-        protected string $promotedString,
-        bool $bool = true,
+        protected string    $promotedString,
+        bool                $bool = true,
         #[OAT\Property(example: 'My value')]
         public string|array $mixedUnion = [],
     )
@@ -156,6 +156,28 @@ public function getString(): string
         return 'string';
     }
 
+    /**
+     * @var DocblockAndTypehintTypes
+     */
+    #[OAT\Property(
+        oneOf: [
+            new OAT\Schema(type: 'string'),
+            new OAT\Schema(type: 'bool'),
+        ]
+    )]
+    public $oneOfVar;
+
+    /**
+     * @var array<DocblockAndTypehintTypes>
+     */
+    #[OAT\Property(
+        items: new OAT\Items(oneOf: [
+            new OAT\Schema(type: 'string'),
+            new OAT\Schema(type: 'bool'),
+        ])
+    )]
+    public array $oneOfList;
+
     /**
      * @param \DateTimeImmutable[] $paramDateTimeList
      * @param string[] $paramStringList
@@ -176,7 +198,7 @@ public function blah(
         #[OAT\Property(example: 'My blah')]
         ?string $blah,
         #[OAT\Property(nullable: true, items: new OAT\Items(type: 'string', example: 'hello'))]
-        ?array $blah_values,
+        ?array  $blah_values,
     ) {
     }
 }

tests/Type/TypeResolverTest.php

@@ -57,6 +57,8 @@ public static function resolverAugmentCases(): iterable
             'paramstringlist' => '{ "type": "array", "items": { "type": "string" }, "property": "paramStringList" }',
             'blah' => '{ "type": "string", "example": "My blah", "nullable": true, "property": "blah" }',
             'blah_values' => '{ "type": "array", "items": { "type": "string", "example": "hello" }, "nullable": true, "property": "blah_values" }',
+            'oneofvar' => '{ "oneOf": [ { "type": "string" }, { "type": "bool" } ], "property": "oneOfVar" }',
+            'oneoflist' => '{ "type": "array", "items": { "oneOf": [ { "type": "string" }, { "type": "bool" } ] }, "property": "oneOfList" }',
         ];
 
         $rc = new \ReflectionClass(DocblockAndTypehintTypes::class);