don't close optgroup when followed by an option

Valentin Kunz · goetas · commit 9b0419a214d6 · 2016-09-22T12:37:05.000+02:00
Make sure options are children of optgroup, not the parent select.

Otherwise we end up with a bunch of empty optgroups.
diff --git a/src/HTML5/Parser/TreeBuildingRules.php b/src/HTML5/Parser/TreeBuildingRules.php
@@ -76,7 +76,6 @@ public function evaluate($new, $current)
             case 'option':
                 return $this->closeIfCurrentMatches($new, $current, array(
                     'option',
-                    'optgroup'
                 ));
             case 'tr':
                 return $this->closeIfCurrentMatches($new, $current, array(
diff --git a/test/HTML5/Parser/DOMTreeBuilderTest.php b/test/HTML5/Parser/DOMTreeBuilderTest.php
@@ -540,4 +540,33 @@ public function testInstructionProcessor()
         $this->assertEquals('div', $div->tagName);
         $this->assertEquals('foo', $div->textContent);
     }
+
+    public function testSelectGroupedOptions()
+    {
+        $html = <<<EOM
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>testSelectGroupedOptions</title>
+    </head>
+    <body>
+        <select>
+            <optgroup id="first" label="first">
+                <option value="foo">foo</option>
+                <option value="bar">bar</option>
+                <option value="baz">baz</option>
+            </optgroup>
+            <optgroup id="second" label="first">
+                <option value="lorem">lorem</option>
+                <option value="ipsum">ipsum</option>
+            </optgroup>
+         </select>
+    </body>
+</html>
+EOM;
+        $dom  = $this->parse($html);
+
+        $this->assertSame(3, $dom->getElementById('first')->getElementsByTagName('option')->length);
+        $this->assertSame(2, $dom->getElementById('second')->getElementsByTagName('option')->length);
+    }
 }
diff --git a/test/HTML5/Parser/TreeBuildingRulesTest.php b/test/HTML5/Parser/TreeBuildingRulesTest.php
@@ -90,6 +90,19 @@ public function testHandleDT()
         $this->assertEquals('dd', $list->lastChild->tagName);
     }
 
+    public function testHandleOption()
+    {
+        $html = sprintf(self::HTML_STUB, '<optgroup id="foo" label="foo" ><option value="foo" >bar</option></optgroup>');
+        $doc = $this->parse($html);
+
+        $list = $doc->getElementById('foo');
+
+        $this->assertEquals(1, $list->childNodes->length);
+        foreach ($list->childNodes as $ele) {
+            $this->assertEquals('option', $ele->tagName);
+        }
+    }
+
     public function testTable()
     {
         $html = sprintf(self::HTML_STUB, '<table><thead id="a"><th>foo<td>bar<td>baz');
