Merge branch 'release/v1.03.1'

mekras · May 13, 2015 · cd59137 · cd59137
2 parents 879825f + db41526
commit cd59137
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.03
+1.03.1
diff --git a/src/Source/Filter/HtmlFilter.php b/src/Source/Filter/HtmlFilter.php
@@ -35,6 +35,8 @@ public function filter($string)
     {
         $result = '';
 
+        $string = $this->filterEntities($string);
+
         // Current/last tag name
         $tagName = null;
         // Current/last attribute name
@@ -116,7 +118,7 @@ public function filter($string)
                         case 'tag_attrs':
                             $context = 'attr_name';
                             $attrName = null;
-                            // no break needed
+                        // no break needed
                         case 'attr_name':
                             $attrName .= $ch;
                             $ch = ' ';
@@ -132,4 +134,22 @@ public function filter($string)
 
         return $result;
     }
+
+    /**
+     * Replace HTML entities
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    private function filterEntities($string)
+    {
+        return preg_replace_callback(
+            '/&\w+;/',
+            function ($match) {
+                return str_repeat(' ', strlen($match[0]));
+            },
+            $string
+        );
+    }
 }
diff --git a/tests/Source/Filter/HtmlFilterTest.php b/tests/Source/Filter/HtmlFilterTest.php
@@ -24,8 +24,8 @@ class HtmlFilterTest extends TestCase
     public function testBasics()
     {
         $filter = new HtmlFilter();
-        $html = "<br>foo <a\nhref = '#' title='bar'>\nbaz</a>";
-        $text = "    foo   \n                  bar  \nbaz    ";
+        $html = "<br>foo&reg; <a\nhref = '#' title='bar'>\nbaz</a>";
+        $text = "    foo        \n                  bar  \nbaz    ";
         static::assertEquals($text, $filter->filter($html));
     }
 }