Upgrade string encoder

README.md

@@ -1,3 +1,7 @@
+# This fork
+
+The original repo is not maintained anymore. This fork is intended to keep codebase up-to-date with current PHP versions.
+
 PHP Html Parser
 ==========================
 

composer.json

@@ -17,7 +17,7 @@
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "ext-curl": "*",
-        "paquettg/string-encode": "~1.0.0",
+        "paquettg/string-encode": "^2.1",
         "php-http/httplug": "^2.1",
         "guzzlehttp/guzzle": "^7.0",
         "guzzlehttp/psr7": "^1.6",
@@ -31,7 +31,7 @@
         "friendsofphp/php-cs-fixer": "^2.16"
     },
     "autoload": {
-        "psr-4": { 
+        "psr-4": {
         	"PHPHtmlParser\\": "src/PHPHtmlParser"
        	}
     }

src/PHPHtmlParser/DTO/Tag/AttributeDTO.php

@@ -4,8 +4,9 @@
 
 namespace PHPHtmlParser\DTO\Tag;
 
-use stringEncode\Encode;
-use stringEncode\Exception;
+use StringEncoder\Contracts\EncoderInterface;
+use StringEncoder\Exceptions\InvalidEncodingException;
+
 
 final class AttributeDTO
 {
@@ -51,10 +52,10 @@ public function htmlspecialcharsDecode(): void
     }
 
     /**
-     * @throws Exception
+     * @throws InvalidEncodingException
      */
-    public function encodeValue(Encode $encode)
+    public function encodeValue(EncoderInterface $encode)
     {
-        $this->value = $encode->convert($this->value);
+        $this->value = $encode->convert()->fromString($this->value)->toString();
     }
 }

src/PHPHtmlParser/Dom/Node/AbstractNode.php

@@ -12,7 +12,8 @@
 use PHPHtmlParser\Exceptions\Tag\AttributeNotFoundException;
 use PHPHtmlParser\Finder;
 use PHPHtmlParser\Selector\Selector;
-use stringEncode\Encode;
+use StringEncoder\Contracts\EncoderInterface;
+
 
 /**
  * Dom node object.
@@ -57,7 +58,7 @@ abstract class AbstractNode
     /**
      * The encoding class used to encode strings.
      *
-     * @var mixed
+     * @var EncoderInterface
      */
     protected $encode;
 
@@ -206,7 +207,7 @@ public function delete()
      *
      * @return void
      */
