Merge pull request #251 from paquettg/dev/3.1.1

Dev/3.1.1

CHANGELOG.md

@@ -5,8 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 3.1.1
+
+### Changed
+- Fixed issue with numbers in comments.
+- Updated minimume php version to correct version.
+- Comment tags are now self-closing when cleanup input is set to false.
+
 ## 3.1.0
 
+### Changed
 - Updated to include Tidelift subscription option.
 - Removed php-coverall.
 - Removed Guzzle 6 Adapter.

README.md

@@ -1,8 +1,6 @@
 PHP Html Parser
 ==========================
 
-Version 3.1.0
-
 [![Build Status](https://travis-ci.org/paquettg/php-html-parser.png)](https://travis-ci.org/paquettg/php-html-parser)
 [![Coverage Status](https://coveralls.io/repos/paquettg/php-html-parser/badge.png)](https://coveralls.io/r/paquettg/php-html-parser)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/paquettg/php-html-parser/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/paquettg/php-html-parser/?branch=master)
@@ -258,7 +256,7 @@ unset($a);
 echo $dom; // '<div class="all"><p>Hey bro, <br /> :)</p></div>');
 ```
 
-You can modify the text of `TextNode` objects easely. Please note that, if you set an encoding, the new text will be encoded using the existing encoding.
+You can modify the text of `TextNode` objects easily. Please note that, if you set an encoding, the new text will be encoded using the existing encoding.
 
 ```php
 use PHPHtmlParser\Dom;

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "ext-curl": "*",

src/PHPHtmlParser/Content.php

@@ -72,6 +72,22 @@ public function char(?int $char = null): string
         return $this->content[$char ?? $this->pos] ?? '';
     }
 
+    /**
+     * Gets a string from the current character position.
+     *
+     * @param int $length
+     * @return string
+     */
+    public function string(int $length = 1): string
+    {
+        $string = '';
+        $position = $this->pos;
+        do {
+            $string .= $this->char($position++);
+        } while ($position < $this->pos + $length);
+        return $string;
+    }
+
     /**
      * Moves the current position forward.
      *

src/PHPHtmlParser/Dom/Parser.php

@@ -183,6 +183,14 @@ private function parseTag(Options $options, Content $content, int $size): TagDTO
                 ->setOpening('<?')
                 ->setClosing(' ?>')
                 ->selfClosing();
+        } elseif($content->string(3) == '!--') {
+            // comment tag
+            $tag = $content->fastForward(3)
+                ->copyByToken(StringToken::CLOSECOMMENT(), true);
+            $tag = (new Tag($tag))
+                ->setOpening('<!--')
+                ->setClosing('-->')
+                ->selfClosing();
         } else {
             $tag = \strtolower($content->copyByToken(StringToken::SLASH(), true));
             if (\trim($tag) == '') {

src/PHPHtmlParser/Dom/Tag.php

@@ -329,6 +329,8 @@ public function makeOpeningTag()
             } catch (AttributeNotFoundException $e) {
                 // attribute that was in the array not found in the array... let's continue.
                 continue;
+            } catch (\TypeError $e) {
+              $val = null;
             }
             $val = $attributeDTO->getValue();
             if (\is_null($val)) {

src/PHPHtmlParser/Enum/StringToken.php

@@ -11,11 +11,13 @@
  * @method static StringToken EQUAL()
  * @method static StringToken SLASH()
  * @method static StringToken ATTR()
+ * @method static StringToken CLOSECOMMENT()
  */
 class StringToken extends Enum
 {
     private const BLANK = " \t\r\n";
     private const EQUAL = ' =/>';
     private const SLASH = " />\r\n\t";
     private const ATTR = ' >';
+    private const CLOSECOMMENT = '-->';
 }

tests/Dom/CommentTest.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+use PHPHtmlParser\Dom;
+use PHPHtmlParser\Options;
+use PHPUnit\Framework\TestCase;
+
+class CommentTest extends TestCase
+{
+    /**
+     * @var Dom
+     */
+    private $dom;
+
+    public function setUp()
+    {
+        $dom = new Dom();
+        $options = new Options();
+        $options->setCleanupInput(false);
+        $dom->loadStr('<!-- test comment with number 2 -->', $options);
+        $this->dom = $dom;
+    }
+
+    public function tearDown()
+    {
+        Mockery::close();
+    }
+
+    public function testLoadCommentInnerHtml()
+    {
+        $this->assertEquals('<!-- test comment with number 2 -->', $this->dom->innerHtml);
+    }
+}

tests/Node/TextTest.php

@@ -4,6 +4,7 @@
 
 use PHPHtmlParser\Dom;
 use PHPHtmlParser\Dom\Node\TextNode;
+use PHPHtmlParser\Options;
 use PHPUnit\Framework\TestCase;
 use stringEncode\Encode;