From b58c6da6c58e9da334de20b46f602e9cb70d5095 Mon Sep 17 00:00:00 2001
From: Gilles Paquette <paquettg@gmail.com>
Date: Wed, 15 Jul 2020 01:18:55 +0000
Subject: [PATCH] Removed magical option array

---
 CHANGELOG.md                             |   1 +
 composer.json                            |   3 +-
 src/PHPHtmlParser/Content.php            |  22 +-
 src/PHPHtmlParser/Dom.php                |  86 ++++---
 src/PHPHtmlParser/Enum/StringToken.php   |  21 ++
 src/PHPHtmlParser/Options.php            | 291 +++++++++++------------
 src/PHPHtmlParser/Selector/Seeker.php    |   3 +-
 src/PHPHtmlParser/StaticDom.php          |   9 +-
 tests/ContentTest.php                    |   5 +-
 tests/DomTest.php                        |  30 ++-
 tests/Options/CleanupTest.php            |  29 +--
 tests/Options/PreserveLineBreaks.php     |  10 +-
 tests/Options/StrictTest.php             |  17 +-
 tests/Options/WhitespaceTextNodeTest.php |  13 +-
 tests/OptionsTest.php                    | 117 ++-------
 tests/StaticDomTest.php                  |   2 +-
 16 files changed, 273 insertions(+), 386 deletions(-)
 create mode 100644 src/PHPHtmlParser/Enum/StringToken.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9862bea..05d2146 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cleaned up the selector logic.
 - Fixed issue with greedy regex for charset detection.
 - Fixed bug causing infinite loops in some cases.
+- Refactored the way we handle options. Removed the magical option array.
 
 ### Removed
 - Curl interface and curl implementation has been removed.
diff --git a/composer.json b/composer.json
index 79258c5..5549a5e 100755
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
         "paquettg/string-encode": "~1.0.0",
         "php-http/httplug": "^2.1",
         "php-http/guzzle6-adapter": "^2.0",
-        "guzzlehttp/psr7": "^1.6"
+        "guzzlehttp/psr7": "^1.6",
+        "myclabs/php-enum": "^1.7"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.5.1",
diff --git a/src/PHPHtmlParser/Content.php b/src/PHPHtmlParser/Content.php
index 66bc779..fdb741c 100755
--- a/src/PHPHtmlParser/Content.php
+++ b/src/PHPHtmlParser/Content.php
@@ -4,6 +4,7 @@
 
 namespace PHPHtmlParser;
 
+use PHPHtmlParser\Enum\StringToken;
 use PHPHtmlParser\Exceptions\ContentLengthException;
 use PHPHtmlParser\Exceptions\LogicalException;
 
@@ -75,11 +76,12 @@ public function char(?int $char = null): string
      * Moves the current position forward.
      *
      * @chainable
