Merge 9a68d30 into 89e15f7

wmde · Jul 5, 2017 · 2d2e04f · 2d2e04f
2 parents 89e15f7 + 9a68d30
commit 2d2e04f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/phpcs.xml b/phpcs.xml
diff --git a/src/HtmlMatcher.php b/src/HtmlMatcher.php
@@ -14,8 +14,6 @@ class HtmlMatcher extends DiagnosingMatcher
      */
     const XML_UNKNOWN_TAG_ERROR_CODE = 801;
 
-    const SCRIPT_BODY_REPLACEMENT = 'Contents were removed by HtmlMatcher';
-
     /**
      * @var Matcher
      */
@@ -49,7 +47,7 @@ protected function matchesWithDiagnosticDescription($html, Description $mismatch
         $internalErrors = libxml_use_internal_errors(true);
         $document = new \DOMDocument();
 
-        $html = $this->stripScriptsContents($html);
+        $html = $this->escapeScriptTagContents($html);
 
         if (!@$document->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'))) {
             $mismatchDescription->appendText('there was some parsing error');
@@ -96,16 +94,14 @@ private function isUnknownTagError(\LibXMLError $error)
 
     /**
      * @param string $html
-     * @return string
+     *
+     * @return string HTML
      */
-    private function stripScriptsContents($html)
+    private function escapeScriptTagContents($html)
     {
-        preg_match_all("#(<script.*>).*</script>#sU", $html, $scripts);
-        foreach ($scripts[0] as $index => $script) {
-            $openTag = $scripts[1][$index];
-            $replacement = $openTag . self::SCRIPT_BODY_REPLACEMENT . '</script>';
-            $html = str_replace($script, $replacement, $html);
-        }
-        return $html;
+        return preg_replace_callback('#(<script.*>)(.*)(</script>)#isU', function ($matches)
+        {
+            return $matches[1] . str_replace('</', '<\/', $matches[2]) . $matches[3];
+        }, $html);
     }
 }
diff --git a/tests/HtmlMatcherTest.php b/tests/HtmlMatcherTest.php
@@ -85,7 +85,7 @@ public function addsSpecificTextInsideTheSciptTagsInsteadOfItsContents()
 
         assertThat($html, is(htmlPiece(havingChild(
             both(withTagName('script'))
-                ->andAlso(havingTextContents(HtmlMatcher::SCRIPT_BODY_REPLACEMENT))))));
+                ->andAlso(havingTextContents("\n\t<span><\\/span>\n"))))));
     }
 
     /**