Mixed type supports nullable by design

thephpleague · Nov 12, 2023 · 5af394a · 5af394a
1 parent 03e7a9c
commit 5af394a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/src/Serializer/CastToArray.php b/src/Serializer/CastToArray.php
@@ -58,7 +58,7 @@ public function __construct(
         }
 
         $this->class = ltrim($propertyType, '?');
-        $this->isNullable = str_starts_with($propertyType, '?');
+        $this->isNullable = $baseType->equals(Type::Mixed) ? true : str_starts_with($propertyType, '?');
 
         if (!$shape instanceof ArrayShape) {
             $shape = ArrayShape::tryFrom($shape) ?? throw new MappingFailed('Unable to resolve the array shape; Verify your cast arguments.');

diff --git a/src/Serializer/CastToBool.php b/src/Serializer/CastToBool.php
@@ -29,7 +29,7 @@ public function __construct(
             throw new MappingFailed('The property type `'.$propertyType.'` is not supported; a `bool` type is required.');
         }
 
-        $this->isNullable = str_starts_with($propertyType, '?');
+        $this->isNullable = $baseType->equals(Type::Mixed) ? true : str_starts_with($propertyType, '?');
     }
 
     /**

diff --git a/src/Serializer/CastToDate.php b/src/Serializer/CastToDate.php
@@ -53,7 +53,7 @@ public function __construct(
         }
 
         $this->class = $class;
-        $this->isNullable = str_starts_with($propertyType, '?');
+        $this->isNullable = $baseType->equals(Type::Mixed) ? true : str_starts_with($propertyType, '?');
         try {
             $this->timezone = is_string($timezone) ? new DateTimeZone($timezone) : $timezone;
             $this->default = (null !== $default) ? $this->cast($default) : $default;

diff --git a/src/Serializer/CastToEnum.php b/src/Serializer/CastToEnum.php
@@ -45,16 +45,18 @@ public function __construct(
             throw new MappingFailed('The property type `'.$propertyType.'` is not supported; an `Enum` is required.');
         }
 
-        $this->isNullable = str_starts_with($propertyType, '?');
         $class = ltrim($propertyType, '?');
+        $isNullable = str_starts_with($propertyType, '?');
         if ($baseType->equals(Type::Mixed)) {
             if (null === $enum || !enum_exists($enum)) {
                 throw new MappingFailed('You need to specify the enum class with a `mixed` typed property.');
             }
             $class = $enum;
+            $isNullable = true;
         }
 
         $this->class = $class;
+        $this->isNullable = $isNullable;
 
         try {
             $this->default = (null !== $default) ? $this->cast($default) : $default;

diff --git a/src/Serializer/CastToFloat.php b/src/Serializer/CastToFloat.php
@@ -32,7 +32,7 @@ public function __construct(
             throw new MappingFailed('The property type `'.$propertyType.'` is not supported; a `float` type is required.');
         }
 
-        $this->isNullable = str_starts_with($propertyType, '?');
+        $this->isNullable = $baseType->equals(Type::Mixed) ? true : str_starts_with($propertyType, '?');
     }
 
     /**

diff --git a/src/Serializer/CastToInt.php b/src/Serializer/CastToInt.php
@@ -32,7 +32,7 @@ public function __construct(
             throw new MappingFailed('The property type `'.$propertyType.'` is not supported; a `int` type is required.');
         }
 
-        $this->isNullable = str_starts_with($propertyType, '?');
+        $this->isNullable = $baseType->equals(Type::Mixed) ? true : str_starts_with($propertyType, '?');
     }
 
     /**

diff --git a/src/Serializer/CastToString.php b/src/Serializer/CastToString.php
@@ -31,7 +31,7 @@ public function __construct(
             throw new MappingFailed('The property type `'.$propertyType.'` is not supported; a `string` type is required.');
         }
 
-        $this->isNullable = str_starts_with($propertyType, '?');
+        $this->isNullable = $baseType->equals(Type::Mixed) ? true : str_starts_with($propertyType, '?');
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ public function __construct( @@
                 throw new MappingFailed('The property type `'.$propertyType.'` is not supported; a `bool` type is required.');
             }
-            $this->isNullable = str_starts_with($propertyType, '?');
+            $this->isNullable = $baseType->equals(Type::Mixed) ? true : str_starts_with($propertyType, '?');
         }
         /**
@@ Expand Down @@