Merge pull request #550 from osapon/master

Improved charset tag recognition accuracy.

Author: oscarotero

src/Document.php

@@ -28,14 +28,31 @@ public function __construct(Extractor $extractor)
 
         $encoding = null;
         $contentType = $extractor->getResponse()->getHeaderLine('content-type');
-        preg_match('/charset="?(.*?)(?=$|\s|;|")/i', $contentType, $match);
+        preg_match('/charset=(?:"|\')?(.*?)(?=$|\s|;|"|\'|>)/i', $contentType, $match);
         if (!empty($match[1])) {
             $encoding = trim($match[1], ',');
-        } elseif (!empty($html)) {
-            preg_match('/charset="?(.*?)(?=$|\s|;|")/i', $html, $match);
+            try {
+                $ret = mb_encoding_aliases($encoding);
+                if ($ret === false) {
+                    $encoding = null;
+                }
+            } catch (\ValueError $exception) {
+                $encoding = null;
+            }
+        }
+        if (is_null($encoding) && !empty($html)) {
+            preg_match('/charset=(?:"|\')?(.*?)(?=$|\s|;|"|\'|>)/i', $html, $match);
             if (!empty($match[1])) {
                 $encoding = trim($match[1], ',');
             }
+            try {
+                $ret = mb_encoding_aliases($encoding);
+                if ($ret === false) {
+                    $encoding = null;
+                }
+            } catch (\ValueError $exception) {
+                $encoding = null;
+            }
         }
         $this->document = !empty($html) ? Parser::parse($html, $encoding) : new DOMDocument();
         $this->initXPath();