fix: correct normalization in multipart data

darkdarin · Nov 29, 2023 · 6c367a0 · 6c367a0
1 parent 2c953d2
commit 6c367a0
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/TransportClient/TransportClient.php b/src/TransportClient/TransportClient.php
@@ -123,7 +123,11 @@ protected function makeMultipartRequest(
             if ($fieldName === $multipartField && $value instanceof StreamInterface) {
                 $builder->addResource($fieldName, $value);
             } elseif ($value !== null) {
-                $normalizedValue = $this->normalizeValue($value, $builder);
+                $normalizedValue = $this->serializer->normalize(
+                    $this->normalizeValue($value, $builder),
+                    'json'
+                );
+
                 if (is_array($normalizedValue) || is_object($normalizedValue)) {
                     $builder->addResource(
                         $fieldName,
@@ -178,26 +182,32 @@ private function normalizeValue(mixed $value, MultipartStreamBuilder $builder):
             return 'attach://' . $fileName;
         }
 
-        if (is_scalar($value)) {
+        if (
+            is_scalar($value)
+            || $value instanceof \UnitEnum
+            || $value instanceof \DateTimeInterface
+        ) {
             return $value;
         }
 
-        if (is_object($value) && !$value instanceof \UnitEnum && !$value instanceof Carbon) {
+        if (is_object($value)) {
             $properties = [];
             $reflection = new \ReflectionClass($value);
             foreach ($reflection->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
                 $properties[$property->getName()] = $this->normalizeValue($property->getValue($value), $builder);
             }
-            $value = new ($reflection->getName())(...$properties);
+            return new ($reflection->getName())(...$properties);
         }
 
         if (is_array($value)) {
             foreach ($value as $fieldName => $fieldValue) {
                 $normalizedValue = $this->normalizeValue($fieldValue, $builder);
                 $value[$fieldName] = $normalizedValue;
             }
+
+            return $value;
         }
 
-        return $this->serializer->normalize($value, 'json');
+        return $value;
     }
 }