-    public function propagateEncoding(Encode $encode)
+    public function propagateEncoding(EncoderInterface $encode)
     {
         $this->encode = $encode;
         $this->tag->setEncoding($encode);

src/PHPHtmlParser/Dom/Node/InnerNode.php

@@ -8,7 +8,8 @@
 use PHPHtmlParser\Exceptions\ChildNotFoundException;
 use PHPHtmlParser\Exceptions\CircularException;
 use PHPHtmlParser\Exceptions\LogicalException;
-use stringEncode\Encode;
+use StringEncoder\Contracts\EncoderInterface;
+
 
 /**
  * Inner node of the html tree, might have children.
@@ -33,7 +34,7 @@ abstract class InnerNode extends ArrayNode
      * Sets the encoding class to this node and propagates it
      * to all its children.
      */
-    public function propagateEncoding(Encode $encode): void
+    public function propagateEncoding(EncoderInterface $encode): void
     {
         $this->encode = $encode;
         $this->tag->setEncoding($encode);

src/PHPHtmlParser/Dom/Node/TextNode.php

@@ -89,7 +89,7 @@ public function text(): string
                 // we already know the converted value
                 return $this->convertedText;
             }
-            $text = $this->encode->convert($text);
+            $text = $this->encode->convert()->fromString($text)->toString();
 
             // remember the conversion
             $this->convertedText = $text;
@@ -109,7 +109,7 @@ public function setText(string $text): void
     {
         $this->text = $text;
         if (!\is_null($this->encode)) {
-            $text = $this->encode->convert($text);
+            $text = $this->encode->convert()->fromString($text)->toString();
 
             // remember the conversion
             $this->convertedText = $text;

src/PHPHtmlParser/Dom/Parser.php

@@ -17,7 +17,9 @@
 use PHPHtmlParser\Exceptions\LogicalException;
 use PHPHtmlParser\Exceptions\StrictException;
 use PHPHtmlParser\Options;
-use stringEncode\Encode;
+use StringEncoder\Contracts\EncoderInterface;
+use StringEncoder\Encoder;
+
 
 class Parser implements ParserInterface
 {
@@ -104,15 +106,15 @@ public function parse(Options $options, Content $content, int $size): AbstractNo
     public function detectCharset(Options $options, string $defaultCharset, AbstractNode $root): bool
     {
         // set the default
-        $encode = new Encode();
-        $encode->from($defaultCharset);
-        $encode->to($defaultCharset);
+        $encode = new Encoder();
+		$encode->setSourceEncoding($defaultCharset);
+		$encode->setTargetEncoding($defaultCharset);
 
         $enforceEncoding = $options->getEnforceEncoding();
         if ($enforceEncoding !== null) {
             //  they want to enforce the given encoding
-            $encode->from($enforceEncoding);
-            $encode->to($enforceEncoding);
+			$encode->setSourceEncoding($enforceEncoding);
+			$encode->setTargetEncoding($enforceEncoding);
 
             return false;
         }
@@ -138,7 +140,7 @@ public function detectCharset(Options $options, string $defaultCharset, Abstract
         }
         $matches = [];
         if (\preg_match('/charset=([^;]+)/', $content, $matches)) {
-            $encode->from(\trim($matches[1]));
+            $encode->setSourceEncoding(\trim($matches[1]));
             $root->propagateEncoding($encode);
 
             return true;
@@ -233,15 +235,15 @@ private function parseTag(Options $options, Content $content, int $size): TagDTO
     /**
      * @throws ChildNotFoundException
      */
-    private function detectHTML5Charset(Encode $encode, AbstractNode $root): bool
+    private function detectHTML5Charset(EncoderInterface $encode, AbstractNode $root): bool
     {
         /** @var AbstractNode|null $meta */
         $meta = $root->find('meta[charset]', 0);
         if ($meta == null) {
             return false;
         }
 
-        $encode->from(\trim($meta->getAttribute('charset')));
+        $encode->setSourceEncoding(\trim($meta->getAttribute('charset')));
         $root->propagateEncoding($encode);
 
         return true;

src/PHPHtmlParser/Dom/Tag.php

@@ -6,7 +6,9 @@
 
 use PHPHtmlParser\DTO\Tag\AttributeDTO;
 use PHPHtmlParser\Exceptions\Tag\AttributeNotFoundException;
-use stringEncode\Encode;
+use StringEncoder\Contracts\EncoderInterface;
+use StringEncoder\Exceptions\InvalidEncodingException;
+
 
 /**
  * Class Tag.
@@ -49,7 +51,7 @@ class Tag
     /**
      * The encoding class to... encode the tags.
      *
-     * @var Encode|null
+     * @var EncoderInterface|null
      */
     protected $encode;
 
@@ -135,7 +137,7 @@ public function isSelfClosing(): bool
     /**
      * Sets the encoding type to be used.
      */
-    public function setEncoding(Encode $encode): void
+    public function setEncoding(EncoderInterface $encode): void
     {
         $this->encode = $encode;
     }
@@ -263,7 +265,7 @@ public function setAttributes(array $attr)
     /**
      * Returns all attributes of this tag.
      *
-     * @throws \stringEncode\Exception
+     * @throws InvalidEncodingException
      *
      * @return AttributeDTO[]
      */
@@ -286,7 +288,7 @@ public function getAttributes(): array
      * Returns an attribute by the key.
      *
      * @throws AttributeNotFoundException
-     * @throws \stringEncode\Exception
+     * @throws InvalidEncodingException
      */
     public function getAttribute(string $key): AttributeDTO
     {
@@ -332,12 +334,14 @@ public function makeOpeningTag()
             } catch (\TypeError $e) {
               $val = null;
             }
-            $val = $attributeDTO->getValue();
+
             if (\is_null($val)) {
                 $return .= ' ' . $key;
             } elseif ($attributeDTO->isDoubleQuote()) {
+				$val = $attributeDTO->getValue();
                 $return .= ' ' . $key . '="' . $val . '"';
             } else {
+				$val = $attributeDTO->getValue();
                 $return .= ' ' . $key . '=\'' . $val . '\'';
             }
         }

tests/Node/TextTest.php

@@ -6,7 +6,8 @@
 use PHPHtmlParser\Dom\Node\TextNode;
 use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
-use stringEncode\Encode;
+use StringEncoder\Encoder;
+
 
 class NodeTextTest extends TestCase
 {
@@ -66,9 +67,9 @@ public function testSetText()
 
     public function testSetTextEncoded()
     {
-        $encode = new Encode();
-        $encode->from('UTF-8');
-        $encode->to('UTF-8');
+        $encode = new Encoder();
+        $encode->setSourceEncoding('UTF-8');
+        $encode->setTargetEncoding('UTF-8');
 
         $node = new TextNode('foo bar');
         $node->propagateEncoding($encode);