+     *
      * @throws ContentLengthException
      */
     public function fastForward(int $count): Content
     {
-        if (!$this->canFastForward()) {
+        if (!$this->canFastForward($count)) {
             // trying to go over the content length, throw exception
             throw new ContentLengthException('Attempt to fastForward pass the length of the content.');
         }
@@ -91,9 +93,9 @@ public function fastForward(int $count): Content
     /**
      * Checks if we can move the position forward.
      */
-    public function canFastForward(): bool
+    public function canFastForward(int $count): bool
     {
-        return \strlen($this->content) > $this->pos;
+        return \strlen($this->content) >= $this->pos + $count;
     }
 
     /**
@@ -175,8 +177,6 @@ public function copyUntil(string $string, bool $char = false, bool $escape = fal
     /**
      * Copies the content until the string is found and return it
      * unless the 'unless' is found in the substring.
-     *
-     * @return string
      */
     public function copyUntilUnless(string $string, string $unless): string
     {
@@ -197,13 +197,11 @@ public function copyUntilUnless(string $string, string $unless): string
     /**
      * Copies the content until it reaches the token string.,.
      *
-     * @return string
-     *
      * @uses $this->copyUntil()
      */
-    public function copyByToken(string $token, bool $char = false, bool $escape = false)
+    public function copyByToken(StringToken $stringToken, bool $char = false, bool $escape = false): string
     {
-        $string = $this->$token;
+        $string = $stringToken->getValue();
 
         return $this->copyUntil($string, $char, $escape);
     }
@@ -236,13 +234,11 @@ public function skip(string $string, bool $copy = false): string
     /**
      * Skip a given token of pre-defined characters.
      *
-     * @return Content|string
-     *
      * @uses $this->skip()
      */
-    public function skipByToken(string $token, bool $copy = false)
+    public function skipByToken(StringToken $skipToken, bool $copy = false): string
     {
-        $string = $this->$token;
+        $string = $skipToken->getValue();
 
         return $this->skip($string, $copy);
     }
diff --git a/src/PHPHtmlParser/Dom.php b/src/PHPHtmlParser/Dom.php
index d23110d..d2db15e 100755
--- a/src/PHPHtmlParser/Dom.php
+++ b/src/PHPHtmlParser/Dom.php
@@ -10,10 +10,10 @@
 use PHPHtmlParser\Dom\Collection;
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\TextNode;
+use PHPHtmlParser\Enum\StringToken;
 use PHPHtmlParser\Exceptions\ChildNotFoundException;
 use PHPHtmlParser\Exceptions\CircularException;
 use PHPHtmlParser\Exceptions\ContentLengthException;
-use PHPHtmlParser\Exceptions\CurlException;
 use PHPHtmlParser\Exceptions\LogicalException;
 use PHPHtmlParser\Exceptions\NotLoadedException;
 use PHPHtmlParser\Exceptions\StrictException;
@@ -72,9 +72,9 @@ class Dom
     /**
      * A global options array to be used by all load calls.
      *
-     * @var array
+     * @var ?Options
      */
-    private $globalOptions = [];
+    private $globalOptions;
 
     /**
      * A persistent option object to be used for all options in the
@@ -147,7 +147,7 @@ public function __get($name)
      * @throws StrictException
      * @throws LogicalException
      */
-    public function loadFromFile(string $file, array $options = []): Dom
+    public function loadFromFile(string $file, ?Options $options = null): Dom
     {
         $content = @\file_get_contents($file);
         if ($content === false) {
@@ -168,7 +168,7 @@ public function loadFromFile(string $file, array $options = []): Dom
      * @throws StrictException
      * @throws \Psr\Http\Client\ClientExceptionInterface
      */
-    public function loadFromUrl(string $url, array $options = [], ?ClientInterface $client = null, ?RequestInterface $request = null): Dom
+    public function loadFromUrl(string $url, ?Options $options, ?ClientInterface $client = null, ?RequestInterface $request = null): Dom
     {
         if ($client === null) {
             $client = new Client();
@@ -191,11 +191,15 @@ public function loadFromUrl(string $url, array $options = [], ?ClientInterface $
      * @throws CircularException
      * @throws StrictException
      */
-    public function loadStr(string $str, array $option = []): Dom
+    public function loadStr(string $str, ?Options $options = null): Dom
     {
         $this->options = new Options();
-        $this->options->setOptions($this->globalOptions)
-            ->setOptions($option);
+        if ($this->globalOptions !== null) {
+            $this->options->setFromOptions($this->globalOptions);
+        }
+        if ($options !== null) {
+            $this->options->setFromOptions($options);
+        }
 
         $this->rawSize = \strlen($str);
         $this->raw = $str;
@@ -216,7 +220,7 @@ public function loadStr(string $str, array $option = []): Dom
      *
      * @chainable
      */
-    public function setOptions(array $options): Dom
+    public function setOptions(Options $options): Dom
     {
         $this->globalOptions = $options;
 
@@ -235,9 +239,7 @@ public function find(string $selector, int $nth = null)
     {
         $this->isLoaded();
 
-        $result = $this->root->find($selector, $nth);
-
-        return $result;
+        return $this->root->find($selector, $nth);
     }
 
     /**
@@ -463,7 +465,7 @@ private function isLoaded(): void
      */
     private function clean(string $str): string
     {
-        if ($this->options->get('cleanupInput') != true) {
+        if ($this->options->isCleanupInput() != true) {
             // skip entire cleanup step
             return $str;
         }
@@ -488,7 +490,7 @@ private function clean(string $str): string
 
         // clean out the \n\r
         $replace = ' ';
-        if ($this->options->get('preserveLineBreaks')) {
+        if ($this->options->isPreserveLineBreaks()) {
             $replace = '&#10;';
         }
         $str = \str_replace(["\r\n", "\r", "\n"], $replace, $str);
@@ -515,7 +517,7 @@ private function clean(string $str): string
         }
 
         // strip out <script> tags
-        if ($this->options->get('removeScripts')) {
+        if ($this->options->isRemoveScripts()) {
             $str = \mb_eregi_replace("<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>", '', $str);
             if ($str === false) {
                 throw new LogicalException('mb_eregi_replace returned false instead of a string. Error when attempting to remove scripts 1.');
@@ -527,7 +529,7 @@ private function clean(string $str): string
         }
 
         // strip out <style> tags
-        if ($this->options->get('removeStyles')) {
+        if ($this->options->isRemoveStyles()) {
             $str = \mb_eregi_replace("<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>", '', $str);
             if ($str === false) {
                 throw new LogicalException('mb_eregi_replace returned false instead of a string. Error when attempting to strip out style tags 1.');
@@ -538,16 +540,8 @@ private function clean(string $str): string
             }
         }
 
-        // strip out server side scripts
-        if ($this->options->get('serverSideScripts')) {
-            $str = \mb_eregi_replace("(<\?)(.*?)(\?>)", '', $str);
-            if ($str === false) {
-                throw new LogicalException('mb_eregi_replace returned false instead of a string. Error when attempting to strip out service side scripts.');
-            }
-        }
-
         // strip smarty scripts
-        if ($this->options->get('removeSmartyScripts')) {
+        if ($this->options->isRemoveSmartyScripts()) {
             $str = \mb_eregi_replace("(\{\w)(.*?)(\})", '', $str);
             if ($str === false) {
                 throw new LogicalException('mb_eregi_replace returned false instead of a string. Error when attempting to remove smarty scripts.');
@@ -569,11 +563,11 @@ private function parse(): void
     {
         // add the root node
         $this->root = new HtmlNode('root');
-        $this->root->setHtmlSpecialCharsDecode($this->options->htmlSpecialCharsDecode);
+        $this->root->setHtmlSpecialCharsDecode($this->options->isHtmlSpecialCharsDecode());
         $activeNode = $this->root;
         while ($activeNode !== null) {
             if ($activeNode && $activeNode->tag->name() === 'script'
-                && $this->options->get('cleanupInput') != true
+                && $this->options->isCleanupInput() != true
             ) {
                 $str = $this->content->copyUntil('</');
             } else {
@@ -618,12 +612,12 @@ private function parse(): void
                 if (!$node->getTag()->isSelfClosing()) {
                     $activeNode = $node;
                 }
-            } elseif ($this->options->whitespaceTextNode ||
+            } elseif ($this->options->isWhitespaceTextNode() ||
                 \trim($str) != ''
             ) {
                 // we found text we care about
-                $textNode = new TextNode($str, $this->options->removeDoubleSpace);
-                $textNode->setHtmlSpecialCharsDecode($this->options->htmlSpecialCharsDecode);
+                $textNode = new TextNode($str, $this->options->isRemoveDoubleSpace());
+                $textNode->setHtmlSpecialCharsDecode($this->options->isHtmlSpecialCharsDecode());
                 $activeNode->addChild($textNode);
             }
         }
@@ -656,7 +650,7 @@ private function parseTag(): array
         if ($this->content->char() == '/') {
             // end tag
             $tag = $this->content->fastForward(1)
-                ->copyByToken('slash', true);
+                ->copyByToken(StringToken::SLASH(), true);
             // move to end of tag
             $this->content->copyUntil('>');
             $this->content->fastForward(1);
@@ -675,20 +669,20 @@ private function parseTag(): array
             return $return;
         }
 
-        $tag = \strtolower($this->content->copyByToken('slash', true));
+        $tag = \strtolower($this->content->copyByToken(StringToken::SLASH(), true));
         if (\trim($tag) == '') {
             // no tag found, invalid < found
             return $return;
         }
         $node = new HtmlNode($tag);
-        $node->setHtmlSpecialCharsDecode($this->options->htmlSpecialCharsDecode);
+        $node->setHtmlSpecialCharsDecode($this->options->isHtmlSpecialCharsDecode());
 
         // attributes
         while (
             $this->content->char() != '>' &&
             $this->content->char() != '/'
         ) {
-            $space = $this->content->skipByToken('blank', true);
+            $space = $this->content->skipByToken(StringToken::BLANK(), true);
             if (empty($space)) {
                 try {
                     $this->content->fastForward(1);
@@ -699,20 +693,20 @@ private function parseTag(): array
                 continue;
             }
 
-            $name = $this->content->copyByToken('equal', true);
+            $name = $this->content->copyByToken(StringToken::EQUAL(), true);
             if ($name == '/') {
                 break;
             }
 
             if (empty($name)) {
-                $this->content->skipByToken('blank');
+                $this->content->skipByToken(StringToken::BLANK());
                 continue;
             }
 
-            $this->content->skipByToken('blank');
+            $this->content->skipByToken(StringToken::BLANK());
             if ($this->content->char() == '=') {
                 $this->content->fastForward(1)
-                    ->skipByToken('blank');
+                    ->skipByToken(StringToken::BLANK());
                 switch ($this->content->char()) {
                     case '"':
                         $this->content->fastForward(1);
@@ -720,7 +714,7 @@ private function parseTag(): array
                         do {
                             $moreString = $this->content->copyUntilUnless('"', '=>');
                             $string .= $moreString;
-                        } while (strlen($moreString) > 0 && $this->content->getPosition() < $this->size);
+                        } while (\strlen($moreString) > 0 && $this->content->getPosition() < $this->size);
                         $attr['value'] = $string;
                         $this->content->fastForward(1);
                         $node->getTag()->setAttribute($name, $string);
@@ -731,18 +725,18 @@ private function parseTag(): array
                         do {
                             $moreString = $this->content->copyUntilUnless("'", '=>');
                             $string .= $moreString;
-                        } while (strlen($moreString) > 0 && $this->content->getPosition() < $this->size);
+                        } while (\strlen($moreString) > 0 && $this->content->getPosition() < $this->size);
                         $attr['value'] = $string;
                         $this->content->fastForward(1);
                         $node->getTag()->setAttribute($name, $string, false);
                         break;
                     default:
-                        $node->getTag()->setAttribute($name, $this->content->copyByToken('attr', true));
+                        $node->getTag()->setAttribute($name, $this->content->copyByToken(StringToken::ATTR(), true));
                         break;
                 }
             } else {
                 // no value attribute
-                if ($this->options->strict) {
+                if ($this->options->isStrict()) {
                     // can't have this in strict html
                     $character = $this->content->getPosition();
                     throw new StrictException("Tag '$tag' has an attribute '$name' with out a value! (character #$character)");
@@ -754,7 +748,7 @@ private function parseTag(): array
             }
         }
 
-        $this->content->skipByToken('blank');
+        $this->content->skipByToken(StringToken::BLANK());
         $tag = \strtolower($tag);
         if ($this->content->char() == '/') {
             // self closing tag
@@ -762,7 +756,7 @@ private function parseTag(): array
             $this->content->fastForward(1);
         } elseif (\in_array($tag, $this->selfClosing, true)) {
             // Should be a self closing tag, check if we are strict
-            if ($this->options->strict) {
+            if ($this->options->isStrict()) {
                 $character = $this->content->getPosition();
                 throw new StrictException("Tag '$tag' is not self closing! (character #$character)");
             }
@@ -776,7 +770,7 @@ private function parseTag(): array
             }
         }
 
-        if ($this->content->canFastForward()) {
+        if ($this->content->canFastForward(1)) {
             $this->content->fastForward(1);
         }
 
@@ -798,7 +792,7 @@ private function detectCharset(): bool
         $encode->from($this->defaultCharset);
         $encode->to($this->defaultCharset);
 
-        $enforceEncoding = $this->options->enforceEncoding;
+        $enforceEncoding = $this->options->getEnforceEncoding();
         if ($enforceEncoding !== null) {
             //  they want to enforce the given encoding
             $encode->from($enforceEncoding);
diff --git a/src/PHPHtmlParser/Enum/StringToken.php b/src/PHPHtmlParser/Enum/StringToken.php
new file mode 100644
index 0000000..6b60d52
--- /dev/null
+++ b/src/PHPHtmlParser/Enum/StringToken.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PHPHtmlParser\Enum;
+
+use MyCLabs\Enum\Enum;
+
+/**
+ * @method static StringToken BLANK()
+ * @method static StringToken EQUAL()
+ * @method static StringToken SLASH()
+ * @method static StringToken ATTR()
+ */
+class StringToken extends Enum
+{
+    private const BLANK = " \t\r\n";
+    private const EQUAL = ' =/>';
+    private const SLASH = " />\r\n\t";
+    private const ATTR = ' >';
+}
diff --git a/src/PHPHtmlParser/Options.php b/src/PHPHtmlParser/Options.php
index b7e1cd1..9d1dfbf 100755
--- a/src/PHPHtmlParser/Options.php
+++ b/src/PHPHtmlParser/Options.php
@@ -4,242 +4,221 @@
 
 namespace PHPHtmlParser;
 
-use PHPHtmlParser\Exceptions\UnknownOptionException;
-
-/**
- * Class Options.
- *
- * @property bool        $whitespaceTextNode
- * @property bool        $strict
- * @property string|null $enforceEncoding
- * @property bool        $cleanupInput
- * @property bool        $removeScripts
- * @property bool        $removeStyles
- * @property bool        $preserveLineBreaks
- * @property bool        $removeDoubleSpace
- * @property bool        $removeSmartyScripts
- * @property bool        $htmlSpecialCharsDecode
- */
 class Options
 {
     /**
-     * The default options array.
+     * The whitespaceTextNode, by default true, option tells the parser to save textnodes even if the content of the
+     * node is empty (only whitespace). Setting it to false will ignore all whitespace only text node found in the document.
      *
-     * @var array
+     * @var bool
      */
-    protected $defaults = [
-        'whitespaceTextNode'     => true,
-        'strict'                 => false,
-        'enforceEncoding'        => null,
-        'cleanupInput'           => true,
-        'removeScripts'          => true,
-        'removeStyles'           => true,
-        'preserveLineBreaks'     => false,
-        'removeDoubleSpace'      => true,
-        'removeSmartyScripts'    => true,
-        'htmlSpecialCharsDecode' => false,
-    ];
+    private $whitespaceTextNode = true;
 
     /**
-     * The list of all current options set.
+     * Strict, by default false, will throw a StrictException if it finds that the html is not strictly compliant
+     * (all tags must have a closing tag, no attribute with out a value, etc.).
      *
-     * @var array
+     * @var bool
      */
-    protected $options = [];
+    private $strict = false;
 
     /**
-     * Sets the default options in the options array.
+     * The enforceEncoding, by default null, option will enforce an character set to be used for reading the content
+     * and returning the content in that encoding. Setting it to null will trigger an attempt to figure out
+     * the encoding from within the content of the string given instead.
+     *
+     * @var ?string
      */
-    public function __construct()
-    {
-        $this->options = $this->defaults;
-    }
+    private $enforceEncoding;
 
     /**
-     * A magic get to call the get() method.
+     * Set this to false to skip the entire clean up phase of the parser. Defaults to true.
      *
-     * @param string $key
+     * @var bool
+     */
+    private $cleanupInput = true;
+
+    /**
+     * Set this to false to skip removing the script tags from the document body. This might have adverse effects.
+     * Defaults to true.
      *
-     * @return mixed
+     * NOTE: Ignored if cleanupInit is true.
      *
-     * @uses $this->get()
+     * @var bool
      */
-    public function __get($key)
-    {
-        return $this->get($key);
-    }
+    private $removeScripts = true;
 
     /**
-     * The whitespaceTextNode, by default true, option tells the parser to save textnodes even if the content of the
-     * node is empty (only whitespace). Setting it to false will ignore all whitespace only text node found in the document.
+     * Set this to false to skip removing of style tags from the document body. This might have adverse effects. Defaults to true.
+     *
+     * NOTE: Ignored if cleanupInit is true.
      *
-     * @return Options
+     * @var bool
      */
-    public function setWhitespaceTextNode(bool $value): self
-    {
-        $this->options['whitespaceTextNode'] = $value;
+    private $removeStyles = true;
 
-        return $this;
-    }
+    /**
+     * Preserves Line Breaks if set to true. If set to false line breaks are cleaned up
+     * as part of the input clean up process. Defaults to false.
+     *
+     * NOTE: Ignored if cleanupInit is true.
+     *
+     * @var bool
+     */
+    private $preserveLineBreaks = false;
 
     /**
-     * Strict, by default false, will throw a StrictException if it finds that the html is not strictly compliant
-     * (all tags must have a closing tag, no attribute with out a value, etc.).
+     * Set this to false if you want to preserve whitespace inside of text nodes. It is set to true by default.
      *
-     * @return Options
+     * @var bool
      */
-    public function setStrict(bool $value): self
-    {
-        $this->options['strict'] = $value;
+    private $removeDoubleSpace = true;
 
-        return $this;
-    }
+    /**
+     * Set this to false if you want to preserve smarty script found in the html content. It is set to true by default.
+     *
+     * @var bool
+     */
+    private $removeSmartyScripts = true;
 
     /**
-     * The enforceEncoding, by default null, option will enforce an character set to be used for reading the content
-     * and returning the content in that encoding. Setting it to null will trigger an attempt to figure out
-     * the encoding from within the content of the string given instead.
+     * By default this is set to false. Setting this to true will apply the php function htmlspecialchars_decode too all attribute values and text nodes.
      *
-     * @return Options
+     * @var bool
      */
-    public function setEnforceEncoding(?string $value): self
+    private $htmlSpecialCharsDecode = false;
+
+    public function isWhitespaceTextNode(): bool
+    {
+        return $this->whitespaceTextNode;
+    }
+
+    public function setWhitespaceTextNode(bool $whitespaceTextNode): Options
     {
-        $this->options['enforceEncoding'] = $value;
+        $this->whitespaceTextNode = $whitespaceTextNode;
 
         return $this;
     }
 
-    /**
-     * Set this to false to skip the entire clean up phase of the parser. Defaults to true.
-     *
-     * @return Options
-     */
-    public function setCleanupInput(bool $value): self
+    public function isStrict(): bool
     {
-        $this->options['cleanupInput'] = $value;
+        return $this->strict;
+    }
+
+    public function setStrict(bool $strict): Options
+    {
+        $this->strict = $strict;
 
         return $this;
     }
 
-    /**
-     * Set this to false to skip removing the script tags from the document body. This might have adverse effects.
-     * Defaults to true.
-     *
-     * NOTE: Ignored if cleanupInit is true.
-     *
-     * @return Options
-     */
-    public function setRemoveScripts(bool $value): self
+    public function getEnforceEncoding(): ?string
+    {
+        return $this->enforceEncoding;
+    }
+
+    public function setEnforceEncoding(?string $enforceEncoding): Options
     {
-        $this->options['removeScripts'] = $value;
+        $this->enforceEncoding = $enforceEncoding;
 
         return $this;
     }
 
-    /**
-     * Set this to false to skip removing of style tags from the document body. This might have adverse effects. Defaults to true.
-     *
-     * NOTE: Ignored if cleanupInit is true.
-     *
-     * @return Options
-     */
-    public function setRemoveStyles(bool $value): self
+    public function isCleanupInput(): bool
+    {
+        return $this->cleanupInput;
+    }
+
+    public function setCleanupInput(bool $cleanupInput): Options
     {
-        $this->options['removeStyles'] = $value;
+        $this->cleanupInput = $cleanupInput;
 
         return $this;
     }
 
-    /**
-     * Preserves Line Breaks if set to true. If set to false line breaks are cleaned up
-     * as part of the input clean up process. Defaults to false.
-     *
-     * NOTE: Ignored if cleanupInit is true.
-     *
-     * @return Options
-     */
-    public function setPreserveLineBreaks(bool $value): self
+    public function isRemoveScripts(): bool
+    {
+        return $this->removeScripts;
+    }
+
+    public function setRemoveScripts(bool $removeScripts): Options
     {
-        $this->options['preserveLineBreaks'] = $value;
+        $this->removeScripts = $removeScripts;
 
         return $this;
     }
 
-    /**
-     * Set this to false if you want to preserve whitespace inside of text nodes. It is set to true by default.
-     *
-     * @return Options
-     */
-    public function setRemoveDoubleSpace(bool $value): self
+    public function isRemoveStyles(): bool
     {
-        $this->options['removeDoubleSpace'] = $value;
+        return $this->removeStyles;
+    }
+
+    public function setRemoveStyles(bool $removeStyles): Options
+    {
+        $this->removeStyles = $removeStyles;
 
         return $this;
     }
 
-    /**
-     * Set this to false if you want to preserve smarty script found in the html content. It is set to true by default.
-     *
-     * @return Options
-     */
-    public function setRemoveSmartyScripts(bool $value): self
+    public function isPreserveLineBreaks(): bool
+    {
+        return $this->preserveLineBreaks;
+    }
+
+    public function setPreserveLineBreaks(bool $preserveLineBreaks): Options
     {
-        $this->options['removeSmartyScripts'] = $value;
+        $this->preserveLineBreaks = $preserveLineBreaks;
 
         return $this;
     }
 
-    /**
-     * By default this is set to false. Setting this to true will apply the php function htmlspecialchars_decode too all attribute values and text nodes.
-     *
-     * @return Options
-     */
-    public function setHtmlSpecialCharsDecode(bool $value): self
+    public function isRemoveDoubleSpace(): bool
+    {
+        return $this->removeDoubleSpace;
+    }
+
+    public function setRemoveDoubleSpace(bool $removeDoubleSpace): Options
     {
-        $this->options['htmlSpecialCharsDecode'] = $value;
+        $this->removeDoubleSpace = $removeDoubleSpace;
 
         return $this;
     }
 
-    /**
-     * Sets a new options param to override the current option array.
-     *
-     * @chainable
-     *
-     * @throws UnknownOptionException
-     */
-    public function setOptions(array $options): Options
+    public function isRemoveSmartyScripts(): bool
+    {
+        return $this->removeSmartyScripts;
+    }
+
+    public function setRemoveSmartyScripts(bool $removeSmartyScripts): Options
     {
-        foreach ($options as $key => $option) {
-            if (!\array_key_exists($key, $this->defaults)) {
-                throw new UnknownOptionException("Option '$key' is not recognized");
-            }
-            $this->options[$key] = $option;
-        }
+        $this->removeSmartyScripts = $removeSmartyScripts;
 
         return $this;
     }
 
-    /**
-     * Gets the value associated to the key, or null if the key is not
-     * found.
-     *
-     * @return mixed
-     */
-    public function get(string $key)
+    public function isHtmlSpecialCharsDecode(): bool
     {
-        if (isset($this->options[$key])) {
-            return $this->options[$key];
-        }
+        return $this->htmlSpecialCharsDecode;
     }
 
-    /**
-     * Return current options as array.
-     *
-     * @return array
-     */
-    public function asArray()
+    public function setHtmlSpecialCharsDecode(bool $htmlSpecialCharsDecode): Options
+    {
+        $this->htmlSpecialCharsDecode = $htmlSpecialCharsDecode;
+
+        return $this;
+    }
+
+    public function setFromOptions(Options $options): void
     {
-        return $this->options;
+        $this->setCleanupInput($options->isCleanupInput());
+        $this->setEnforceEncoding($options->getEnforceEncoding());
+        $this->setHtmlSpecialCharsDecode($options->isHtmlSpecialCharsDecode());
+        $this->setPreserveLineBreaks($options->isPreserveLineBreaks());
+        $this->setRemoveDoubleSpace($options->isRemoveDoubleSpace());
+        $this->setRemoveScripts($options->isRemoveScripts());
+        $this->setRemoveSmartyScripts($options->isRemoveSmartyScripts());
+        $this->setRemoveStyles($options->isRemoveStyles());
+        $this->setStrict($options->isStrict());
+        $this->setWhitespaceTextNode($options->isWhitespaceTextNode());
     }
 }
diff --git a/src/PHPHtmlParser/Selector/Seeker.php b/src/PHPHtmlParser/Selector/Seeker.php
index 93d1bc1..ca92cb2 100644
--- a/src/PHPHtmlParser/Selector/Seeker.php
+++ b/src/PHPHtmlParser/Selector/Seeker.php
@@ -17,7 +17,8 @@ class Seeker implements SeekerInterface
      * Attempts to find all children that match the rule
      * given.
      *
-     * @var InnerNode[] $nodes
+     * @var InnerNode[]
+     *
      * @throws ChildNotFoundException
      */
     public function seek(array $nodes, RuleDTO $rule, array $options): array
diff --git a/src/PHPHtmlParser/StaticDom.php b/src/PHPHtmlParser/StaticDom.php
index 411ca3d..95d0107 100755
--- a/src/PHPHtmlParser/StaticDom.php
+++ b/src/PHPHtmlParser/StaticDom.php
@@ -8,7 +8,6 @@
 use Http\Adapter\Guzzle6\Client;
 use PHPHtmlParser\Exceptions\ChildNotFoundException;
 use PHPHtmlParser\Exceptions\CircularException;
-use PHPHtmlParser\Exceptions\CurlException;
 use PHPHtmlParser\Exceptions\NotLoadedException;
 use PHPHtmlParser\Exceptions\StrictException;
 use Psr\Http\Client\ClientInterface;
@@ -65,12 +64,12 @@ public static function mount(string $className = 'Dom', ?Dom $dom = null): bool
      * @throws StrictException
      * @throws Exceptions\LogicalException
      */
-    public static function loadFromFile(string $file): Dom
+    public static function loadFromFile(string $file, ?Options $options = null): Dom
     {
         $dom = new Dom();
         self::$dom = $dom;
 
-        return $dom->loadFromFile($file);
+        return $dom->loadFromFile($file, $options);
     }
 
     /**
@@ -82,7 +81,7 @@ public static function loadFromFile(string $file): Dom
      * @throws StrictException
      * @throws \Psr\Http\Client\ClientExceptionInterface
      */
-    public static function loadFromUrl(string $url, array $options = [], ClientInterface $client = null, RequestInterface $request = null): Dom
+    public static function loadFromUrl(string $url, ?Options $options = null, ClientInterface $client = null, RequestInterface $request = null): Dom
     {
         $dom = new Dom();
         self::$dom = $dom;
@@ -97,7 +96,7 @@ public static function loadFromUrl(string $url, array $options = [], ClientInter
         return $dom->loadFromUrl($url, $options, $client, $request);
     }
 
-    public static function loadStr(string $str, array $options = []): Dom
+    public static function loadStr(string $str, ?Options $options = null): Dom
     {
         $dom = new Dom();
         self::$dom = $dom;
diff --git a/tests/ContentTest.php b/tests/ContentTest.php
index 339d1c4..c6d25ed 100755
--- a/tests/ContentTest.php
+++ b/tests/ContentTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use PHPHtmlParser\Content;
+use PHPHtmlParser\Enum\StringToken;
 use PHPUnit\Framework\TestCase;
 
 class ContentTest extends TestCase
@@ -70,7 +71,7 @@ public function testCopyByToken()
     {
         $content = new Content('<a href="google.com">');
         $content->fastForward(3);
-        $this->assertEquals('href="google.com"', $content->copyByToken('attr', true));
+        $this->assertEquals('href="google.com"', $content->copyByToken(StringToken::ATTR(), true));
     }
 
     public function testSkip()
@@ -90,7 +91,7 @@ public function testSkipByToken()
     {
         $content = new Content(' b c');
         $content->fastForward(1);
-        $content->skipByToken('blank');
+        $content->skipByToken(StringToken::BLANK());
         $this->assertEquals('b', $content->char());
     }
 }
diff --git a/tests/DomTest.php b/tests/DomTest.php
index 20707fe..8139696 100755
--- a/tests/DomTest.php
+++ b/tests/DomTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use PHPHtmlParser\Dom;
+use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 
 class DomTest extends TestCase
@@ -19,7 +20,7 @@ public function testParsingCData()
     {
         $html = "<script type=\"text/javascript\">/* <![CDATA[ */var et_core_api_spam_recaptcha = '';/* ]]> */</script>";
         $dom = new Dom();
-        $dom->setOptions(['cleanupInput' => false]);
+        $dom->setOptions((new Options())->setCleanupInput(false));
         $dom->loadStr($html);
         $this->assertSame($html, $dom->root->outerHtml());
     }
@@ -213,7 +214,7 @@ public function testLoadUtf8()
     public function testLoadFileWhitespace()
     {
         $dom = new Dom();
-        $dom->setOptions(['cleanupInput' => false]);
+        $dom->setOptions((new Options())->setCleanupInput(false));
         $dom->loadFromFile('tests/data/files/whitespace.html');
         $this->assertEquals(1, \count($dom->find('.class')));
         $this->assertEquals('<span><span class="class"></span></span>', (string) $dom);
@@ -237,7 +238,8 @@ public function testLoadFileBigTwice()
     public function testLoadFileBigTwicePreserveOption()
     {
         $dom = new Dom();
-        $dom->loadFromFile('tests/data/files/big.html', ['preserveLineBreaks' => true]);
+        $dom->loadFromFile('tests/data/files/big.html',
+            (new Options)->setPreserveLineBreaks(true));
         $post = $dom->find('.post-row', 0);
         $this->assertEquals(
             "<p>Журчанье воды<br />\nЧерно-белые тени<br />\nВновь на фонтане</p>",
@@ -261,7 +263,7 @@ public function testLoadFromUrl()
             ->andReturn($responseMock);
 
         $dom = new Dom();
-        $dom->loadFromUrl('http://google.com', [], $clientMock);
+        $dom->loadFromUrl('http://google.com', null, $clientMock);
         $this->assertEquals('VonBurgermeister', $dom->find('.post-row div .post-user font', 0)->text);
     }
 
@@ -397,9 +399,7 @@ public function testHasChildren()
     public function testWhitespaceInText()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'removeDoubleSpace' => false,
-        ]);
+        $dom->setOptions((new Options())->setRemoveDoubleSpace(false));
         $dom->loadStr('<pre>    Hello world</pre>');
         $this->assertEquals('<pre>    Hello world</pre>', (string) $dom);
     }
@@ -415,7 +415,7 @@ public function testGetComplexAttribute()
     public function testGetComplexAttributeHtmlSpecialCharsDecode()
     {
         $dom = new Dom();
-        $dom->setOptions(['htmlSpecialCharsDecode' => true]);
+        $dom->setOptions((new Options())->setHtmlSpecialCharsDecode(true));
         $dom->loadStr('<a href="?search=Fort+William&amp;session_type=face&amp;distance=100&amp;uqs=119846&amp;page=4" class="pagination-next">Next <span class="chevron">&gt;</span></a>');
         $a = $dom->find('a', 0);
         $this->assertEquals('Next <span class="chevron">></span>', $a->innerHtml);
@@ -563,7 +563,7 @@ public function testLoadGetAttributeWithBackslash()
     public function test25ChildrenFound()
     {
         $dom = new Dom();
-        $dom->setOptions(['whitespaceTextNode' => false]);
+        $dom->setOptions((new Options())->setWhitespaceTextNode(false));
         $dom->loadFromFile('tests/data/files/51children.html');
         $children = $dom->find('#red-line-g *');
         $this->assertEquals(25, \count($children));
@@ -596,22 +596,21 @@ public function testLessThanCharacterInJavascript()
         $results = (new Dom())->loadStr('<html><head><script type="text/javascript">
             console.log(1 < 3);
         </script></head><body><div id="panel"></div></body></html>',
-            [
-                'cleanupInput' => false,
-                'removeScripts' => false
-            ])->find('body');
+            (new Options())->setCleanupInput(false)
+                ->setRemoveScripts(false)
+            )->find('body');
         $this->assertCount(1, $results);
     }
 
     public function testUniqueIdForAllObjects()
     {
         // Create a dom which will be used as a parent/container for a paragraph
-        $dom1 = new \PHPHtmlParser\Dom;
+        $dom1 = new \PHPHtmlParser\Dom();
         $dom1->loadStr('<div>A container div</div>'); // Resets the counter (doesn't matter here as the counter was 0 even without resetting)
         $div = $dom1->firstChild();
 
         // Create a paragraph outside of the first dom
-        $dom2 = new \PHPHtmlParser\Dom;
+        $dom2 = new \PHPHtmlParser\Dom();
         $dom2->loadStr('<p>Our new paragraph.</p>'); // Resets the counter
         $paragraph = $dom2->firstChild();
 
@@ -647,7 +646,6 @@ public function testCompatibleWithWordPressShortcode()
 
         $node = $dom->find('p', 0);
         $this->assertEquals(' [wprs_alert type="success" content="this is a short code" /] ', $node->innerHtml);
-
     }
 
     public function testBrokenHtml()
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
index b7e5325..914078a 100755
--- a/tests/Options/CleanupTest.php
+++ b/tests/Options/CleanupTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use PHPHtmlParser\Dom;
+use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 
 class CleanupTest extends TestCase
@@ -10,9 +11,7 @@ class CleanupTest extends TestCase
     public function testCleanupInputTrue()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'cleanupInput' => true,
-        ]);
+        $dom->setOptions((new Options())->setCleanupInput(true));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(0, \count($dom->find('style')));
         $this->assertEquals(0, \count($dom->find('script')));
@@ -21,9 +20,7 @@ public function testCleanupInputTrue()
     public function testCleanupInputFalse()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'cleanupInput' => false,
-        ]);
+        $dom->setOptions((new Options())->setCleanupInput(false));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(1, \count($dom->find('style')));
         $this->assertEquals(22, \count($dom->find('script')));
@@ -32,9 +29,7 @@ public function testCleanupInputFalse()
     public function testRemoveStylesTrue()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'removeStyles' => true,
-        ]);
+        $dom->setOptions((new Options())->setRemoveStyles(true));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(0, \count($dom->find('style')));
     }
@@ -42,9 +37,7 @@ public function testRemoveStylesTrue()
     public function testRemoveStylesFalse()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'removeStyles' => false,
-        ]);
+        $dom->setOptions((new Options())->setRemoveStyles(false));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(1, \count($dom->find('style')));
         $this->assertEquals('text/css',
@@ -54,9 +47,7 @@ public function testRemoveStylesFalse()
     public function testRemoveScriptsTrue()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'removeScripts' => true,
-        ]);
+        $dom->setOptions((new Options())->setRemoveScripts(true));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(0, \count($dom->find('script')));
     }
@@ -64,9 +55,7 @@ public function testRemoveScriptsTrue()
     public function testRemoveScriptsFalse()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'removeScripts' => false,
-        ]);
+        $dom->setOptions((new Options())->setRemoveScripts(false));
         $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(22, \count($dom->find('script')));
         $this->assertEquals('text/javascript',
@@ -85,9 +74,7 @@ public function testSmartyScripts()
     public function testSmartyScriptsDisabled()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'removeSmartyScripts' => false,
-        ]);
+        $dom->setOptions((new Options())->setRemoveSmartyScripts(false));
         $dom->loadStr('
         aa={123}
         ');
diff --git a/tests/Options/PreserveLineBreaks.php b/tests/Options/PreserveLineBreaks.php
index ad095a3..be39649 100755
--- a/tests/Options/PreserveLineBreaks.php
+++ b/tests/Options/PreserveLineBreaks.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use PHPHtmlParser\Dom;
+use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 
 class PreserveLineBreaks extends TestCase
@@ -10,9 +11,8 @@ class PreserveLineBreaks extends TestCase
     public function testPreserveLineBreakTrue()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'preserveLineBreaks' => true,
-        ]);
+        $dom->setOptions((new Options())->setPreserveLineBreaks(true));
+
         $dom->loadStr('<div class="stream-container ">
 <div class="stream-item js-new-items-bar-container"> </div> <div class="stream">');
 
@@ -22,9 +22,7 @@ public function testPreserveLineBreakTrue()
     public function testPreserveLineBreakBeforeClosingTag()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'preserveLineBreaks' => true,
-        ]);
+        $dom->setOptions((new Options())->setPreserveLineBreaks(true));
         $dom->loadStr('<div class="stream-container "
  ><div class="stream-item js-new-items-bar-container"> </div> <div class="stream">');
 
diff --git a/tests/Options/StrictTest.php b/tests/Options/StrictTest.php
index 96d457b..709f292 100755
--- a/tests/Options/StrictTest.php
+++ b/tests/Options/StrictTest.php
@@ -4,6 +4,7 @@
 
 use PHPHtmlParser\Dom;
 use PHPHtmlParser\Exceptions\StrictException;
+use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 
 class StrictTest extends TestCase
@@ -11,9 +12,7 @@ class StrictTest extends TestCase
     public function testConfigStrict()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'strict' => true,
-        ]);
+        $dom->setOptions((new Options())->setStrict(true));
         $dom->loadStr('<div><p id="hey">Hey you</p> <p id="ya">Ya you!</p></div>');
         $this->assertEquals(' ', $dom->getElementById('hey')->nextSibling()->text);
     }
@@ -21,9 +20,7 @@ public function testConfigStrict()
     public function testConfigStrictMissingSelfClosing()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'strict' => true,
-        ]);
+        $dom->setOptions((new Options())->setStrict(true));
         try {
             // should throw an exception
             $dom->loadStr('<div><p id="hey">Hey you</p><br><p id="ya">Ya you!</p></div>');
@@ -37,9 +34,7 @@ public function testConfigStrictMissingSelfClosing()
     public function testConfigStrictMissingAttribute()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'strict' => true,
-        ]);
+        $dom->setOptions((new Options())->setStrict(true));
         try {
             // should throw an exception
             $dom->loadStr('<div><p id="hey" block>Hey you</p> <p id="ya">Ya you!</p></div>');
@@ -53,9 +48,7 @@ public function testConfigStrictMissingAttribute()
     public function testConfigStrictBRTag()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'strict' => true,
-        ]);
+        $dom->setOptions((new Options())->setStrict(true));
         $dom->loadStr('<br />');
         $this->assertTrue(true);
     }
