Microoptimization

flow-php · Jan 21, 2024 · d4f6211 · d4f6211
1 parent f2d5af4
commit d4f6211
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 16 deletions.
diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/ArrayCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/ArrayCastingHandler.php
@@ -20,14 +20,14 @@ public function supports(Type $type) : bool
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
         try {
-            if (\is_string($value) && (\str_starts_with($value, '{') || \str_starts_with($value, '['))) {
-                return \json_decode($value, true, 512, \JSON_THROW_ON_ERROR);
-            }
-
             if (\is_array($value)) {
                 return $value;
             }
 
+            if (\is_string($value) && (\str_starts_with($value, '{') || \str_starts_with($value, '['))) {
+                return \json_decode($value, true, 512, \JSON_THROW_ON_ERROR);
+            }
+
             if ($value instanceof \DOMDocument) {
                 return (new XMLConverter())->toArray($value);
             }

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/BooleanCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/BooleanCastingHandler.php
@@ -18,6 +18,10 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
+        if (\is_bool($value)) {
+            return $value;
+        }
+
         if (\is_string($value)) {
             if (\in_array(\mb_strtolower($value), ['true', '1', 'yes', 'on'], true)) {
                 return true;

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/EnumCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/EnumCastingHandler.php
@@ -18,6 +18,11 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
+        /** @var EnumType $type */
+        if ($value instanceof $type->class) {
+            return $value;
+        }
+
         try {
             /** @var EnumType $type */
             $enumClass = $type->class;

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/FloatCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/FloatCastingHandler.php
@@ -18,6 +18,10 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
+        if (\is_float($value)) {
+            return $value;
+        }
+
         if ($value instanceof \DateTimeImmutable) {
             return (float) $value->format('Uu');
         }

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/IntegerCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/IntegerCastingHandler.php
@@ -18,6 +18,10 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
+        if (\is_int($value)) {
+            return $value;
+        }
+
         if ($value instanceof \DateTimeImmutable) {
             return (int) $value->format('Uu');
         }

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/ObjectCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/ObjectCastingHandler.php
@@ -19,6 +19,10 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
+        if (\is_object($value)) {
+            return $value;
+        }
+
         /** @var ObjectType $type */
         try {
             $object = (object) $value;

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/StringCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/StringCastingHandler.php
@@ -18,10 +18,6 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
-        if ($value === null) {
-            return null;
-        }
-
         if (\is_string($value)) {
             return $value;
         }

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/StructureCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/StructureCastingHandler.php
@@ -18,10 +18,6 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
-        if ($value === null && !$type->nullable()) {
-            throw new CastingException($value, $type);
-        }
-
         /** @var StructureType $type */
         try {
             if (\is_string($value) && (\str_starts_with($value, '{') || \str_starts_with($value, '['))) {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/UuidCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/UuidCastingHandler.php
@@ -19,6 +19,10 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
+        if ($value instanceof Uuid) {
+            return $value;
+        }
+
         if (\is_string($value)) {
             return new Uuid($value);
         }

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Caster/XMLCastingHandler.php b/src/core/etl/src/Flow/ETL/PHP/Type/Caster/XMLCastingHandler.php
@@ -4,6 +4,7 @@
 
 namespace Flow\ETL\PHP\Type\Caster;
 
+use function Flow\ETL\DSL\type_string;
 use function Flow\ETL\DSL\type_xml;
 use Flow\ETL\Exception\CastingException;
 use Flow\ETL\PHP\Type\Caster;
@@ -19,6 +20,10 @@ public function supports(Type $type) : bool
 
     public function value(mixed $value, Type $type, Caster $caster) : mixed
     {
+        if ($value instanceof \DOMDocument) {
+            return $value;
+        }
+
         if (\is_string($value)) {
             $doc = new \DOMDocument();
 
@@ -29,10 +34,18 @@ public function value(mixed $value, Type $type, Caster $caster) : mixed
             return $doc;
         }
 
-        if ($value instanceof \DOMDocument) {
-            return $value;
-        }
+        try {
+            $stringValue = $caster->to(type_string())->value($value);
 
-        throw new CastingException($value, $type);
+            $doc = new \DOMDocument();
+
+            if (!@$doc->loadXML($stringValue)) {
+                throw new CastingException($stringValue, type_xml());
+            }
+
+            return $doc;
+        } catch (CastingException $e) {
+            throw new CastingException($value, type_xml(), $e);
+        }
     }
 }