diff --git a/SECURITY.md b/SECURITY.md
index 04e8e51..c3d6974 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,8 +7,7 @@ The following matrix shows the versions that are currently maintained.
 | Version | Supported          |
 |---------|--------------------|
 | 2.x     | :white_check_mark: |
-| 1.5.x   | :white_check_mark: |
-| < 1.5.0 | :x:                |
+| < 2.x   | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/tests/Behavior/AttrTest.php b/tests/Behavior/AttrTest.php
index 3191028..fbefe93 100644
--- a/tests/Behavior/AttrTest.php
+++ b/tests/Behavior/AttrTest.php
@@ -78,17 +78,15 @@ public function withValuesClonesInstanceWhenModified(): void
         self::assertNotSame($attr, $attr->withValues($valueA, $valueD));
     }
 
-    public static function matchesNameDataProvider(): array
+    public static function matchesNameDataProvider(): iterable
     {
-        return [
-            [ Attr::BLUNT, 'name', 'name', true ],
-            [ Attr::BLUNT, 'name', 'other', false ],
-            [ Attr::BLUNT, 'name', 'name-other', false ],
-            [ Attr::NAME_PREFIX, 'name-', 'name-', true ],
-            [ Attr::NAME_PREFIX, 'name-', 'name-other', true ],
-            [ Attr::NAME_PREFIX, 'name-', 'name', false ],
-            [ Attr::NAME_PREFIX, 'name-', 'other', false ],
-        ];
+        yield [ Attr::BLUNT, 'name', 'name', true ];
+        yield [ Attr::BLUNT, 'name', 'other', false ];
+        yield [ Attr::BLUNT, 'name', 'name-other', false ];
+        yield [ Attr::NAME_PREFIX, 'name-', 'name-', true ];
+        yield [ Attr::NAME_PREFIX, 'name-', 'name-other', true ];
+        yield [ Attr::NAME_PREFIX, 'name-', 'name', false ];
+        yield [ Attr::NAME_PREFIX, 'name-', 'other', false ];
     }
 
     /**
@@ -105,30 +103,28 @@ public function matchesName(int $flags, string $name, string $matchName, bool $e
         self::assertSame($expectation, $attr->matchesName($matchName));
     }
 
-    public static function matchesValueDataProvider(): array
+    public static function matchesValueDataProvider(): iterable
     {
         $equalsA = new DatasetAttrValue('a');
         $equalsB = new DatasetAttrValue('b');
         $equalsAorB = new DatasetAttrValue('a', 'b');
 
-        return [
-            [ Attr::MATCH_ALL_VALUES, [$equalsA], 'a', true ],
-            [ Attr::MATCH_ALL_VALUES, [$equalsA], 'b', false ],
-            [ Attr::MATCH_ALL_VALUES, [$equalsAorB], 'a', true ],
-            [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsAorB], 'a', true ],
-            [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB], 'a', false ], // both `$equalsA` and `$equalsB` must match
-            [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB], 'b', false ], // both `$equalsA` and `$equalsB` must match
-            [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB], 'c', false ],
-            [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB, $equalsAorB], 'c', false ],
-            [ Attr::BLUNT, [$equalsA], 'a', true ],
-            [ Attr::BLUNT, [$equalsA], 'b', false ],
-            [ Attr::BLUNT, [$equalsAorB], 'a', true ],
-            [ Attr::BLUNT, [$equalsA, $equalsAorB], 'a', true ],
-            [ Attr::BLUNT, [$equalsA, $equalsB], 'a', true ],
-            [ Attr::BLUNT, [$equalsA, $equalsB], 'b', true ],
-            [ Attr::BLUNT, [$equalsA, $equalsB], 'c', false ],
-            [ Attr::BLUNT, [$equalsA, $equalsB, $equalsAorB], 'c', false ],
-        ];
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsA], 'a', true ];
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsA], 'b', false ];
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsAorB], 'a', true ];
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsAorB], 'a', true ];
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB], 'a', false ]; // both `$equalsA` and `$equalsB` must match
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB], 'b', false ]; // both `$equalsA` and `$equalsB` must match
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB], 'c', false ];
+        yield [ Attr::MATCH_ALL_VALUES, [$equalsA, $equalsB, $equalsAorB], 'c', false ];
+        yield [ Attr::BLUNT, [$equalsA], 'a', true ];
+        yield [ Attr::BLUNT, [$equalsA], 'b', false ];
+        yield [ Attr::BLUNT, [$equalsAorB], 'a', true ];
+        yield [ Attr::BLUNT, [$equalsA, $equalsAorB], 'a', true ];
+        yield [ Attr::BLUNT, [$equalsA, $equalsB], 'a', true ];
+        yield [ Attr::BLUNT, [$equalsA, $equalsB], 'b', true ];
+        yield [ Attr::BLUNT, [$equalsA, $equalsB], 'c', false ];
+        yield [ Attr::BLUNT, [$equalsA, $equalsB, $equalsAorB], 'c', false ];
     }
 
     /**
diff --git a/tests/Behavior/TagTest.php b/tests/Behavior/TagTest.php
index 44d5589..d2df8d2 100644
--- a/tests/Behavior/TagTest.php
+++ b/tests/Behavior/TagTest.php
@@ -21,15 +21,13 @@
 
 class TagTest extends TestCase
 {
-    public function ambiguityIsDetectedDataProvider(): array
+    public static function ambiguityIsDetectedDataProvider(): iterable
     {
-        return [
-            [ ['same'], ['same'], 1625394715 ],
-            [ ['same', 'same'], [], 1625590355 ],
-            [ ['same', 'same'], ['same'], 1625590355 ],
-            [ [], ['same', 'same'], 1625590355 ],
-            [ ['same'], ['same', 'same'], 1625590355 ],
-        ];
+        yield [ ['same'], ['same'], 1625394715 ];
+        yield [ ['same', 'same'], [], 1625590355 ];
+        yield [ ['same', 'same'], ['same'], 1625590355 ];
+        yield [ [], ['same', 'same'], 1625590355 ];
+        yield [ ['same'], ['same', 'same'], 1625590355 ];
     }
 
     /**
diff --git a/tests/BehaviorTest.php b/tests/BehaviorTest.php
index 4575d14..323cc68 100644
--- a/tests/BehaviorTest.php
+++ b/tests/BehaviorTest.php
@@ -21,14 +21,12 @@
 
 class BehaviorTest extends TestCase
 {
-    public function ambiguityIsDetectedDataProvider(): array
+    public static function ambiguityIsDetectedDataProvider(): iterable
     {
-        return [
-            [ ['same', 'same'], [], 1625591503 ],
-            [ ['same', 'same'], ['same'], 1625591503 ],
-            [ [], ['same', 'same'], 1625591503 ],
-            [ ['same'], ['same', 'same'], 1625591503 ],
-        ];
+        yield [ ['same', 'same'], [], 1625591503 ];
+        yield [ ['same', 'same'], ['same'], 1625591503 ];
+        yield [ [], ['same', 'same'], 1625591503 ];
+        yield [ ['same'], ['same', 'same'], 1625591503 ];
     }
 
     /**
diff --git a/tests/CommonBuilderTest.php b/tests/CommonBuilderTest.php
index 2e2da3e..5ce6fc5 100644
--- a/tests/CommonBuilderTest.php
+++ b/tests/CommonBuilderTest.php
@@ -19,302 +19,300 @@
 
 class CommonBuilderTest extends TestCase
 {
-    public function isSanitizedDataProvider(): array
+    public static function isSanitizedDataProvider(): iterable
     {
-        return [
-            '#010' => [
+        yield '#010' => [
+            '<unknown unknown="unknown">value</unknown>',
+            '&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;',
+        ];
+        yield '#011' => [
+            '<div class="nested"><unknown unknown="unknown">value</unknown></div>',
+            '<div class="nested">&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;</div>',
+        ];
+        yield '#012' => [
+            '&lt;script&gt;alert(1)&lt;/script&gt;',
+            '&lt;script&gt;alert(1)&lt;/script&gt;',
+        ];
+        yield '#013' => [
+            '<unknown unknown="unknown">value</unknown>' .
                 '<unknown unknown="unknown">value</unknown>',
-                '&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;',
-            ],
-            '#011' => [
-                '<div class="nested"><unknown unknown="unknown">value</unknown></div>',
-                '<div class="nested">&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;</div>',
-            ],
-            '#012' => [
-                '&lt;script&gt;alert(1)&lt;/script&gt;',
-                '&lt;script&gt;alert(1)&lt;/script&gt;',
-            ],
-            '#013' => [
-                '<unknown unknown="unknown">value</unknown>' .
-                    '<unknown unknown="unknown">value</unknown>',
-                '&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;' .
-                    '&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;'
-            ],
-            '#014' => [
-                '<unknown>value</unknown><unknown>value</unknown>' .
-                    '<div unknown="unknown">value</div>' .
-                    '<unknown>value</unknown><unknown>value</unknown>',
-                '&lt;unknown&gt;value&lt;/unknown&gt;&lt;unknown&gt;value&lt;/unknown&gt;' .
-                    '<div>value</div>' .
-                    '&lt;unknown&gt;value&lt;/unknown&gt;&lt;unknown&gt;value&lt;/unknown&gt;'
-            ],
-            '#015' => [
-                '<unknown unknown="unknown" class="nested"><div class="nested">value</div></unknown>',
-                // '&lt;unknown unknown="unknown" class="nested"&gt;<div class="nested">value</div>&lt;/unknown&gt;',
-                // @todo invalidating nested nodes due invalid parent node is currently expected - topic for discussion
-                '&lt;unknown unknown="unknown" class="nested"&gt;&lt;div class="nested"&gt;value&lt;/div&gt;&lt;/unknown&gt;',
-            ],
-            // @todo bug in https://github.com/Masterminds/html5-php/issues
-            // '#013' => [
-            //    '<strong>Given that x < y and y > z...</strong>',
-            //    '<strong>Given that x &lt; y and y &gt; z...</strong>',
-            // ],
-            '#020' => [
-                '<div unknown="unknown">value</div>',
-                '<div>value</div>',
-            ],
-            '#030' => [
-                '<div class="class">value</div>',
-                '<div class="class">value</div>',
-            ],
-            '#031' => [
-                '<div data-value="value">value</div>',
-                '<div data-value="value">value</div>',
-            ],
-            '#032' => [
-                '<div data-bool>value</div>',
-                '<div data-bool>value</div>',
-            ],
-            '#040' => [
-                '<img src="mailto:noreply@typo3.org" onerror="alert(1)">',
-                '',
-            ],
-            '#041' => [
-                '<img src="https://typo3.org/logo.svg" onerror="alert(1)">',
-                '<img src="https://typo3.org/logo.svg">',
-            ],
-            '#042' => [
-                '<img src="http://typo3.org/logo.svg" onerror="alert(1)">',
-                '<img src="http://typo3.org/logo.svg">',
-            ],
-            '#043' => [
-                '<img src="/typo3.org/logo.svg" onerror="alert(1)">',
-                '<img src="/typo3.org/logo.svg">',
-            ],
-            '#044' => [
-                '<img src="typo3.org/logo.svg" onerror="alert(1)">',
-                '<img src="typo3.org/logo.svg">',
-            ],
-            '#045' => [
-                '<img src="//typo3.org/logo.svg" onerror="alert(1)">',
-                '',
-            ],
-            '#046' => [
-                '<img src="/typo3.org/logo.svg" alt="logo" loading="lazy" fetchpriority="low" decoding="async" width="100" height="100" sizes="33.3vw" name="logo" align="left" border="0">',
-                '<img src="/typo3.org/logo.svg" alt="logo" loading="lazy" fetchpriority="low" decoding="async" width="100" height="100" sizes="33.3vw" name="logo" align="left" border="0">',
-            ],
-            '#047' => [
-                '<img src="data:text/html,<script>alert(1)</script>">',
-                '',
-            ],
-            '#048' => [
-                '<img src="data:image/png,..."><img src="data:image/png;,..."><img src="data:image/png;base64,..."><img src="data:image/svg+xml;base64,...">',
-                '<img src="data:image/png,..."><img src="data:image/png;,..."><img src="data:image/png;base64,..."><img src="data:image/svg+xml;base64,...">',
-            ],
-            '#049' => [
-                '<a href="git://github.com/typo3/typo3">GitHub</a>',
-                '<a href="git://github.com/typo3/typo3">GitHub</a>',
-            ],
-            '#050' => [
-                '<a href="https://typo3.org/" role="button">value</a>',
-                '<a href="https://typo3.org/" role="button">value</a>',
-            ],
-            '#051' => [
-                '<a href="ssh://example.org/" role="button">value</a>',
-                '<a role="button">value</a>',
-            ],
-            '#052' => [
-                '<a href="javascript:alert(1)" role="button">value</a>',
-                '<a role="button">value</a>',
-            ],
-            '#053' => [
-                '<a href="data:text/html;..." role="button">value</a>',
-                '<a role="button">value</a>',
-            ],
-            '#054' => [
-                '<a href="#anchor">anchor</a><a name="anchor">content</a>',
-                '<a href="#anchor">anchor</a><a name="anchor">content</a>',
-            ],
-            '#055' => [
-                '<a href="tel:123456789">anchor</a>',
-                '<a href="tel:123456789">anchor</a>',
-            ],
-            '#090' => [
-                '<p data-bool><span data-bool><strong data-bool>value</strong></span></p>',
-                '<p data-bool><span data-bool><strong data-bool>value</strong></span></p>'
-            ],
-            '#100' => [
-                '<table><caption>c</caption><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody><tfoot><tr><td>f</td></tr></tfoot></table>',
-                '<table><caption>c</caption><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody><tfoot><tr><td>f</td></tr></tfoot></table>',
-            ],
-            '#101' => [
-                '<table align="left" border="2" cellpadding="2" cellspacing="2" class="table" summary="summary"></table>',
-                '<table align="left" border="2" cellpadding="2" cellspacing="2" class="table" summary="summary"></table>',
-            ],
-            '#102' => [
-                '<caption align="left">caption</caption>',
-                '<caption align="left">caption</caption>',
-            ],
-            '#104' => [
-                '<tr align="left" valign="top" bgcolor="#cc0000"><td>td</td></tr>',
-                '<tr align="left" valign="top" bgcolor="#cc0000"><td>td</td></tr>',
-            ],
-            '#105' => [
-                '<td abbr="abbr" align="left" valign="top" colspan="2" rowspan="2" bgcolor="#cc0000" axis="axis,axis" headers="head,head" scope="scope" width="100" height="100">value</td>',
-                '<td abbr="abbr" align="left" valign="top" colspan="2" rowspan="2" bgcolor="#cc0000" axis="axis,axis" headers="head,head" scope="scope" width="100" height="100">value</td>',
-            ],
-            '#106' => [
-                '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
-                '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
-            ],
-            '#107' => [
-                '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
-                '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
-            ],
-            '#108' => [
-                '<tfoot align="left" valign="top" bgcolor="#cc0000"><td>td</td></tfoot>',
-                '<tfoot align="left" valign="top" bgcolor="#cc0000"><td>td</td></tfoot>',
-            ],
-            '#109' => [
-                '<colgroup align="left" valign="top" bgcolor="#cc0000" span="1"><col><col span="2" align="left" valign="top" bgcolor="#cc0000" width="100"></colgroup>',
-                '<colgroup align="left" valign="top" bgcolor="#cc0000" span="1"><col><col span="2" align="left" valign="top" bgcolor="#cc0000" width="100"></colgroup>',
-            ],
-            '#120' => [
-                '<figure><img src="https://typo3.org/logo.svg" alt="logo"><figcaption>TYPO3 logo</figcaption></figure>',
-                '<figure><img src="https://typo3.org/logo.svg" alt="logo"><figcaption>TYPO3 logo</figcaption></figure>',
-            ],
-            '#121' => [
-                '<picture><source srcset="/logo-800.png" media="(min-width: 800px)" type="image/png" sizes="33.3vw"></picture>',
-                '<picture><source srcset="/logo-800.png" media="(min-width: 800px)" type="image/png" sizes="33.3vw"></picture>'
-            ],
-            '#122' => [
-                '<video controls src="/video.mp4"><track default kind="captions" srclang="en" src="/video.vtt"></video>',
-                '<video controls src="/video.mp4"><track default kind="captions" srclang="en" src="/video.vtt"></video>',
-            ],
-            '200' => [
-                '<ul><li>item</li><li>item</li></ul>',
-                '<ul><li>item</li><li>item</li></ul>',
-            ],
-            '201' => [
-                '<ol reversed start="3" type="I"><li>item</li><li value="13">item</li></ol>',
-                '<ol reversed start="3" type="I"><li>item</li><li value="13">item</li></ol>',
-            ],
-            '#900' => [
-                '<div id="main">' .
-                    '<a href="https://typo3.org/" data-type="url" wrong-attr="is-removed">TYPO3</a><br>' .
-                    '(the <script>alert(1)</script> tag shall be encoded to HTML entities)'.
-                '</div>',
-                '<div id="main">' .
-                    '<a href="https://typo3.org/" data-type="url">TYPO3</a><br>' .
-                    '(the &lt;script&gt;alert(1)&lt;/script&gt; tag shall be encoded to HTML entities)'.
-                '</div>',
-            ],
-            '#901' => [
-                '<div itemprop="tel" itemscope>' .
-                    '<span itemprop="value">+1-234-56789</span>' .
-                    '<meta itemprop="type" content="voice">' .
-                '</div>',
-                '<div itemprop="tel" itemscope>' .
-                    '<span itemprop="value">+1-234-56789</span>' .
-                    '<meta itemprop="type" content="voice">' .
-                '</div>'
-            ],
-            '#902' => [
-                '<div><meta http-equiv="refresh" content="1;https://evil.typo3.org/" name="referrer" charset="utf-8"></div>',
-                '<div></div>'
-            ],
-            '#903' => [
-                '<font class="font" color="#000000" face="Verdana,Arial" size="13">value</font>',
-                '<font class="font" color="#000000" face="Verdana,Arial" size="13">value</font>'
-            ],
-            '#904' => [
-                '<img src="cid:DC117C9322DEB502C3B16769A8A64E08@example.test">',
-                '<img src="cid:DC117C9322DEB502C3B16769A8A64E08@example.test">',
-            ],
-            '#905' => [
-                '<a href="mid:D89CD33E-F9CF-4CA0-BCE3-AC89E5D41DE1@example.test/DC117C9322DEB502C3B16769A8A64E08@example.test">see previous message</a>',
-                '<a href="mid:D89CD33E-F9CF-4CA0-BCE3-AC89E5D41DE1@example.test/DC117C9322DEB502C3B16769A8A64E08@example.test">see previous message</a>',
-            ],
-            '#906' => [
-                '<center>value</center><strike>value</strike><nobr>value</nobr>',
-                '<center>value</center><strike>value</strike><nobr>value</nobr>',
-            ],
-            '#907' => [
-                '<script>alert(1)</script>'
-                . '<script type="application/javascript">alert(2)</script>'
-                . '<script type="application/ecmascript">alert(3)</script>',
-                '&lt;script&gt;alert(1)&lt;/script&gt;'
-                . '&lt;script type="application/javascript"&gt;alert(2)&lt;/script&gt;'
-                . '&lt;script type="application/ecmascript"&gt;alert(3)&lt;/script&gt;'
-            ],
-            '#908' => [
-                '<a href="xmpp:user@example.org?message">value</a>',
-                '<a href="xmpp:user@example.org?message">value</a>',
-            ],
-            '#909' => [
-                '<!-- #comment -->',
-                '<!-- #comment -->',
-            ],
-            '#910' => [
-                '<!-- <"comment"> -->',
-                '<!-- &lt;&quot;comment&quot;&gt; -->',
-            ],
-            '#911' => [
-                '<!-- &lt;&quot;comment&quot;&gt; -->',
-                '<!-- &lt;&quot;comment&quot;&gt; -->',
-            ],
-            '#912' => [
-                '<!---><p>',
-                '<!---&gt;&lt;p&gt;-->',
-            ],
-            '#913' => [
-                '<!---!><p>',
-                '<!---!&gt;&lt;p&gt;-->',
-            ],
-            '#915' => [
-                '#text',
-                '#text',
-            ],
-            '#920' => [
-                '<![CDATA[ #cdata ]]>',
-                '#cdata',
-            ],
-            '#921' => [
-                '<![CDATA[<any><span data-value="value"></any>*/]]>',
-                '&lt;any&gt;&lt;span data-value="value"&gt;&lt;/any&gt;*/',
-            ],
-            '#930' => [
-                '<br><any>value</any></br>',
-                '<br>&lt;any&gt;value&lt;/any&gt;<br>',
-            ],
-            '#931' => [
-                '<hr><any>value</any></hr>',
-                '<hr>&lt;any&gt;value&lt;/any&gt;',
-            ],
-            '#932' => [
-                '<wbr><any>value</any></wbr>',
-                '<wbr>&lt;any&gt;value&lt;/any&gt;',
-            ],
-            '#933' => [
-                '<source><any>value</any></source>',
-                '<source>&lt;any&gt;value&lt;/any&gt;',
-            ],
-            '#934' => [
-                '<img src="/typo3.org/logo.svg"><any>value</any></img>',
-                '<img src="/typo3.org/logo.svg">&lt;any&gt;value&lt;/any&gt;',
-            ],
-            '#935' => [
-                '<p class="</p><script>alert(1)">value</p>',
-                '<p class="&lt;/p&gt;&lt;script&gt;alert(1)">value</p>',
-            ],
-            '#936' => [
-                '<p class="{&quot;json&quot;:true}">value</p>',
-                '<p class="{&quot;json&quot;:true}">value</p>',
-            ],
-            '#941' => [
-                '<?xml >s<img src=x onerror=alert(1)> ?>',
-                '&lt;?xml &gt;s&lt;img src=x onerror=alert(1)&gt; ?&gt;',
-            ],
+            '&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;' .
+                '&lt;unknown unknown="unknown"&gt;value&lt;/unknown&gt;'
+        ];
+        yield '#014' => [
+            '<unknown>value</unknown><unknown>value</unknown>' .
+                '<div unknown="unknown">value</div>' .
+                '<unknown>value</unknown><unknown>value</unknown>',
+            '&lt;unknown&gt;value&lt;/unknown&gt;&lt;unknown&gt;value&lt;/unknown&gt;' .
+                '<div>value</div>' .
+                '&lt;unknown&gt;value&lt;/unknown&gt;&lt;unknown&gt;value&lt;/unknown&gt;'
+        ];
+        yield '#015' => [
+            '<unknown unknown="unknown" class="nested"><div class="nested">value</div></unknown>',
+            // '&lt;unknown unknown="unknown" class="nested"&gt;<div class="nested">value</div>&lt;/unknown&gt;',
+            // @todo invalidating nested nodes due invalid parent node is currently expected - topic for discussion
+            '&lt;unknown unknown="unknown" class="nested"&gt;&lt;div class="nested"&gt;value&lt;/div&gt;&lt;/unknown&gt;',
+        ];
+        // @todo bug in https://github.com/Masterminds/html5-php/issues
+        // '#013' => [
+        //    '<strong>Given that x < y and y > z...</strong>',
+        //    '<strong>Given that x &lt; y and y &gt; z...</strong>',
+        // ],
+        yield '#020' => [
+            '<div unknown="unknown">value</div>',
+            '<div>value</div>',
+        ];
+        yield '#030' => [
+            '<div class="class">value</div>',
+            '<div class="class">value</div>',
+        ];
+        yield '#031' => [
+            '<div data-value="value">value</div>',
+            '<div data-value="value">value</div>',
+        ];
+        yield '#032' => [
+            '<div data-bool>value</div>',
+            '<div data-bool>value</div>',
+        ];
+        yield '#040' => [
+            '<img src="mailto:noreply@typo3.org" onerror="alert(1)">',
+            '',
+        ];
+        yield '#041' => [
+            '<img src="https://typo3.org/logo.svg" onerror="alert(1)">',
+            '<img src="https://typo3.org/logo.svg">',
+        ];
+        yield '#042' => [
+            '<img src="http://typo3.org/logo.svg" onerror="alert(1)">',
+            '<img src="http://typo3.org/logo.svg">',
+        ];
+        yield '#043' => [
+            '<img src="/typo3.org/logo.svg" onerror="alert(1)">',
+            '<img src="/typo3.org/logo.svg">',
+        ];
+        yield '#044' => [
+            '<img src="typo3.org/logo.svg" onerror="alert(1)">',
+            '<img src="typo3.org/logo.svg">',
+        ];
+        yield '#045' => [
+            '<img src="//typo3.org/logo.svg" onerror="alert(1)">',
+            '',
+        ];
+        yield '#046' => [
+            '<img src="/typo3.org/logo.svg" alt="logo" loading="lazy" fetchpriority="low" decoding="async" width="100" height="100" sizes="33.3vw" name="logo" align="left" border="0">',
+            '<img src="/typo3.org/logo.svg" alt="logo" loading="lazy" fetchpriority="low" decoding="async" width="100" height="100" sizes="33.3vw" name="logo" align="left" border="0">',
+        ];
+        yield '#047' => [
+            '<img src="data:text/html,<script>alert(1)</script>">',
+            '',
+        ];
+        yield '#048' => [
+            '<img src="data:image/png,..."><img src="data:image/png;,..."><img src="data:image/png;base64,..."><img src="data:image/svg+xml;base64,...">',
+            '<img src="data:image/png,..."><img src="data:image/png;,..."><img src="data:image/png;base64,..."><img src="data:image/svg+xml;base64,...">',
+        ];
+        yield '#049' => [
+            '<a href="git://github.com/typo3/typo3">GitHub</a>',
+            '<a href="git://github.com/typo3/typo3">GitHub</a>',
+        ];
+        yield '#050' => [
+            '<a href="https://typo3.org/" role="button">value</a>',
+            '<a href="https://typo3.org/" role="button">value</a>',
+        ];
+        yield '#051' => [
+            '<a href="ssh://example.org/" role="button">value</a>',
+            '<a role="button">value</a>',
+        ];
+        yield '#052' => [
+            '<a href="javascript:alert(1)" role="button">value</a>',
+            '<a role="button">value</a>',
+        ];
+        yield '#053' => [
+            '<a href="data:text/html;..." role="button">value</a>',
+            '<a role="button">value</a>',
+        ];
+        yield '#054' => [
+            '<a href="#anchor">anchor</a><a name="anchor">content</a>',
+            '<a href="#anchor">anchor</a><a name="anchor">content</a>',
+        ];
+        yield '#055' => [
+            '<a href="tel:123456789">anchor</a>',
+            '<a href="tel:123456789">anchor</a>',
+        ];
+        yield '#090' => [
+            '<p data-bool><span data-bool><strong data-bool>value</strong></span></p>',
+            '<p data-bool><span data-bool><strong data-bool>value</strong></span></p>'
+        ];
+        yield '#100' => [
+            '<table><caption>c</caption><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody><tfoot><tr><td>f</td></tr></tfoot></table>',
+            '<table><caption>c</caption><thead><tr><th>h</th></tr></thead><tbody><tr><td>b</td></tr></tbody><tfoot><tr><td>f</td></tr></tfoot></table>',
+        ];
+        yield '#101' => [
+            '<table align="left" border="2" cellpadding="2" cellspacing="2" class="table" summary="summary"></table>',
+            '<table align="left" border="2" cellpadding="2" cellspacing="2" class="table" summary="summary"></table>',
+        ];
+        yield '#102' => [
+            '<caption align="left">caption</caption>',
+            '<caption align="left">caption</caption>',
+        ];
+        yield '#104' => [
+            '<tr align="left" valign="top" bgcolor="#cc0000"><td>td</td></tr>',
+            '<tr align="left" valign="top" bgcolor="#cc0000"><td>td</td></tr>',
+        ];
+        yield '#105' => [
+            '<td abbr="abbr" align="left" valign="top" colspan="2" rowspan="2" bgcolor="#cc0000" axis="axis,axis" headers="head,head" scope="scope" width="100" height="100">value</td>',
+            '<td abbr="abbr" align="left" valign="top" colspan="2" rowspan="2" bgcolor="#cc0000" axis="axis,axis" headers="head,head" scope="scope" width="100" height="100">value</td>',
+        ];
+        yield '#106' => [
+            '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
+            '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
+        ];
+        yield '#107' => [
+            '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
+            '<thead align="left" valign="top" bgcolor="#cc0000"><td>td</td></thead>',
+        ];
+        yield '#108' => [
+            '<tfoot align="left" valign="top" bgcolor="#cc0000"><td>td</td></tfoot>',
+            '<tfoot align="left" valign="top" bgcolor="#cc0000"><td>td</td></tfoot>',
+        ];
+        yield '#109' => [
+            '<colgroup align="left" valign="top" bgcolor="#cc0000" span="1"><col><col span="2" align="left" valign="top" bgcolor="#cc0000" width="100"></colgroup>',
+            '<colgroup align="left" valign="top" bgcolor="#cc0000" span="1"><col><col span="2" align="left" valign="top" bgcolor="#cc0000" width="100"></colgroup>',
+        ];
+        yield '#120' => [
+            '<figure><img src="https://typo3.org/logo.svg" alt="logo"><figcaption>TYPO3 logo</figcaption></figure>',
+            '<figure><img src="https://typo3.org/logo.svg" alt="logo"><figcaption>TYPO3 logo</figcaption></figure>',
+        ];
+        yield '#121' => [
+            '<picture><source srcset="/logo-800.png" media="(min-width: 800px)" type="image/png" sizes="33.3vw"></picture>',
+            '<picture><source srcset="/logo-800.png" media="(min-width: 800px)" type="image/png" sizes="33.3vw"></picture>'
+        ];
+        yield '#122' => [
+            '<video controls src="/video.mp4"><track default kind="captions" srclang="en" src="/video.vtt"></video>',
+            '<video controls src="/video.mp4"><track default kind="captions" srclang="en" src="/video.vtt"></video>',
+        ];
+        yield '200' => [
+            '<ul><li>item</li><li>item</li></ul>',
+            '<ul><li>item</li><li>item</li></ul>',
+        ];
+        yield '201' => [
+            '<ol reversed start="3" type="I"><li>item</li><li value="13">item</li></ol>',
+            '<ol reversed start="3" type="I"><li>item</li><li value="13">item</li></ol>',
+        ];
+        yield '#900' => [
+            '<div id="main">' .
+                '<a href="https://typo3.org/" data-type="url" wrong-attr="is-removed">TYPO3</a><br>' .
+                '(the <script>alert(1)</script> tag shall be encoded to HTML entities)'.
+            '</div>',
+            '<div id="main">' .
+                '<a href="https://typo3.org/" data-type="url">TYPO3</a><br>' .
+                '(the &lt;script&gt;alert(1)&lt;/script&gt; tag shall be encoded to HTML entities)'.
+            '</div>',
+        ];
+        yield '#901' => [
+            '<div itemprop="tel" itemscope>' .
+                '<span itemprop="value">+1-234-56789</span>' .
+                '<meta itemprop="type" content="voice">' .
+            '</div>',
+            '<div itemprop="tel" itemscope>' .
+                '<span itemprop="value">+1-234-56789</span>' .
+                '<meta itemprop="type" content="voice">' .
+            '</div>'
+        ];
+        yield '#902' => [
+            '<div><meta http-equiv="refresh" content="1;https://evil.typo3.org/" name="referrer" charset="utf-8"></div>',
+            '<div></div>'
+        ];
+        yield '#903' => [
+            '<font class="font" color="#000000" face="Verdana,Arial" size="13">value</font>',
+            '<font class="font" color="#000000" face="Verdana,Arial" size="13">value</font>'
+        ];
+        yield '#904' => [
+            '<img src="cid:DC117C9322DEB502C3B16769A8A64E08@example.test">',
+            '<img src="cid:DC117C9322DEB502C3B16769A8A64E08@example.test">',
+        ];
+        yield '#905' => [
+            '<a href="mid:D89CD33E-F9CF-4CA0-BCE3-AC89E5D41DE1@example.test/DC117C9322DEB502C3B16769A8A64E08@example.test">see previous message</a>',
+            '<a href="mid:D89CD33E-F9CF-4CA0-BCE3-AC89E5D41DE1@example.test/DC117C9322DEB502C3B16769A8A64E08@example.test">see previous message</a>',
+        ];
+        yield '#906' => [
+            '<center>value</center><strike>value</strike><nobr>value</nobr>',
+            '<center>value</center><strike>value</strike><nobr>value</nobr>',
+        ];
+        yield '#907' => [
+            '<script>alert(1)</script>'
+            . '<script type="application/javascript">alert(2)</script>'
+            . '<script type="application/ecmascript">alert(3)</script>',
+            '&lt;script&gt;alert(1)&lt;/script&gt;'
+            . '&lt;script type="application/javascript"&gt;alert(2)&lt;/script&gt;'
+            . '&lt;script type="application/ecmascript"&gt;alert(3)&lt;/script&gt;'
+        ];
+        yield '#908' => [
+            '<a href="xmpp:user@example.org?message">value</a>',
+            '<a href="xmpp:user@example.org?message">value</a>',
+        ];
+        yield '#909' => [
+            '<!-- #comment -->',
+            '<!-- #comment -->',
+        ];
+        yield '#910' => [
+            '<!-- <"comment"> -->',
+            '<!-- &lt;&quot;comment&quot;&gt; -->',
+        ];
+        yield '#911' => [
+            '<!-- &lt;&quot;comment&quot;&gt; -->',
+            '<!-- &lt;&quot;comment&quot;&gt; -->',
+        ];
+        yield '#912' => [
+            '<!---><p>',
+            '<!---&gt;&lt;p&gt;-->',
+        ];
+        yield '#913' => [
+            '<!---!><p>',
+            '<!---!&gt;&lt;p&gt;-->',
+        ];
+        yield '#915' => [
+            '#text',
+            '#text',
+        ];
+        yield '#920' => [
+            '<![CDATA[ #cdata ]]>',
+            '#cdata',
+        ];
+        yield '#921' => [
+            '<![CDATA[<any><span data-value="value"></any>*/]]>',
+            '&lt;any&gt;&lt;span data-value="value"&gt;&lt;/any&gt;*/',
+        ];
+        yield '#930' => [
+            '<br><any>value</any></br>',
+            '<br>&lt;any&gt;value&lt;/any&gt;<br>',
+        ];
+        yield '#931' => [
+            '<hr><any>value</any></hr>',
+            '<hr>&lt;any&gt;value&lt;/any&gt;',
+        ];
+        yield '#932' => [
+            '<wbr><any>value</any></wbr>',
+            '<wbr>&lt;any&gt;value&lt;/any&gt;',
+        ];
+        yield '#933' => [
+            '<source><any>value</any></source>',
+            '<source>&lt;any&gt;value&lt;/any&gt;',
+        ];
+        yield '#934' => [
+            '<img src="/typo3.org/logo.svg"><any>value</any></img>',
+            '<img src="/typo3.org/logo.svg">&lt;any&gt;value&lt;/any&gt;',
+        ];
+        yield '#935' => [
+            '<p class="</p><script>alert(1)">value</p>',
+            '<p class="&lt;/p&gt;&lt;script&gt;alert(1)">value</p>',
+        ];
+        yield '#936' => [
+            '<p class="{&quot;json&quot;:true}">value</p>',
+            '<p class="{&quot;json&quot;:true}">value</p>',
+        ];
+        yield '#941' => [
+            '<?xml >s<img src=x onerror=alert(1)> ?>',
+            '&lt;?xml &gt;s&lt;img src=x onerror=alert(1)&gt; ?&gt;',
         ];
     }
 