diff --git a/tests/Options/WhitespaceTextNodeTest.php b/tests/Options/WhitespaceTextNodeTest.php
index 0097f28..245ef7f 100755
--- a/tests/Options/WhitespaceTextNodeTest.php
+++ b/tests/Options/WhitespaceTextNodeTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use PHPHtmlParser\Dom;
+use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 
 class WhitespaceTextNodeTest extends TestCase
@@ -10,9 +11,7 @@ class WhitespaceTextNodeTest extends TestCase
     public function testConfigGlobalNoWhitespaceTextNode()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'whitespaceTextNode' => false,
-        ]);
+        $dom->setOptions((new Options())->setWhitespaceTextNode(false));
         $dom->loadStr('<div><p id="hey">Hey you</p> <p id="ya">Ya you!</p></div>');
         $this->assertEquals('Ya you!', $dom->getElementById('hey')->nextSibling()->text);
     }
@@ -20,12 +19,8 @@ public function testConfigGlobalNoWhitespaceTextNode()
     public function testConfigLocalOverride()
     {
         $dom = new Dom();
-        $dom->setOptions([
-            'whitespaceTextNode' => false,
-        ]);
-        $dom->loadStr('<div><p id="hey">Hey you</p> <p id="ya">Ya you!</p></div>', [
-            'whitespaceTextNode' => true,
-        ]);
+        $dom->setOptions((new Options())->setWhitespaceTextNode(false));
+        $dom->loadStr('<div><p id="hey">Hey you</p> <p id="ya">Ya you!</p></div>', (new Options())->setWhitespaceTextNode(true));
         $this->assertEquals(' ', $dom->getElementById('hey')->nextSibling()->text);
     }
 }
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
index a78f508..f7406a1 100755
--- a/tests/OptionsTest.php
+++ b/tests/OptionsTest.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-use PHPHtmlParser\Dom;
-use PHPHtmlParser\Exceptions\UnknownOptionException;
 use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 
