Add a new HTMLElementEntry & related stuff

stloyd · stloyd · commit 35cf84f869ae · 2025-11-08T15:09:00.000+01:00
diff --git a/src/core/etl/src/Flow/ETL/Function/HTMLQuerySelector.php b/src/core/etl/src/Flow/ETL/Function/HTMLQuerySelector.php
@@ -17,7 +17,7 @@ public function __construct(
 
     public function eval(Row $row) : ?Element
     {
-        if (\PHP_VERSION_ID < 80400) {
+        if (!\class_exists('\Dom\HTMLDocument')) {
             throw new \RuntimeException('This function requires \Dom\HTMLDocument extension available in PHP 8.4+.');
         }
 
diff --git a/src/core/etl/src/Flow/ETL/Function/HTMLQuerySelectorAll.php b/src/core/etl/src/Flow/ETL/Function/HTMLQuerySelectorAll.php
@@ -20,7 +20,7 @@ public function __construct(
      */
     public function eval(Row $row) : ?array
     {
-        if (\PHP_VERSION_ID < 80400) {
+        if (!\class_exists('\Dom\HTMLDocument')) {
             throw new \RuntimeException('This function requires \Dom\HTMLDocument extension available in PHP 8.4+.');
         }
 
diff --git a/src/lib/types/src/Flow/Types/Type/Logical/HTMLType.php b/src/lib/types/src/Flow/Types/Type/Logical/HTMLType.php
@@ -13,7 +13,7 @@
  */
 final readonly class HTMLType implements Type
 {
-    private const HTML_ALIKE_REGEX = <<<'REGXP'
+    public const HTML_ALIKE_REGEX = <<<'REGXP'
 @^
     <!DOCTYPE\s+html[^>]*>\s*      # must start with <!DOCTYPE html ...>
     <html[^>]*>\s*                 # opening <html>
@@ -49,23 +49,11 @@ public function cast(mixed $value) : HTMLDocument
     public function isValid(mixed $value) : bool
     {
         // \Dom\HTMLDocument exist in PHP 8.4+
-        if (\PHP_VERSION_ID < 80400) {
+        if (!\class_exists('\Dom\HTMLDocument')) {
             return false;
         }
 
-        if (!\is_string($value)) {
-            return $value instanceof HTMLDocument;
-        }
-
-        if ('' === $value) {
-            return false;
-        }
-
-        if ('<' !== $value[0]) {
-            return false;
-        }
-
-        return \preg_match(self::HTML_ALIKE_REGEX, $value) === 1;
+        return $value instanceof HTMLDocument;
     }
 
     public function normalize() : array
diff --git a/src/lib/types/src/Flow/Types/Type/Native/String/StringTypeNarrower.php b/src/lib/types/src/Flow/Types/Type/Native/String/StringTypeNarrower.php
@@ -17,6 +17,7 @@
     type_uuid,
     type_xml};
 use Flow\Types\Type;
+use Flow\Types\Type\Logical\HTMLType;
 use Flow\Types\Type\TypeNarrower;
 use Flow\Types\Value\Uuid;
 
@@ -166,7 +167,11 @@ private function isFloat(string $value) : bool
      */
     private function isHTML(string $value) : bool
     {
-        return type_html()->isValid($value);
+        if ('<' !== $value[0]) {
+            return false;
+        }
+
+        return \preg_match(HTMLType::HTML_ALIKE_REGEX, $value) === 1;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function __construct(`
`17`	`17`
`18`	`18`	`public function eval(Row $row) : ?Element`
`19`	`19`	`{`
`20`		`- if (\PHP_VERSION_ID < 80400) {`
	`20`	`+ if (!\class_exists('\Dom\HTMLDocument')) {`
`21`	`21`	`throw new \RuntimeException('This function requires \Dom\HTMLDocument extension available in PHP 8.4+.');`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function __construct(`
`20`	`20`	`*/`
`21`	`21`	`public function eval(Row $row) : ?array`
`22`	`22`	`{`
`23`		`- if (\PHP_VERSION_ID < 80400) {`
	`23`	`+ if (!\class_exists('\Dom\HTMLDocument')) {`
`24`	`24`	`throw new \RuntimeException('This function requires \Dom\HTMLDocument extension available in PHP 8.4+.');`
`25`	`25`	`}`
`26`	`26`