Merge pull request #265 from CristianoErardt/improve-encoding-detection

oscarotero · web-flow · commit 18ea6ad7e609 · 2018-03-21T21:59:04.000+01:00
add detect ISO-8859-1 and convert to UTF-8
diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -62,8 +62,15 @@ public function getHtmlContent()
 
                 $this->htmlContent = new DOMDocument();
 
-                if (mb_detect_encoding($content) === 'UTF-8') {
+                if (mb_detect_encoding($content, 'UTF-8', true) === 'UTF-8') {
                     $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+                    $content = preg_replace(
+                        '/<head[^>]*>/',
+                        '<head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">',
+                        $content
+                    );
+                } elseif (mb_detect_encoding($content, 'ISO-8859-1', true) === 'ISO-8859-1') {
+                    $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'ISO-8859-1');
                     $content = preg_replace('/<head[^>]*>/', '<head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">', $content);
                 }
 
