Cleaned up code base

Fixed Issue with encoding 227
paquettg · Jul 19, 2020 · c2fa05a · c2fa05a
1 parent a2c5eb1
commit c2fa05a
Show file tree

Hide file tree

Showing 23 changed files with 3,059 additions and 792 deletions.
diff --git a/src/PHPHtmlParser/Content.php b/src/PHPHtmlParser/Content.php
@@ -75,8 +75,6 @@ public function char(?int $char = null): string
     /**
      * Moves the current position forward.
      *
-     *
-     *
      * @throws ContentLengthException
      */
     public function fastForward(int $count): Content
@@ -100,8 +98,6 @@ public function canFastForward(int $count): bool
 
     /**
      * Moves the current position backward.
-     *
-     *
      */
     public function rewind(int $count): Content
     {

diff --git a/src/PHPHtmlParser/Contracts/Dom/CleanerInterface.php b/src/PHPHtmlParser/Contracts/Dom/CleanerInterface.php
@@ -1,16 +1,16 @@
-<?php
-
-namespace PHPHtmlParser\Contracts\Dom;
-
-use PHPHtmlParser\Exceptions\LogicalException;
-use PHPHtmlParser\Options;
-
-interface CleanerInterface
-{
-    /**
-     * Cleans the html of any none-html information.
-     *
-     * @throws LogicalException
-     */
-    public function clean(string $str, Options $options): string;
-}
+<?php
+
+namespace PHPHtmlParser\Contracts\Dom;
+
+use PHPHtmlParser\Exceptions\LogicalException;
+use PHPHtmlParser\Options;
+
+interface CleanerInterface
+{
+    /**
+     * Cleans the html of any none-html information.
+     *
+     * @throws LogicalException
+     */
+    public function clean(string $str, Options $options, string $defaultCharset): string;
+}
diff --git a/src/PHPHtmlParser/Contracts/Dom/ParserInterface.php b/src/PHPHtmlParser/Contracts/Dom/ParserInterface.php
@@ -1,33 +1,33 @@
-<?php
-
-namespace PHPHtmlParser\Contracts\Dom;
-
-use PHPHtmlParser\Content;
-use PHPHtmlParser\Dom\Node\AbstractNode;
-use PHPHtmlParser\Exceptions\ChildNotFoundException;
-use PHPHtmlParser\Exceptions\CircularException;
-use PHPHtmlParser\Exceptions\ContentLengthException;
-use PHPHtmlParser\Exceptions\LogicalException;
-use PHPHtmlParser\Exceptions\StrictException;
-use PHPHtmlParser\Options;
-
-interface ParserInterface
-{
-    /**
-     * Attempts to parse the html in content.
-     *
-     * @throws ChildNotFoundException
-     * @throws CircularException
-     * @throws ContentLengthException
-     * @throws LogicalException
-     * @throws StrictException
-     */
-    public function parse(Options $options, Content $content, int $size): AbstractNode;
-
-    /**
-     * Attempts to detect the charset that the html was sent in.
-     *
-     * @throws ChildNotFoundException
-     */
-    public function detectCharset(Options $options, string $defaultCharset, AbstractNode $root): bool;
-}
+<?php
+
+namespace PHPHtmlParser\Contracts\Dom;
+
+use PHPHtmlParser\Content;
+use PHPHtmlParser\Dom\Node\AbstractNode;
+use PHPHtmlParser\Exceptions\ChildNotFoundException;
+use PHPHtmlParser\Exceptions\CircularException;
+use PHPHtmlParser\Exceptions\ContentLengthException;
+use PHPHtmlParser\Exceptions\LogicalException;
+use PHPHtmlParser\Exceptions\StrictException;
+use PHPHtmlParser\Options;
+
+interface ParserInterface
+{
+    /**
+     * Attempts to parse the html in content.
+     *
+     * @throws ChildNotFoundException
+     * @throws CircularException
+     * @throws ContentLengthException
+     * @throws LogicalException
+     * @throws StrictException
+     */
+    public function parse(Options $options, Content $content, int $size): AbstractNode;
+
+    /**
+     * Attempts to detect the charset that the html was sent in.
+     *
+     * @throws ChildNotFoundException
+     */
+    public function detectCharset(Options $options, string $defaultCharset, AbstractNode $root): bool;
+}
diff --git a/src/PHPHtmlParser/Contracts/DomInterface.php b/src/PHPHtmlParser/Contracts/DomInterface.php
@@ -1,23 +1,23 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PHPHtmlParser\Contracts;
-
-use PHPHtmlParser\Dom;
-use PHPHtmlParser\Options;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestInterface;
-
-interface DomInterface
-{
-    public function loadFromFile(string $file, ?Options $options = null): Dom;
-
-    public function loadFromUrl(string $url, ?Options $options, ?ClientInterface $client = null, ?RequestInterface $request = null): Dom;
-
-    public function loadStr(string $str, ?Options $options = null): Dom;
-
-    public function setOptions(Options $options): Dom;
-
-    public function find(string $selector, int $nth = null);
-}
+<?php
+
+declare(strict_types=1);
+
+namespace PHPHtmlParser\Contracts;
+
+use PHPHtmlParser\Dom;
+use PHPHtmlParser\Options;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
+
+interface DomInterface
+{
+    public function loadFromFile(string $file, ?Options $options = null): Dom;
+
+    public function loadFromUrl(string $url, ?Options $options, ?ClientInterface $client = null, ?RequestInterface $request = null): Dom;
+
+    public function loadStr(string $str, ?Options $options = null): Dom;
+
+    public function setOptions(Options $options): Dom;
+
+    public function find(string $selector, int $nth = null);
+}
diff --git a/src/PHPHtmlParser/DTO/TagDTO.php b/src/PHPHtmlParser/DTO/TagDTO.php
@@ -36,17 +36,11 @@ public function __construct(array $values = [])
         $this->tag = $values['tag'] ?? null;
     }
 
