Prevent fatal error when passing empty string to \DOMDocument (#500)

* Prevent fatal error when passing empty string to `\DOMDocument` * Skip empty string in json & uuid checks
flow-php · Oct 3, 2023 · 074790a · 074790a
1 parent 72b95dd
commit 074790a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 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
@@ -298,6 +298,10 @@ private function getClass(object $object) : string
 
     private function isJson(string $string) : bool
     {
+        if ('' === $string) {
+            return false;
+        }
+
         try {
             return \is_array(\json_decode($string, true, self::JSON_DEPTH, JSON_THROW_ON_ERROR));
         } catch (\Exception) {
@@ -307,11 +311,19 @@ private function isJson(string $string) : bool
 
     private function isUuid(string $string) : bool
     {
+        if ('' === $string) {
+            return false;
+        }
+
         return 0 !== \preg_match(Entry\Type\Uuid::UUID_REGEXP, $string);
     }
 
     private function isXML(string $string) : bool
     {
+        if ('' === $string) {
+            return false;
+        }
+
         try {
             \libxml_use_internal_errors(true);
 

diff --git a/src/core/etl/tests/Flow/ETL/Tests/Unit/Row/Factory/NativeEntryFactoryTest.php b/src/core/etl/tests/Flow/ETL/Tests/Unit/Row/Factory/NativeEntryFactoryTest.php
@@ -117,6 +117,14 @@ public function test_float_with_schema() : void
         );
     }
 
+    public function test_from_empty_string() : void
+    {
+        $this->assertEquals(
+            Entry::string('e', ''),
+            (new NativeEntryFactory())->create('e', '')
+        );
+    }
+
     public function test_int() : void
     {
         $this->assertEquals(