@@ -13,137 +11,62 @@ public function testDefaultWhitespaceTextNode()
     {
         $options = new Options();
 
-        $this->assertTrue($options->whitespaceTextNode);
+        $this->assertTrue($options->isWhitespaceTextNode());
     }
 
     public function testSettingOption()
     {
         $options = new Options();
-        $options->setOptions([
-            'strict' => true,
-        ]);
-
-        $this->assertTrue($options->strict);
-    }
-
-    public function testAddingOption()
-    {
-        $this->expectException(UnknownOptionException::class);
+        $options->setStrict(true);
 
-        $options = new Options();
-        $options->setOptions([
-            'test' => true,
-        ]);
+        $this->assertTrue($options->isStrict());
     }
 
     public function testOverwritingOption()
     {
         $options = new Options();
-        $options->setOptions([
-            'strict' => false,
-        ])->setOptions([
-            'strict'             => true,
-            'whitespaceTextNode' => false,
-        ]);
-
-        $this->assertTrue($options->get('strict'));
-        $this->assertFalse($options->get('whitespaceTextNode'));
-    }
+        $options->setStrict(false);
+        $options2 = new Options();
+        $options2->setStrict(true);
+        $options2->setWhitespaceTextNode(false);
+        $options->setFromOptions($options2);
 