-    /**
-     * @return bool
-     */
     public function isStatus(): bool
     {
         return $this->status;
     }
 
-    /**
-     * @return bool
-     */
     public function isClosing(): bool
     {
         return $this->closing;

diff --git a/src/PHPHtmlParser/Dom.php b/src/PHPHtmlParser/Dom.php
@@ -117,7 +117,7 @@ public function loadFromFile(string $file, ?Options $options = null): Dom
      * @throws StrictException
      * @throws ClientExceptionInterface
      */
-    public function loadFromUrl(string $url, ?Options $options, ?ClientInterface $client = null, ?RequestInterface $request = null): Dom
+    public function loadFromUrl(string $url, ?Options $options = null, ?ClientInterface $client = null, ?RequestInterface $request = null): Dom
     {
         if ($client === null) {
             $client = new Client();
@@ -152,20 +152,18 @@ public function loadStr(string $str, ?Options $options = null): Dom
             $localOptions = $localOptions->setFromOptions($options);
         }
 
-        $html = $this->domCleaner->clean($str, $localOptions);
+        $html = $this->domCleaner->clean($str, $localOptions, $this->defaultCharset);
 
         $this->content = new Content($html);
 
-        $this->root = $this->domParser->parse($localOptions, $this->content, strlen($str));
+        $this->root = $this->domParser->parse($localOptions, $this->content, \strlen($str));
         $this->domParser->detectCharset($localOptions, $this->defaultCharset, $this->root);
 
         return $this;
     }
 
     /**
      * Sets a global options array to be used by all load calls.
-     *
-     *
      */
     public function setOptions(Options $options): Dom
     {
@@ -177,10 +175,10 @@ public function setOptions(Options $options): Dom
     /**
      * Find elements by css selector on the root node.
      *
-     * @return mixed|Collection|null
      * @throws NotLoadedException
-     *
      * @throws ChildNotFoundException
+     *
+     * @return mixed|Collection|null
      */
     public function find(string $selector, int $nth = null)
     {
@@ -195,10 +193,10 @@ public function find(string $selector, int $nth = null)
      *
      * @param $id
      *
-     * @return mixed|Collection|null
      * @throws NotLoadedException
-     *
      * @throws ChildNotFoundException
+     *
+     * @return mixed|Collection|null
      */
     public function getElementById($id)
     {
@@ -211,10 +209,10 @@ public function getElementById($id)
      * Simple wrapper function that returns all elements by
      * tag name.
      *
-     * @return mixed|Collection|null
      * @throws NotLoadedException
-     *
      * @throws ChildNotFoundException
+     *
+     * @return mixed|Collection|null
      */
     public function getElementsByTag(string $name)
     {
@@ -227,10 +225,10 @@ public function getElementsByTag(string $name)
      * Simple wrapper function that returns all elements by
      * class name.
      *
-     * @return mixed|Collection|null
      * @throws NotLoadedException
-     *
      * @throws ChildNotFoundException
+     *
+     * @return mixed|Collection|null
      */
     public function getElementsByClass(string $class)
     {
@@ -250,4 +248,4 @@ private function isLoaded(): void
             throw new NotLoadedException('Content is not loaded!');
         }
     }
-}
+}