Fixed paquettg#215 - Added support for <? tags

Author: paquettg

src/PHPHtmlParser/Content.php

@@ -75,7 +75,7 @@ public function char(?int $char = null): string
     /**
      * Moves the current position forward.
      *
-     * @chainable
+     *
      *
      * @throws ContentLengthException
      */
@@ -101,7 +101,7 @@ public function canFastForward(int $count): bool
     /**
      * Moves the current position backward.
      *
-     * @chainable
+     *
      */
     public function rewind(int $count): Content
     {

src/PHPHtmlParser/Dom.php

@@ -9,6 +9,7 @@
 use PHPHtmlParser\Dom\AbstractNode;
 use PHPHtmlParser\Dom\Collection;
 use PHPHtmlParser\Dom\HtmlNode;
+use PHPHtmlParser\Dom\Tag;
 use PHPHtmlParser\Dom\TextNode;
 use PHPHtmlParser\DTO\TagDTO;
 use PHPHtmlParser\Enum\StringToken;
@@ -171,10 +172,10 @@ public function loadStr(string $str, ?Options $options = null): Dom
     {
         $this->options = new Options();
         if ($this->globalOptions !== null) {
-            $this->options->setFromOptions($this->globalOptions);
+            $this->options = $this->options->setFromOptions($this->globalOptions);
         }
         if ($options !== null) {
-            $this->options->setFromOptions($options);
+            $this->options = $this->options->setFromOptions($options);
         }
 
         $this->rawSize = \strlen($str);
@@ -194,7 +195,7 @@ public function loadStr(string $str, ?Options $options = null): Dom
     /**
      * Sets a global options array to be used by all load calls.
      *
-     * @chainable
+     *
      */
     public function setOptions(Options $options): Dom
     {
@@ -512,11 +513,7 @@ private function parse(): void
      */
     private function parseTag(): TagDTO
     {
-        $return = [
-            'status'  => false,
-            'closing' => false,
-            'node'    => null,
-        ];
+        $return = [];
         if ($this->content->char() != '<') {
             // we are not at the beginning of a tag
             return new TagDTO();
@@ -549,12 +546,20 @@ private function parseTag(): TagDTO
             $return['tag'] = \strtolower($tag);
 
             return new TagDTO($return);
-        }
-
-        $tag = \strtolower($this->content->copyByToken(StringToken::SLASH(), true));
-        if (\trim($tag) == '') {
-            // no tag found, invalid < found
-            return new TagDTO();
+        } elseif ($this->content->char() == '?') {
+            // special setting tag
+            $tag = $this->content->fastForward(1)
+                ->copyByToken(StringToken::SLASH(), true);
+            $tag = (new Tag($tag))
+                ->setOpening('<?')
+                ->setClosing(' ?>')
+                ->selfClosing();
+        } else {
+            $tag = \strtolower($this->content->copyByToken(StringToken::SLASH(), true));
+            if (\trim($tag) == '') {
+                // no tag found, invalid < found
+                return new TagDTO();
+            }
         }
         $node = new HtmlNode($tag);
         $node->setHtmlSpecialCharsDecode($this->options->isHtmlSpecialCharsDecode());
@@ -631,23 +636,22 @@ private function parseTag(): TagDTO
         }
 
         $this->content->skipByToken(StringToken::BLANK());
-        $tag = \strtolower($tag);
         if ($this->content->char() == '/') {
             // self closing tag
             $node->getTag()->selfClosing();
             $this->content->fastForward(1);
-        } elseif (\in_array($tag, $this->options->getSelfClosing(), true)) {
+        } elseif (\in_array($node->getTag()->name(), $this->options->getSelfClosing(), true)) {
             // Should be a self closing tag, check if we are strict
             if ($this->options->isStrict()) {
                 $character = $this->content->getPosition();
-                throw new StrictException("Tag '$tag' is not self closing! (character #$character)");
+                throw new StrictException("Tag '".$node->getTag()->name()."' is not self closing! (character #$character)");
             }
 
             // We force self closing on this tag.
             $node->getTag()->selfClosing();
 
             // Should this tag use a trailing slash?
-            if (\in_array($tag, $this->options->getNoSlash(), true)) {
+            if (\in_array($node->getTag()->name(), $this->options->getNoSlash(), true)) {
                 $node->getTag()->noTrailingSlash();
             }
         }

src/PHPHtmlParser/Dom/AbstractNode.php

@@ -304,7 +304,7 @@ public function getTag(): Tag
      * Replaces the tag for this node.
      *
      * @param string|Tag $tag
-     * @chainable
+     *
      */
     public function setTag($tag): AbstractNode
     {
@@ -365,7 +365,7 @@ public function hasAttribute(string $key): bool
      * A wrapper method that simply calls the setAttribute method
      * on the tag of this node.
      *
-     * @chainable
+     *
      */
     public function setAttribute(string $key, ?string $value, bool $doubleQuote = true): AbstractNode
     {

src/PHPHtmlParser/Dom/InnerNode.php

@@ -205,7 +205,7 @@ public function insertAfter(AbstractNode $child, int $id): bool
     /**
      * Removes the child by id.
      *
-     * @chainable
+     *
      */
     public function removeChild(int $id): InnerNode
     {

src/PHPHtmlParser/Dom/Tag.php

@@ -58,6 +58,19 @@ class Tag
      */
     private $HtmlSpecialCharsDecode = false;
 
+    /**
+     * What the opening of this tag will be.
+     *
+     * @var string
+     */
+    private $opening = '<';
+
+    /**
+     * What the closing tag for self-closing elements should be.
+     * @var string
+     */
+    private $closing = ' />';
+
     /**
      * Sets up the tag with a name.
      *
@@ -79,25 +92,37 @@ public function name(): string
     /**
      * Sets the tag to be self closing.
      *
-     * @chainable
+     *
      */
     public function selfClosing(): Tag
     {
         $this->selfClosing = true;
 
-        return $this;
+        return clone $this;
+    }
+
+    public function setOpening(string $opening): Tag
+    {
+        $this->opening = $opening;
+        return clone $this;
+    }
+
+    public function setClosing(string $closing): Tag
+    {
+        $this->closing = $closing;
+        return clone $this;
     }
 
     /**
      * Sets the tag to not use a trailing slash.
      *
-     * @chainable
+     *
      */
     public function noTrailingSlash(): Tag
     {
         $this->trailingSlash = false;
 
-        return $this;
+        return clone $this;
     }
 
     /**
@@ -131,7 +156,7 @@ public function noise(string $noise): Tag
     {
         $this->noise = $noise;
 
-        return $this;
+        return clone $this;
     }
 
     /**
@@ -148,7 +173,7 @@ public function setAttribute(string $key, ?string $attributeValue, bool $doubleQ
         }
         $this->attr[\strtolower($key)] = $attributeDTO;
 
-        return $this;
+        return clone $this;
     }
 
     /**
@@ -296,7 +321,7 @@ public function hasAttribute(string $key)
      */
     public function makeOpeningTag()
     {
-        $return = '<' . $this->name;
+        $return = $this->opening . $this->name;
 
         // add the attributes
         foreach (\array_keys($this->attr) as $key) {
@@ -317,7 +342,7 @@ public function makeOpeningTag()
         }
 
         if ($this->selfClosing && $this->trailingSlash) {
-            return $return . ' />';
+            return $return . $this->closing;
         }
 
         return $return . '>';