Merge pull request #13 from clue-labs/markup

clue · clue · commit 904a293e987c · 2015-04-10T10:27:26.000+02:00
Skip incomplete forms in nav header
diff --git a/src/Io/Loader.php b/src/Io/Loader.php
@@ -33,11 +33,11 @@ public function loadXmlString($html)
         // - help link in footer not terminated
         // - selected branch/tag in CVS "sticky tag" dropdown has not attribute value
         // - self closing elements with no trailing slash
-        // - excessive form close tags
+        // - remove navheader because of its often incomplete form tags
         $html = str_replace('Help</strong></td>', 'Help</a></strong></td>', $html);
         $html = str_replace('selected>', 'selected="selected">', $html);
         $html = preg_replace('#<((?:input|br|hr|img)[^\/\>]*)>#', '<$1 />', $html);
-        $html = preg_replace('#(</table>\s*)</form>\s*(</div>)#', '$1$2', $html);
+        $html = preg_replace('#\<div class\=\"vc_navheader\"\>.*?\<\/div\>#s','', $html);
 
         // replace named HTML entities with their UTF-8 value
         $html = str_replace(array_values($this->entities), array_keys($this->entities), $html);
diff --git a/tests/Io/LoaderTest.php b/tests/Io/LoaderTest.php
@@ -69,4 +69,13 @@ public function testLoadInvalidMarkupSelectedAttributeNoValue()
 
         $this->assertEquals('selected', (string)$xml['selected']);
     }
+
+    public function testLoadRemovedNavHeader()
+    {
+        $str = '<body><div class="vc_navheader"> invalid <asd> </okay> </div> </body>';
+        $xml = $this->loader->loadXmlString($str);
+
+        $this->assertFalse(isset($xml->div));
+        $this->assertEquals(0, count($xml));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,13 @@ public function testLoadInvalidMarkupSelectedAttributeNoValue()`
`69`	`69`
`70`	`70`	`$this->assertEquals('selected', (string)$xml['selected']);`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ public function testLoadRemovedNavHeader()`
	`74`	`+ {`
	`75`	`+ $str = '<body><div class="vc_navheader"> invalid <asd> </okay> </div> </body>';`
	`76`	`+ $xml = $this->loader->loadXmlString($str);`
	`77`	`+`
	`78`	`+ $this->assertFalse(isset($xml->div));`
	`79`	`+ $this->assertEquals(0, count($xml));`
	`80`	`+ }`
`72`	`81`	`}`