Skip JSON & XML checks for string that doesn't look as this type of data

flow-php · Oct 16, 2023 · 4ece323 · 4ece323
1 parent 841a277
commit 4ece323
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/core/etl/src/Flow/ETL/Row/Factory/NativeEntryFactory.php b/src/core/etl/src/Flow/ETL/Row/Factory/NativeEntryFactory.php
@@ -54,15 +54,17 @@ public function create(string $entryName, mixed $value) : Entry
 
         if (\is_string($value)) {
             if ('' !== $value) {
-                if ($this->isJson($value)) {
+                $trimmedValue = \trim($value);
+
+                if ($this->isJson($trimmedValue)) {
                     return Row\Entry\JsonEntry::fromJsonString($entryName, $value);
                 }
 
-                if ($this->isUuid($value)) {
+                if ($this->isUuid($trimmedValue)) {
                     return new Row\Entry\UuidEntry($entryName, Entry\Type\Uuid::fromString($value));
                 }
 
-                if ($this->isXML($value)) {
+                if ($this->isXML($trimmedValue)) {
                     return new Entry\XMLEntry($entryName, $value);
                 }
             }
@@ -304,6 +306,10 @@ private function getClass(object $object) : string
 
     private function isJson(string $string) : bool
     {
+        if ('{' !== $string[0] && '[' !== $string[0]) {
+            return false;
+        }
+
         if (
             (!\str_starts_with($string, '{') || !\str_ends_with($string, '}'))
             &&
@@ -330,6 +336,10 @@ private function isUuid(string $string) : bool
 
     private function isXML(string $string) : bool
     {
+        if ('<' !== $string[0]) {
+            return false;
+        }
+
         if (\preg_match('/<(.+?)>(.+?)<\/(.+?)>/', $string) === 1) {
             try {
                 \libxml_use_internal_errors(true);