Using oneOf also for simple non-$ref types

As per OpenAPI documentation at https://swagger.io/docs/specification/data-models/data-types/
the OpenAPI v3 documentation does not allow defining union
types via `type: ['string', 'integer']`, but requires explicit
usage of `oneOf` and nested type declarations or references
instead.

Ref: api-platform/core#3402 (comment)

TypeFactory.php

@@ -17,9 +17,6 @@
 use ApiPlatform\Core\Util\ResourceClassInfoTrait;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\PropertyInfo\Type;
-use function array_merge;
-use function array_unique;
-use function array_values;
 
 /**
  * {@inheritdoc}
@@ -163,27 +160,11 @@ private function addNullabilityToTypeDefinition(array $jsonSchema, Type $type):
             return $jsonSchema;
         }
 
-        if (!\array_key_exists('type', $jsonSchema)) {
-            return [
-                'oneOf' => [
-                    ['type' => 'null'],
-                    $jsonSchema,
-                ],
-            ];
-        }
-
-        return array_merge($jsonSchema, ['type' => $this->addNullToTypes((array) $jsonSchema['type'])]);
-    }
-
-    /**
-     * @param string[] $types
-     *
-     * @return string[]
-     *
-     * @psalm-param list<string> $types
-     */
-    private function addNullToTypes(array $types): array
-    {
-        return array_values(array_unique(array_merge($types, ['null'])));
+        return [
+            'oneOf' => [
+                ['type' => 'null'],
+                $jsonSchema,
+            ],
+        ];
     }
 }