Merge pull request #4 from jlamb1/master

Add regex escaping for PHP 7.3 support
balazscsaba2006 · Apr 17, 2019 · 1d3f7fe · 1d3f7fe
2 parents 89e90f9 + 17a9a99
commit 1d3f7fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lib/simple_html_dom.php b/src/lib/simple_html_dom.php
@@ -686,7 +686,7 @@ protected function parse_selector($selector_string) {
 // This implies that an html attribute specifier may start with an @ sign that is NOT captured by the expression.
 // farther study is required to determine of this should be documented or removed.
 //		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
-		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
+		$pattern = "/([\w\-:\*]*)(?:\#([\w\-]+)|\.([\w\-]+))?(?:\[@?(!?[\w\-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 		preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER);
 		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);}
 
@@ -1382,7 +1382,7 @@ protected function read_tag()
 			return true;
 		}
 
-		if (!preg_match("/^[\w-:]+$/", $tag)) {
+		if (!preg_match("/^[\w\-:]+$/", $tag)) {
 			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
 			if ($this->char==='<') {
 				$this->link_nodes($node, false);

diff --git a/src/twig/TwigExtensions.php b/src/twig/TwigExtensions.php
@@ -226,7 +226,7 @@ private function cacheImageSize($key, $width, $height, $expire = 604800): void
      *
      * @return string|null
      */
-    private function readImageSize(string $url): ?array
+    private function readImageSize(string $url)
     {
         $client = new FasterImage();