Merge branch '1.x' into 1939-bug-to_csv-inside-write-do-not-set-up-contenttype-for-s3

Author: norberttech

.github/workflows/test-suite.yml

@@ -8,6 +8,7 @@ on:
       - 'examples/**'
       - 'composer.lock'
       - 'composer.json'
+      - 'phpunit.xml.dist'
   push:
     branches: [ 1.x ]
     paths:
@@ -18,6 +19,7 @@ on:
       - 'examples/**'
       - 'composer.lock'
       - 'composer.json'
+      - 'phpunit.xml.dist'
   schedule:
     - cron: '0 4 * * *'
   workflow_dispatch:
@@ -50,4 +52,4 @@ jobs:
     uses: ./.github/workflows/job-mutation-tests.yml
 
   benchmark-tests:
-    uses: ./.github/workflows/job-benchmark-tests.yml
+    uses: ./.github/workflows/job-benchmark-tests.yml

CHANGELOG.md

@@ -1,4 +1,4 @@
-## [Unreleased] - 2025-10-29
+## [Unreleased] - 2025-10-31
 
 ### Added
 - [#1917](https://github.com/flow-php/flow/pull/1917) - **Add a new `HTMLType`** - [@stloyd](https://github.com/stloyd)
@@ -9,6 +9,9 @@
 - [#1929](https://github.com/flow-php/flow/pull/1929) - **Enforce instance of EntryFactory in the join methods** - [@stloyd](https://github.com/stloyd)
 - [#1925](https://github.com/flow-php/flow/pull/1925) - **Update Homebrew TAP formula: flow-php to version: 0.26.1** - [@norberttech](https://github.com/norberttech)
 
+### Fixed
+- [#1945](https://github.com/flow-php/flow/pull/1945) - **Fixed broken `HTMLTypeTest`** - [@stloyd](https://github.com/stloyd)
+
 ### Removed
 - [#1929](https://github.com/flow-php/flow/pull/1929) - **Remove `Rows::fromArray()`** - [@stloyd](https://github.com/stloyd)
 

phpunit.xml.dist

@@ -72,10 +72,10 @@
     <testsuite name="lib-parquet-viewer-integration">
       <directory>src/lib/parquet-viewer/tests/Flow/ParquetViewer/Tests/Integration</directory>
     </testsuite>
-    <testsuite name="snappy-integration">
+    <testsuite name="lib-snappy-integration">
       <directory>src/lib/snappy/tests/Flow/Snappy/Tests/Integration</directory>
     </testsuite>
-    <testsuite name="types-unit">
+    <testsuite name="lib-types-unit">
       <directory>src/lib/types/tests/Flow/Types/Tests/Unit</directory>
     </testsuite>
     <testsuite name="bridge-filesystem-azure-unit">

src/lib/types/src/Flow/Types/Type/Native/String/StringTypeChecker.php

@@ -119,15 +119,19 @@ public function isHTML() : bool
             return false;
         }
 
-        if (\class_exists('\Dom\HTMLDocument', false)) {
-            $options = \LIBXML_HTML_NOIMPLIED;
+        if (\preg_match('/(<!doctype(.+?)>)?<html(.+?)>(.+?)<\/html>/im', $this->string) === 1) {
+            if (\class_exists('\Dom\HTMLDocument', false)) {
+                $options = \LIBXML_HTML_NOIMPLIED;
 
-            if (defined('Dom\HTML_NO_DEFAULT_NS')) {
-                $options |= constant('\Dom\HTML_NO_DEFAULT_NS');
+                if (defined('Dom\HTML_NO_DEFAULT_NS')) {
+                    $options |= constant('\Dom\HTML_NO_DEFAULT_NS');
+                }
+
+                $doc = @HTMLDocument::createFromString($this->string, $options);
+
+                return $doc->saveHtml() === $this->string;
             }
 
-            HTMLDocument::createFromString($this->string, $options);
-        } elseif (\preg_match('/(<!doctype(.+?)>)?<html(.+?)>(.+?)<\/html>/im', $this->string) === 1) {
             try {
                 \libxml_use_internal_errors(true);
 

src/lib/types/src/Flow/Types/Value/HTMLDocument.php

@@ -12,7 +12,9 @@ final class HTMLDocument implements \Stringable
 
     public function __construct(string|object $value)
     {
-        if (\is_string($value)) {
+        if ('' === $value) {
+            $this->value = $value;
+        } elseif (\is_string($value)) {
             if (\class_exists('\Dom\HTMLDocument', false)) {
                 $options = \LIBXML_HTML_NOIMPLIED;
 

src/lib/types/tests/Flow/Types/Tests/Unit/Type/Logical/HTMLTypeTest.php

@@ -6,15 +6,16 @@
 
 use function Flow\Types\DSL\{type_from_array, type_html};
 use Flow\Types\Exception\{CastingException, InvalidTypeException};
-use PHPUnit\Framework\Attributes\DataProvider;
+use Flow\Types\Value\HTMLDocument;
+use PHPUnit\Framework\Attributes\{DataProvider, RequiresPhp};
 use PHPUnit\Framework\TestCase;
 
 final class HTMLTypeTest extends TestCase
 {
     public static function assert_data_provider() : \Generator
     {
-        yield 'valid \DOMDocument' => [
-            'value' => new \DOMDocument,
+        yield 'valid HTMLDocument' => [
+            'value' => new HTMLDocument(''),
             'exceptionClass' => null,
         ];
 
@@ -59,14 +60,13 @@ public static function assert_data_provider() : \Generator
         ];
     }
 
-    public static function cast_data_provider() : \Generator
+    public static function cast_data_provider_php82() : \Generator
     {
         yield 'string to HTML' => [
             'value' => '<!DOCTYPE html><html lang="en"><body><div><span>1</span></div></body></html>',
             'expected' => <<<'HTML'
 <!DOCTYPE html>
 <html lang="en"><body><div><span>1</span></div></body></html>
-
 HTML,
             'exceptionClass' => null,
         ];
@@ -75,7 +75,29 @@ public static function cast_data_provider() : \Generator
             'value' => '<div><span>1</span></div>',
             'expected' => <<<'HTML'
 <div><span>1</span></div>
+HTML,
+            'exceptionClass' => null,
+        ];
+
+        yield 'object to HTML' => [
+            'value' => new \stdClass(),
+            'expected' => null,
+            'exceptionClass' => CastingException::class,
+        ];
+    }
+
+    public static function cast_data_provider_php84() : \Generator
+    {
+        yield 'string to HTML' => [
+            'value' => '<!DOCTYPE html><html lang="en"><body><div><span>1</span></div></body></html>',
+            'expected' => '<!DOCTYPE html><html lang="en"><body><div><span>1</span></div></body></html>',
+            'exceptionClass' => null,
+        ];
 
+        yield 'incomplete string to HTML' => [
+            'value' => '<div><span>1</span></div>',
+            'expected' => <<<'HTML'
+<div><span>1</span></div>
 HTML,
             'exceptionClass' => null,
         ];
@@ -89,8 +111,8 @@ public static function cast_data_provider() : \Generator
 
     public static function is_valid_data_provider() : \Generator
     {
-        yield 'valid \DOMDocument' => [
-            'value' => new \DOMDocument(),
+        yield 'valid HTMLDocument' => [
+            'value' => new HTMLDocument(''),
             'expected' => true,
         ];
 
@@ -117,19 +139,33 @@ public function test_assert(mixed $value, ?string $exceptionClass = null) : void
             $this->expectException($exceptionClass);
             type_html()->assert($value);
         } else {
-            self::assertInstanceOf(\DOMDocument::class, type_html()->assert($value));
+            self::assertInstanceOf(HTMLDocument::class, type_html()->assert($value));
+        }
+    }
+
+    #[RequiresPhp('< 8.4')]
+    #[DataProvider('cast_data_provider_php82')]
+    public function test_cast_php82(mixed $value, mixed $expected, ?string $exceptionClass) : void
+    {
+        if ($exceptionClass !== null) {
+            $this->expectException($exceptionClass);
+            type_html()->cast($value);
+        } else {
+            $result = type_html()->cast($value);
+            self::assertSame($expected, $result->toString());
         }
     }
 
-    #[DataProvider('cast_data_provider')]
-    public function test_cast(mixed $value, mixed $expected, ?string $exceptionClass) : void
+    #[RequiresPhp('>= 8.4')]
+    #[DataProvider('cast_data_provider_php84')]
+    public function test_cast_php84(mixed $value, mixed $expected, ?string $exceptionClass) : void
     {
         if ($exceptionClass !== null) {
             $this->expectException($exceptionClass);
             type_html()->cast($value);
         } else {
             $result = type_html()->cast($value);
-            self::assertSame($expected, $result->saveHtml());
+            self::assertSame($expected, $result->toString());
         }
     }
 

src/lib/types/tests/Flow/Types/Tests/Unit/Value/HTMLDocumentTest.php

@@ -14,14 +14,14 @@ final class HTMLDocumentTest extends TestCase
     #[RequiresPhp('>= 8.4')]
     public function test_create_with_dom_document_html_on_newer() : void
     {
-        $doc = \Dom\HTMLDocument::createFromString('<html><body><div><span>bar</span></div></body></html>');
+        $doc = \Dom\HTMLDocument::createFromString('<html><body><div><span>bar</span></div></body></html>', \LIBXML_HTML_NOIMPLIED);
 
         $document = new HTMLDocument($doc);
 
-        self::assertSame('<html><head></head><body><div><span>bar</span></div></body></html>', (string) $document);
+        self::assertSame('<html><body><div><span>bar</span></div></body></html>', (string) $document);
     }
 
-    #[RequiresPhp('<= 8.4')]
+    #[RequiresPhp('< 8.4')]
     public function test_create_with_dom_document_html_on_old() : void
     {
         $doc = new \DOMDocument();
@@ -40,7 +40,7 @@ public function test_create_with_invalid_html_on_newer() : void
         self::assertSame('invalid', (string) $document);
     }
 
-    #[RequiresPhp('<= 8.4')]
+    #[RequiresPhp('< 8.4')]
     public function test_create_with_invalid_html_on_old() : void
     {
         $document = new HTMLDocument('invalid');
@@ -57,7 +57,7 @@ public function test_create_with_proper_html_on_newer() : void
         self::assertSame($html, (string) $document);
     }
 
-    #[RequiresPhp('<= 8.4')]
+    #[RequiresPhp('< 8.4')]
     public function test_create_with_proper_html_on_old() : void
     {
         $html = '<html><body><div><span>bar</span></div></body></html>';