From 3a25bdacc6ba5e5496ce154b929f512e556a3c65 Mon Sep 17 00:00:00 2001
From: acoulton <andrew@ingenerator.com>
Date: Tue, 10 Mar 2026 11:20:10 +0000
Subject: [PATCH 1/2] test: Fix test data for cell containing `<time>`

The original test data for this feature had invalid HTML (the `<time>` element was not actually in a cell).
---
 test/TableParser/HTML/HTMLStringTableParserTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/TableParser/HTML/HTMLStringTableParserTest.php b/test/TableParser/HTML/HTMLStringTableParserTest.php
index 2303175..0bd4202 100644
--- a/test/TableParser/HTML/HTMLStringTableParserTest.php
+++ b/test/TableParser/HTML/HTMLStringTableParserTest.php
@@ -224,7 +224,7 @@ public function provider_valid_html_tables()
                 '<table>'.
                 '<thead><tr><td>Header</td><th>Date</th></tr></thead>'.
                 '<tbody>'.
-                '<tr><td>Cell1</td><time datetime="2016-08-30T12:00:00Z">30 Aug 2016</time></tr>'.
+                '<tr><td>Cell1</td><td><time datetime="2016-08-30T12:00:00Z">30 Aug 2016</time></td></tr>'.
                 '</tbody></table>',
                 [
                   ['Header', 'Date'],

From b2543184f601f3728ae80de8895650e30415f6ae Mon Sep 17 00:00:00 2001
From: acoulton <andrew@ingenerator.com>
Date: Tue, 10 Mar 2026 11:53:23 +0000
Subject: [PATCH 2/2] fix: Correctly handle parse errors in html tables

When we switched to using masterminds/html5 for table parsing,
the parse error detection & handling was not updated.

This is partly because there are actually very few cases in
which input is actually *invalid* as html (as opposed to
being non-conformant, which isn't checked). And we did not
have test cases proving these examples.

Fixed the handling of this ahead of moving to native html
parsing in 1.4 (which is treated differently anyway).
---
 CHANGELOG.md                                  |  4 ++
 .../HTML/HTMLStringTableParser.php            | 45 +++++++++++--------
 .../HTML/HTMLStringTableParserTest.php        | 33 +++-----------
 3 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 947d5f6..318bfcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 1.3.3 / 2026-03-10
+
+* Fix handling and reporting parse errors when parsing an html table.
+
 ## 1.3.2 / 2025-05-06
 
 * Support PHP 8.4 (thanks @mharmuth)
diff --git a/src/TableParser/HTML/HTMLStringTableParser.php b/src/TableParser/HTML/HTMLStringTableParser.php
index d309d97..610e9b4 100644
--- a/src/TableParser/HTML/HTMLStringTableParser.php
+++ b/src/TableParser/HTML/HTMLStringTableParser.php
@@ -7,9 +7,12 @@
 namespace Ingenerator\BehatTableAssert\TableParser\HTML;
 
 
+use Behat\Gherkin\Node\TableNode;
+use Dom\HTMLDocument;
 use Ingenerator\BehatTableAssert\TableNode\PaddedTableNode;
 use LibXMLError;
 use Masterminds\HTML5;
+use function Dom\import_simplexml;
 
 /**
  * Parses an HTML string for a <table> element into a TableNode. The table must have a single row
@@ -90,33 +93,37 @@ public function parse($html)
      */
     protected function parseHTMLString($html)
     {
-        $old_use_internal_errors = \libxml_use_internal_errors(TRUE);
-        try {
-            $html5 = new HTML5();
-            $dom = $html5->loadHTML(
-              '<!DOCTYPE html><html>'
-              .'<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>'
-              .'<body>'.\trim($html).'</body>'
-              .'</html>'
-            );
+        $html5 = new HTML5();
+        $dom = $html5->loadHTML(
+            '<!DOCTYPE html><html>'
+            .'<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>'
+            .'<body>'.\trim($html).'</body>'
+            .'</html>',
+        );
 
-            $table_elem = $dom->getElementsByTagName('body')->item(0)->firstChild;
-            $table      = \simplexml_import_dom($table_elem);
-            if ($errors = \libxml_get_errors()) {
-                $this->throwInvalidHTMLException($html, $errors);
-            }
-        } finally {
-            \libxml_clear_errors();
-            \libxml_use_internal_errors($old_use_internal_errors);
+        $table_elem = $dom->getElementsByTagName('body')->item(0)->firstChild;
 
+        if (!$table_elem instanceof \DOMElement) {
+            throw new \InvalidArgumentException(
+                sprintf("Expected html root element but got %s\n\n===HTML===\n%s", get_debug_type($table_elem), $html),
+            );
+        }
+        $table = \simplexml_import_dom($table_elem);
+        if ($errors = $html5->getErrors()) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    "Invalid HTML:\n%s\n\n===HTML===\n%s",
+                    implode("\n", array_map(fn($err) => ' - '.$err, $errors)),
+                    $html,
+                ),
+            );
         }
 
         return $table;
     }
 
     /**
-     * @param string        $html
-     * @param LibXMLError[] $errors
+     * @deprecated no longer called by the library
      */
     protected function throwInvalidHTMLException($html, $errors)
     {
diff --git a/test/TableParser/HTML/HTMLStringTableParserTest.php b/test/TableParser/HTML/HTMLStringTableParserTest.php
index 0bd4202..22fde44 100644
--- a/test/TableParser/HTML/HTMLStringTableParserTest.php
+++ b/test/TableParser/HTML/HTMLStringTableParserTest.php
@@ -35,37 +35,16 @@ public function test_it_throws_when_parsing_non_or_empty_string($value)
     }
 
     /**
-     * @testWith ["random", false]
-     *           ["random", true]
-     *           ["<div></div>", false]
-     *           ["<table><thead><tr><td>1</td></tr></thead><tbody></tbody></table>", false]
+     * @testWith ["random text", "Expected html root element but got DOMText"]
+     *           ["<div><17sd>illegal tag name</17sd></div>", "Invalid HTML:\n - Line 1, Col 113: Illegal tag opening"]
+     *           ["<div></div>", "Expected a <table> but got div"]
      */
-    public function test_it_always_restores_state_of_libxml_error_handling(
-        $html,
-        $use_errors_before
-    ) {
-        $old_setting = \libxml_use_internal_errors($use_errors_before);
-        try {
-            $this->newSubject()->parse($html);
-        } catch (\Exception $e) { /* ignore */
-        }
-        $errors_after     = \libxml_get_errors();
-        $use_errors_after = \libxml_use_internal_errors($old_setting);
-
-        $this->assertSame([], $errors_after, 'Should clear libxml errors');
-        $this->assertEquals(
-            $use_errors_before,
-            $use_errors_after,
-            'Should restore libxml_use_internal_errors'
-        );
-    }
-
-    public function test_it_throws_when_parsing_html_that_is_not_a_table()
+    public function test_it_throws_when_parsing_html_that_is_not_a_table_or_not_valid(string $input, string $expect_msg)
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Expected a <table>');
+        $this->expectExceptionMessage($expect_msg);
 
-        $this->newSubject()->parse('<div></div>');
+        $this->newSubject()->parse($input);
     }
 
     public function test_it_throws_when_parsing_table_without_thead()
