Support multiple builtinType (union types)

Korbeil · Korbeil · commit ec3a8e575d69 · 2020-11-04T17:16:19.000+01:00
diff --git a/src/Symfony/Component/PropertyInfo/CHANGELOG.md b/src/Symfony/Component/PropertyInfo/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.3.0
+-----
+
+* Added ability to have union types in `Type` class.
+
 5.2.0
 -----
 
diff --git a/src/Symfony/Component/PropertyInfo/Type.php b/src/Symfony/Component/PropertyInfo/Type.php
@@ -57,12 +57,20 @@ class Type
     private $collectionValueType;
 
     /**
+     * @param string|array $builtinType
+     *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $builtinType, bool $nullable = false, string $class = null, bool $collection = false, self $collectionKeyType = null, self $collectionValueType = null)
+    public function __construct($builtinType, bool $nullable = false, string $class = null, bool $collection = false, self $collectionKeyType = null, self $collectionValueType = null)
     {
-        if (!\in_array($builtinType, self::$builtinTypes)) {
-            throw new \InvalidArgumentException(sprintf('"%s" is not a valid PHP type.', $builtinType));
+        if (!\is_string($builtinType) && !\is_array($builtinType)) {
+            throw new \TypeError(sprintf('Argument #1 ($builtinType) must be of type string|array, "%s" given.', get_debug_type($builtinType)));
+        }
+
+        foreach ((array) $builtinType as $type) {
+            if (!\in_array($type, self::$builtinTypes)) {
+                throw new \InvalidArgumentException(sprintf('"%s" is not a valid PHP type.', $type));
+            }
         }
 
         $this->builtinType = $builtinType;
@@ -77,8 +85,10 @@ public function __construct(string $builtinType, bool $nullable = false, string
      * Gets built-in type.
      *
      * Can be bool, int, float, string, array, object, resource, null, callback or iterable.
+     *
+     * @return string|array
      */
-    public function getBuiltinType(): string
+    public function getBuiltinType()
     {
         return $this->builtinType;
     }