diff --git a/tests/ScenarioTest.php b/tests/ScenarioTest.php
index 1f86b57..dee6047 100644
--- a/tests/ScenarioTest.php
+++ b/tests/ScenarioTest.php
@@ -26,13 +26,11 @@
 
 class ScenarioTest extends TestCase
 {
-    public static function allTagsAreRemovedOnMissingDeclarationDataProvider(): array
+    public static function allTagsAreRemovedOnMissingDeclarationDataProvider(): iterable
     {
-        return [
-            ['<div class="content">value</div><span class="content">value</span>', ''],
-            ['<!--any--><div class="content">value</div>', '<!--any-->'],
-            ['<!--any--!><div class="content">value</div>', '<!--any-->'],
-        ];
+        yield ['<div class="content">value</div><span class="content">value</span>', ''];
+        yield ['<!--any--><div class="content">value</div>', '<!--any-->'];
+        yield ['<!--any--!><div class="content">value</div>', '<!--any-->'];
     }
 
     /**
@@ -49,56 +47,54 @@ public function allTagsAreRemovedOnMissingDeclaration(string $payload, string $e
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
-    public static function tagFlagsAreProcessedDataProvider(): array
+    public static function tagFlagsAreProcessedDataProvider(): iterable
     {
-        return [
-            [
-                Behavior\Tag::ALLOW_CHILDREN | Behavior\Tag::PURGE_WITHOUT_CHILDREN,
-                implode("\n", [
-                    '<div></div><div data-test="test"></div>',
-                    '<div>test</div><div data-test="test">test</div>',
-                    '<div><!-- --></div><div data-test="test"><!-- --></div>',
-                    '<div><!-- test --></div><div data-test="test"><!-- test --></div>',
-                    '<div><i></i></div><div data-test="test"><i></i></div>',
-                ]),
-                implode("\n", [
-                    '',
-                    '<div>test</div><div data-test="test">test</div>',
-                    '<div><!-- --></div><div data-test="test"><!-- --></div>',
-                    '<div><!-- test --></div><div data-test="test"><!-- test --></div>',
-                    '<div><i></i></div><div data-test="test"><i></i></div>',
-                ]),
-            ],
-            [
-                Behavior\Tag::ALLOW_CHILDREN | Behavior\Tag::PURGE_WITHOUT_CHILDREN,
-                implode("\n", [
-                    '<script></script><script data-test="test"></script>',
-                    '<script>test</script><script data-test="test">test</script>',
-                    '<script><!-- --></script><script data-test="test"><!-- --></script>',
-                    '<script><!-- test --></script><script data-test="test"><!-- test --></script>',
-                ]),
-                implode("\n", [
-                    '',
-                    '<script>test</script><script data-test="test">test</script>',
-                    '<script>&lt;!-- --&gt;</script><script data-test="test">&lt;!-- --&gt;</script>',
-                    '<script>&lt;!-- test --&gt;</script><script data-test="test">&lt;!-- test --&gt;</script>',
-                ]),
-            ],
-            [
-                Behavior\Tag::ALLOW_CHILDREN | Behavior\Tag::PURGE_WITHOUT_CHILDREN | Behavior\Tag::ALLOW_INSECURE_RAW_TEXT,
-                implode("\n", [
-                    '<script></script><script data-test="test"></script>',
-                    '<script>test</script><script data-test="test">test</script>',
-                    '<script><!-- --></script><script data-test="test"><!-- --></script>',
-                    '<script><!-- test --></script><script data-test="test"><!-- test --></script>',
-                ]),
-                implode("\n", [
-                    '',
-                    '<script>test</script><script data-test="test">test</script>',
-                    '<script><!-- --></script><script data-test="test"><!-- --></script>',
-                    '<script><!-- test --></script><script data-test="test"><!-- test --></script>',
-                ]),
-            ],
+        yield [
+            Behavior\Tag::ALLOW_CHILDREN | Behavior\Tag::PURGE_WITHOUT_CHILDREN,
+            implode("\n", [
+                '<div></div><div data-test="test"></div>',
+                '<div>test</div><div data-test="test">test</div>',
+                '<div><!-- --></div><div data-test="test"><!-- --></div>',
+                '<div><!-- test --></div><div data-test="test"><!-- test --></div>',
+                '<div><i></i></div><div data-test="test"><i></i></div>',
+            ]),
+            implode("\n", [
+                '',
+                '<div>test</div><div data-test="test">test</div>',
+                '<div><!-- --></div><div data-test="test"><!-- --></div>',
+                '<div><!-- test --></div><div data-test="test"><!-- test --></div>',
+                '<div><i></i></div><div data-test="test"><i></i></div>',
+            ]),
+        ];
+        yield [
+            Behavior\Tag::ALLOW_CHILDREN | Behavior\Tag::PURGE_WITHOUT_CHILDREN,
+            implode("\n", [
+                '<script></script><script data-test="test"></script>',
+                '<script>test</script><script data-test="test">test</script>',
+                '<script><!-- --></script><script data-test="test"><!-- --></script>',
+                '<script><!-- test --></script><script data-test="test"><!-- test --></script>',
+            ]),
+            implode("\n", [
+                '',
+                '<script>test</script><script data-test="test">test</script>',
+                '<script>&lt;!-- --&gt;</script><script data-test="test">&lt;!-- --&gt;</script>',
+                '<script>&lt;!-- test --&gt;</script><script data-test="test">&lt;!-- test --&gt;</script>',
+            ]),
+        ];
+        yield [
+            Behavior\Tag::ALLOW_CHILDREN | Behavior\Tag::PURGE_WITHOUT_CHILDREN | Behavior\Tag::ALLOW_INSECURE_RAW_TEXT,
+            implode("\n", [
+                '<script></script><script data-test="test"></script>',
+                '<script>test</script><script data-test="test">test</script>',
+                '<script><!-- --></script><script data-test="test"><!-- --></script>',
+                '<script><!-- test --></script><script data-test="test"><!-- test --></script>',
+            ]),
+            implode("\n", [
+                '',
+                '<script>test</script><script data-test="test">test</script>',
+                '<script><!-- --></script><script data-test="test"><!-- --></script>',
+                '<script><!-- test --></script><script data-test="test"><!-- test --></script>',
+            ]),
         ];
     }
 
@@ -109,7 +105,7 @@ public static function tagFlagsAreProcessedDataProvider(): array
     public function tagFlagsAreProcessed(int $flags, string $payload, string $expectation): void
     {
         $behavior = (new Behavior())
-            ->withFlags(Behavior::ENCODE_INVALID_TAG | Behavior::REMOVE_UNEXPECTED_CHILDREN)
+            ->withFlags(Behavior::REMOVE_UNEXPECTED_CHILDREN)
             ->withName('scenario-test')
             ->withTags(
                 (new Behavior\Tag('i')), // just used as DOM child element
@@ -124,7 +120,7 @@ public function tagFlagsAreProcessed(int $flags, string $payload, string $expect
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
-    public static function tagIsHandledDataProcessor(): array
+    public static function tagIsHandledDataProcessor(): iterable
     {
         $node = new Behavior\Tag('div');
         $asTextHandler = new Behavior\Handler\AsTextHandler();
@@ -137,59 +133,57 @@ static function (NodeInterface $node, ?DOMNode $domNode): ?\DOMNode {
             }
         );
 
-        return [
-            [
-                new Behavior\NodeHandler(
-                    $node,
-                    $asTextHandler
-                ),
-                '<div invalid-attr="value"><i>unexpected</i></div>',
-                '&lt;div invalid-attr="value"&gt;&lt;i&gt;unexpected&lt;/i&gt;&lt;/div&gt;',
-            ],
-            [
-                new Behavior\NodeHandler(
-                    $node,
-                    $asTextHandler,
-                    Behavior\NodeHandler::PROCESS_DEFAULTS
-                ),
-                '<div invalid-attr="value"><i>unexpected</i></div>',
-                '&lt;div&gt;&lt;/div&gt;',
-            ],
-            [
-                new Behavior\NodeHandler(
-                    $node,
-                    $asTextHandler,
-                    Behavior\NodeHandler::PROCESS_DEFAULTS | Behavior\NodeHandler::HANDLE_FIRST
-                ),
-                '<div invalid-attr="value"><i>unexpected</i></div>',
-                '&lt;div invalid-attr="value"&gt;&lt;i&gt;unexpected&lt;/i&gt;&lt;/div&gt;',
-            ],
-            [
-                new Behavior\NodeHandler(
-                    $node,
-                    $closureHandler
-                ),
-                '<div invalid-attr="value"><i>unexpected</i></div>',
-                'Handled &lt;div&gt;',
-            ],
-            [
-                new Behavior\NodeHandler(
-                    $node,
-                    $closureHandler,
-                    Behavior\NodeHandler::PROCESS_DEFAULTS
-                ),
-                '<div invalid-attr="value"><i>unexpected</i></div>',
-                'Handled &lt;div&gt;',
-            ],
-            [
-                new Behavior\NodeHandler(
-                    $node,
-                    $closureHandler,
-                    Behavior\NodeHandler::PROCESS_DEFAULTS | Behavior\NodeHandler::HANDLE_FIRST
-                ),
-                '<div invalid-attr="value"><i>unexpected</i></div>',
-                'Handled &lt;div&gt;',
-            ],
+        yield [
+            new Behavior\NodeHandler(
+                $node,
+                $asTextHandler
+            ),
+            '<div invalid-attr="value"><i>unexpected</i></div>',
+            '&lt;div invalid-attr="value"&gt;&lt;i&gt;unexpected&lt;/i&gt;&lt;/div&gt;',
+        ];
+        yield [
+            new Behavior\NodeHandler(
+                $node,
+                $asTextHandler,
+                Behavior\NodeHandler::PROCESS_DEFAULTS
+            ),
+            '<div invalid-attr="value"><i>unexpected</i></div>',
+            '&lt;div&gt;&lt;/div&gt;',
+        ];
+        yield [
+            new Behavior\NodeHandler(
+                $node,
+                $asTextHandler,
+                Behavior\NodeHandler::PROCESS_DEFAULTS | Behavior\NodeHandler::HANDLE_FIRST
+            ),
+            '<div invalid-attr="value"><i>unexpected</i></div>',
+            '&lt;div invalid-attr="value"&gt;&lt;i&gt;unexpected&lt;/i&gt;&lt;/div&gt;',
+        ];
+        yield [
+            new Behavior\NodeHandler(
+                $node,
+                $closureHandler
+            ),
+            '<div invalid-attr="value"><i>unexpected</i></div>',
+            'Handled &lt;div&gt;',
+        ];
+        yield [
+            new Behavior\NodeHandler(
+                $node,
+                $closureHandler,
+                Behavior\NodeHandler::PROCESS_DEFAULTS
+            ),
+            '<div invalid-attr="value"><i>unexpected</i></div>',
+            'Handled &lt;div&gt;',
+        ];
+        yield [
+            new Behavior\NodeHandler(
+                $node,
+                $closureHandler,
+                Behavior\NodeHandler::PROCESS_DEFAULTS | Behavior\NodeHandler::HANDLE_FIRST
+            ),
+            '<div invalid-attr="value"><i>unexpected</i></div>',
+            'Handled &lt;div&gt;',
         ];
     }
 
@@ -246,51 +240,49 @@ static function (NodeInterface $node, ?DOMNode $domNode): ?\DOMNode {
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
-    public static function commentsAreHandledDataProvider(): array
+    public static function commentsAreHandledDataProvider(): iterable
     {
-        return [
-            'not allowed' => [
-                false,
-                null,
-                Behavior::BLUNT,
-                '<div><!-- before -->test<!-- after --></div>',
-                '<div>test</div>'
-            ],
-            'allowed, insecure' => [
-                true,
-                false,
-                Behavior::BLUNT,
-                '<div><!-- before -->test<!-- after --></div>',
-                '<div><!-- before -->test<!-- after --></div>'
-            ],
-            'allowed, secure' => [
-                true,
-                true,
-                Behavior::BLUNT,
-                '<div><!-- before -->test<!-- after --></div>',
-                '<div><!-- before -->test<!-- after --></div>'
-            ],
-            'not allowed, encode invalid' => [
-                false,
-                null,
-                Behavior::ENCODE_INVALID_COMMENT,
-                '<div><!-- before -->test<!-- after --></div>',
-                '<div>&lt;!-- before --&gt;test&lt;!-- after --&gt;</div>',
-            ],
-            'allowed, insecure, encode invalid' => [
-                true,
-                false,
-                Behavior::ENCODE_INVALID_COMMENT,
-                '<div><!-- before -->test<!-- after --></div>',
-                '<div><!-- before -->test<!-- after --></div>'
-            ],
-            'allowed, secure, encode invalid' => [
-                true,
-                true,
-                Behavior::ENCODE_INVALID_COMMENT,
-                '<div><!-- before -->test<!-- after --></div>',
-                '<div><!-- before -->test<!-- after --></div>'
-            ],
+        yield 'not allowed' => [
+            false,
+            null,
+            Behavior::BLUNT,
+            '<div><!-- before -->test<!-- after --></div>',
+            '<div>test</div>'
+        ];
+        yield 'allowed, insecure' => [
+            true,
+            false,
+            Behavior::BLUNT,
+            '<div><!-- before -->test<!-- after --></div>',
+            '<div><!-- before -->test<!-- after --></div>'
+        ];
+        yield 'allowed, secure' => [
+            true,
+            true,
+            Behavior::BLUNT,
+            '<div><!-- before -->test<!-- after --></div>',
+            '<div><!-- before -->test<!-- after --></div>'
+        ];
+        yield 'not allowed, encode invalid' => [
+            false,
+            null,
+            Behavior::ENCODE_INVALID_COMMENT,
+            '<div><!-- before -->test<!-- after --></div>',
+            '<div>&lt;!-- before --&gt;test&lt;!-- after --&gt;</div>',
+        ];
+        yield 'allowed, insecure, encode invalid' => [
+            true,
+            false,
+            Behavior::ENCODE_INVALID_COMMENT,
+            '<div><!-- before -->test<!-- after --></div>',
+            '<div><!-- before -->test<!-- after --></div>'
+        ];
+        yield 'allowed, secure, encode invalid' => [
+            true,
+            true,
+            Behavior::ENCODE_INVALID_COMMENT,
+            '<div><!-- before -->test<!-- after --></div>',
+            '<div><!-- before -->test<!-- after --></div>'
         ];
     }
 
@@ -313,51 +305,49 @@ public function commentsAreHandled(bool $allowed, ?bool $secure, int $flags, str
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
-    public static function cdataSectionsAreHandledDataProvider(): array
+    public static function cdataSectionsAreHandledDataProvider(): iterable
     {
-        return [
-            'not allowed' => [
-                false,
-                null,
-                Behavior::BLUNT,
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
-                '<div>.test.</div>'
-            ],
-            'allowed, insecure' => [
-                true,
-                false,
-                Behavior::BLUNT,
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>'
-            ],
-            'allowed, secure' => [
-                true,
-                true,
-                Behavior::BLUNT,
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
-                '<div>before.test.after</div>'
-            ],
-            'not allowed, encode invalid' => [
-                false,
-                null,
-                Behavior::ENCODE_INVALID_CDATA_SECTION,
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
-                '<div>&lt;![CDATA[ before ]]&gt;.test.&lt;![CDATA[ after ]]&gt;</div>',
-            ],
-            'allowed, insecure, encode invalid' => [
-                true,
-                false,
-                Behavior::ENCODE_INVALID_CDATA_SECTION,
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>'
-            ],
-            'allowed, secure, encode invalid' => [
-                true,
-                true,
-                Behavior::ENCODE_INVALID_CDATA_SECTION,
-                '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
-                '<div>before.test.after</div>'
-            ],
+        yield 'not allowed' => [
+            false,
+            null,
+            Behavior::BLUNT,
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
+            '<div>.test.</div>'
+        ];
+        yield 'allowed, insecure' => [
+            true,
+            false,
+            Behavior::BLUNT,
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>'
+        ];
+        yield 'allowed, secure' => [
+            true,
+            true,
+            Behavior::BLUNT,
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
+            '<div>before.test.after</div>'
+        ];
+        yield 'not allowed, encode invalid' => [
+            false,
+            null,
+            Behavior::ENCODE_INVALID_CDATA_SECTION,
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
+            '<div>&lt;![CDATA[ before ]]&gt;.test.&lt;![CDATA[ after ]]&gt;</div>',
+        ];
+        yield 'allowed, insecure, encode invalid' => [
+            true,
+            false,
+            Behavior::ENCODE_INVALID_CDATA_SECTION,
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>'
+        ];
+        yield 'allowed, secure, encode invalid' => [
+            true,
+            true,
+            Behavior::ENCODE_INVALID_CDATA_SECTION,
+            '<div><![CDATA[ before ]]>.test.<![CDATA[ after ]]></div>',
+            '<div>before.test.after</div>'
         ];
     }
 
@@ -380,7 +370,7 @@ public function cdataSectionsAreHandled(bool $allowed, ?bool $secure, int $flags
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
-    public static function rawTextElementsAreHandledDataProvider(): \Generator
+    public static function rawTextElementsAreHandledDataProvider(): iterable
     {
         foreach (Elements::$html5 as $name => $flags) {
             if (($flags & Elements::TEXT_RAW) !== Elements::TEXT_RAW) {
@@ -539,7 +529,7 @@ public function iframeSandboxIsAllowed(): void
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
-    public static function attributesAreEncodedDataProvider(): \Generator
+    public static function attributesAreEncodedDataProvider(): iterable
     {
         yield 'preserve entities' => [
 	        '<a title="Insert &amp;"></a>',
@@ -605,7 +595,7 @@ public static function attributesAreEncodedDataProvider(): \Generator
     public function attributesAreEncoded(string $payload, string $expectation): void
     {
         $behavior = (new Behavior())
-            ->withFlags(Behavior::ENCODE_INVALID_TAG | Behavior::REMOVE_UNEXPECTED_CHILDREN)
+            ->withFlags(Behavior::REMOVE_UNEXPECTED_CHILDREN)
             ->withName('scenario-test')
             ->withTags(
                 (new Behavior\Tag('a', Behavior\Tag::ALLOW_CHILDREN))->addAttrs(
@@ -624,7 +614,7 @@ public function attributesAreEncoded(string $payload, string $expectation): void
         self::assertSame($expectation, $sanitizer->sanitize($payload));
     }
 
-    public static function specialTagsAreHandledDataProvider(): \Generator
+    public static function specialTagsAreHandledDataProvider(): iterable
     {
         yield 'noscript attribute' => [
             '<noscript><p id="</noscript><script>alert(1)</script>"></p>',
@@ -655,7 +645,7 @@ public static function specialTagsAreHandledDataProvider(): \Generator
     public function specialTagsAreHandled(string $payload, string $expectation): void
     {
         $behavior = (new Behavior())
-            ->withFlags(Behavior::ENCODE_INVALID_TAG | Behavior::REMOVE_UNEXPECTED_CHILDREN)
+            ->withFlags(Behavior::REMOVE_UNEXPECTED_CHILDREN)
             ->withName('scenario-test')
             ->withTags(
                 (new Behavior\Tag('style', Behavior\Tag::ALLOW_CHILDREN)),