-    public function testGettingNoOption()
-    {
-        $options = new Options();
-        $this->assertEquals(null, $options->get('doesnotexist'));
+        $this->assertTrue($options->isStrict());
+        $this->assertFalse($options->isWhitespaceTextNode());
     }
 
     public function testSetters()
     {
         $options = new Options();
 
-        $options->setOptions([
-            'whitespaceTextNode'     => false,
-            'strict'                 => false,
-            'enforceEncoding'        => null,
-            'cleanupInput'           => false,
-            'removeScripts'          => false,
-            'removeStyles'           => false,
-            'preserveLineBreaks'     => false,
-            'removeDoubleSpace'      => false,
-            'removeSmartyScripts'    => false,
-            'htmlSpecialCharsDecode' => false,
-        ]);
-
         $options->setWhitespaceTextNode(true);
-        $this->assertTrue($options->get('whitespaceTextNode'));
+        $this->assertTrue($options->isWhitespaceTextNode());
 
         $options->setStrict(true);
-        $this->assertTrue($options->get('strict'));
+        $this->assertTrue($options->isStrict());
 
         $options->setEnforceEncoding('utf8');
-        $this->assertEquals('utf8', $options->get('enforceEncoding'));
+        $this->assertEquals('utf8', $options->getEnforceEncoding());
 
         $options->setCleanupInput(true);
-        $this->assertTrue($options->get('cleanupInput'));
+        $this->assertTrue($options->isCleanupInput());
 
         $options->setRemoveScripts(true);
-        $this->assertTrue($options->get('removeScripts'));
+        $this->assertTrue($options->isRemoveScripts());
 
         $options->setRemoveStyles(true);
-        $this->assertTrue($options->get('removeStyles'));
+        $this->assertTrue($options->isRemoveStyles());
 
         $options->setPreserveLineBreaks(true);
-        $this->assertTrue($options->get('preserveLineBreaks'));
+        $this->assertTrue($options->isPreserveLineBreaks());
 
         $options->setRemoveDoubleSpace(true);
-        $this->assertTrue($options->get('removeDoubleSpace'));
+        $this->assertTrue($options->isRemoveDoubleSpace());
 
         $options->setRemoveSmartyScripts(true);
-        $this->assertTrue($options->get('removeSmartyScripts'));
+        $this->assertTrue($options->isRemoveSmartyScripts());
 
         $options->setHtmlSpecialCharsDecode(true);
-        $this->assertTrue($options->get('htmlSpecialCharsDecode'));
-
-        // now reset to false
-
-        $options->setWhitespaceTextNode(false);
-        $this->assertFalse($options->get('whitespaceTextNode'));
-
-        $options->setStrict(false);
-        $this->assertFalse($options->get('strict'));
-
-        $options->setEnforceEncoding(null);
-        $this->assertNull($options->get('enforceEncoding'));
-
-        $options->setCleanupInput(false);
-        $this->assertFalse($options->get('cleanupInput'));
-
-        $options->setRemoveScripts(false);
-        $this->assertFalse($options->get('removeScripts'));
-
-        $options->setRemoveStyles(false);
-        $this->assertFalse($options->get('removeStyles'));
-
-        $options->setPreserveLineBreaks(false);
-        $this->assertFalse($options->get('preserveLineBreaks'));
-
-        $options->setRemoveDoubleSpace(false);
-        $this->assertFalse($options->get('removeDoubleSpace'));
-
-        $options->setRemoveSmartyScripts(false);
-        $this->assertFalse($options->get('removeSmartyScripts'));
-
-        $options->setHtmlSpecialCharsDecode(false);
-        $this->assertFalse($options->get('htmlSpecialCharsDecode'));
-    }
-
-    public function testUnknownOptionDom()
-    {
-        $dom = new Dom();
-        $dom->setOptions([
-            'unknown_option' => true,
-        ]);
-
-        $this->expectException(UnknownOptionException::class);
-        $dom->loadStr('<div></div>');
+        $this->assertTrue($options->isHtmlSpecialCharsDecode());
     }
 }
diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
index fbc1a5b..7345363 100755
--- a/tests/StaticDomTest.php
+++ b/tests/StaticDomTest.php
@@ -73,7 +73,7 @@ public function testLoadFromUrl()
             ->once()
             ->andReturn($responseMock);
 
-        Dom::loadFromUrl('http://google.com', [], $clientMock);
+        Dom::loadFromUrl('http://google.com', null, $clientMock);
         $this->assertEquals('VonBurgermeister', Dom::find('.post-row div .post-user font', 0)->text);
     }
 }