Solved issue paquettg#2

When you attempt to load an html page from a URL using loadFromUrl the encoding is incorrect.

Author: paquettg

src/PHPHtmlParser/Dom.php

@@ -57,6 +57,12 @@ class Dom {
 	 */
 	protected $size;
 
+	public function __construct()
+	{
+		self::$expectedCharset = 'UTF-8';
+		self::$charset = 'UTF-8';
+	}
+
 	/**
 	 * Returns the inner html of the root node.
 	 *

src/PHPHtmlParser/Dom/Tag.php

@@ -98,15 +98,6 @@ public function noise($noise)
 	 */
 	public function setAttribute($key, $value)
 	{
-		if (is_string($value['value']))
-		{
-			// convert charset
-			$encode = new Encode;
-			$encode->from(Dom::$expectedCharset);
-			$encode->to(Dom::$charset);
-			$value['value'] = $encode->convert($value['value']);
-		}
-
 		$this->attr[$key] = $value;
 		return $this;
 	}
@@ -134,7 +125,12 @@ public function setAttributes(array $attr)
 	 */
 	public function getAttributes()
 	{
-		return $this->attr;
+		$return = [];
+		foreach ($this->attr as $attr => $info)
+		{
+			$return[$attr] = $this->getAttribute($attr);
+		}
+		return $return;
 	}
 
 	/**
@@ -149,6 +145,16 @@ public function getAttribute($key)
 		{
 			return null;
 		}
+		$value = $this->attr[$key]['value'];
+		if (is_string($value))
+		{
+			// convert charset
+			$encode = new Encode;
+			$encode->from(Dom::$expectedCharset);
+			$encode->to(Dom::$charset);
+			$this->attr[$key]['value'] = $encode->convert($value);
+		}
+
 		return $this->attr[$key];
 	}
 
@@ -164,7 +170,8 @@ public function makeOpeningTag()
 		// add the attributes
 		foreach ($this->attr as $key => $info)
 		{
-			$val = $info['value'];
+			$info = $this->getAttribute($key);
+			$val  = $info['value'];
 			if (is_null($val))
 			{
 				$return .= ' '.$key;

src/PHPHtmlParser/Dom/TextNode.php

@@ -30,12 +30,6 @@ public function __construct($text)
 		// remove double spaces
 		$text = preg_replace('/\s+/', ' ', $text);
 
-		// convert charset
-		$encode = new Encode;
-		$encode->from(Dom::$expectedCharset);
-		$encode->to(Dom::$charset);
-		$text = $encode->convert($text);
-
 		$this->text = $text;
 		$this->tag  = new Tag('text');
 		parent::__construct();
@@ -48,7 +42,13 @@ public function __construct($text)
 	 */
 	public function text()
 	{
-		return $this->text;
+		// convert charset
+		$encode = new Encode;
+		$encode->from(Dom::$expectedCharset);
+		$encode->to(Dom::$charset);
+		$text = $encode->convert($this->text);
+
+		return $text;
 	}
 
 }