Add a new HTMLElementEntry & related stuff

stloyd · stloyd · commit f9bf4151bea4 · 2025-11-08T15:16:17.000+01:00
diff --git a/src/core/etl/tests/Flow/ETL/Tests/Unit/Row/Entry/HTMLEntryTest.php b/src/core/etl/tests/Flow/ETL/Tests/Unit/Row/Entry/HTMLEntryTest.php
@@ -159,11 +159,11 @@ public function test_with_value() : void
     {
         $entry = html_entry('html', '<!DOCTYPE html><html lang="en"><head></head><body><div>foobar</div></body></html>');
 
-        $html = '<!DOCTYPE html><html lang="en"><head></head><body><div>different</div></body></html>';
+        $html = HTMLDocument::createFromString('<!DOCTYPE html><html lang="en"><head></head><body><div>different</div></body></html>');
 
         $newEntry = $entry->withValue($html);
 
         self::assertNotEquals($entry->toString(), $newEntry->toString());
-        self::assertEquals($html, $newEntry->toString());
+        self::assertEquals($html, $newEntry->value());
     }
 }
diff --git a/src/core/etl/tests/Flow/ETL/Tests/Unit/Row/EntryFactoryTest.php b/src/core/etl/tests/Flow/ETL/Tests/Unit/Row/EntryFactoryTest.php
@@ -274,9 +274,13 @@ public function test_html_from_string() : void
     #[RequiresPhp('>= 8.4')]
     public function test_html_string_with_html_definition_provided() : void
     {
+        $document = HTMLDocument::createFromString(
+            $html = '<!DOCTYPE html><html lang="en"><head></head><body><div>2</div><p>bar</p></body></html>'
+        );
+
         self::assertEquals(
-            html_entry('e', $html = '<!DOCTYPE html><html lang="en"><head></head><body><div>2</div><p>bar</p></body></html>'),
-            $this->entryFactory->create('e', $html, schema(html_schema('e')))
+            html_entry('e', $html),
+            $this->entryFactory->create('e', $document, schema(html_schema('e')))
         );
     }
 
diff --git a/src/lib/types/tests/Flow/Types/Tests/Unit/Type/Logical/HTMLTypeTest.php b/src/lib/types/tests/Flow/Types/Tests/Unit/Type/Logical/HTMLTypeTest.php
@@ -80,15 +80,15 @@ public static function cast_data_provider() : \Generator
         ];
 
         yield 'valid HTML string' => [
-            'value' => $html = '<!DOCTYPE html><html lang="en"><head></head><body><div><span>1</span></div></body></html>',
-            'expected' => $html,
-            'exceptionClass' => null,
+            'value' => '<!DOCTYPE html><html lang="en"><head></head><body><div><span>1</span></div></body></html>',
+            'expected' => null,
+            'exceptionClass' => CastingException::class,
         ];
 
         yield 'valid HTML with spaces' => [
             'value' => '<!DOCTYPE html><html>   <head><title></title></head>    <body><p>invalid</p>  </body>  </html>',
-            'expected' => '<!DOCTYPE html><html>   <head><title></title></head>    <body><p>invalid</p>  </body>  </html>',
-            'exceptionClass' => null,
+            'expected' => null,
+            'exceptionClass' => CastingException::class,
         ];
 
         yield 'valid HTML with new lines' => [
@@ -101,8 +101,8 @@ public static function cast_data_provider() : \Generator
     </body>
 </html>
 HTML,
-            'expected' => '<!DOCTYPE html><html>    <head><title></title></head>    <body>        <p> invalid</p>    </body></html>',
-            'exceptionClass' => null,
+            'expected' => null,
+            'exceptionClass' => CastingException::class,
         ];
 
         yield 'missing doctype' => [
@@ -134,7 +134,7 @@ public static function is_valid_data_provider() : \Generator
 
         yield 'valid HTML string' => [
             'value' => '<!DOCTYPE html><html lang="en"><head></head><body><div><span>1</span></div></body></html>',
-            'expected' => true,
+            'expected' => false,
         ];
 
         yield 'invalid HTML string' => [

Original file line number	Diff line number	Diff line change
`@@ -159,11 +159,11 @@ public function test_with_value() : void`
`159`	`159`	`{`
`160`	`160`	`$entry = html_entry('html', '<!DOCTYPE html><html lang="en"><head></head><body><div>foobar</div></body></html>');`
`161`	`161`
`162`		`- $html = '<!DOCTYPE html><html lang="en"><head></head><body><div>different</div></body></html>';`
	`162`	`+ $html = HTMLDocument::createFromString('<!DOCTYPE html><html lang="en"><head></head><body><div>different</div></body></html>');`
`163`	`163`
`164`	`164`	`$newEntry = $entry->withValue($html);`
`165`	`165`
`166`	`166`	`self::assertNotEquals($entry->toString(), $newEntry->toString());`
`167`		`- self::assertEquals($html, $newEntry->toString());`
	`167`	`+ self::assertEquals($html, $newEntry->value());`
`168`	`168`	`}`
`169`	`169`	`}`