Merge pull request #8360 from kenjis/fix-DOMParser

kenjis · web-flow · commit bd0fbe981a4f · 2023-12-26T06:51:39.000+09:00
fix: DOMParser cannot see element with `id="0"`
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -3171,11 +3171,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/DOMParser.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 6,
-	'path' => __DIR__ . '/system/Test/DOMParser.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Access to an undefined property object\\:\\:\\$createdField\\.$#',
 	'count' => 1,
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
@@ -189,23 +189,23 @@ protected function doXPath(?string $search, string $element, array $paths = [])
         $path = '';
 
         // By ID
-        if (! empty($selector['id'])) {
-            $path = empty($selector['tag'])
+        if (isset($selector['id'])) {
+            $path = ($selector['tag'] === '')
                 ? "id(\"{$selector['id']}\")"
                 : "//{$selector['tag']}[@id=\"{$selector['id']}\"]";
         }
         // By Class
-        elseif (! empty($selector['class'])) {
-            $path = empty($selector['tag'])
+        elseif (isset($selector['class'])) {
+            $path = ($selector['tag'] === '')
                 ? "//*[@class=\"{$selector['class']}\"]"
                 : "//{$selector['tag']}[@class=\"{$selector['class']}\"]";
         }
         // By tag only
-        elseif (! empty($selector['tag'])) {
+        elseif ($selector['tag'] !== '') {
             $path = "//{$selector['tag']}";
         }
 
-        if (! empty($selector['attr'])) {
+        if (isset($selector['attr'])) {
             foreach ($selector['attr'] as $key => $value) {
                 $path .= "[@{$key}=\"{$value}\"]";
             }
@@ -231,7 +231,7 @@ protected function doXPath(?string $search, string $element, array $paths = [])
     /**
      * Look for the a selector  in the passed text.
      *
-     * @return array
+     * @return array{tag: string, id: string|null, class: string|null, attr: array<string, string>|null}
      */
     public function parseSelector(string $selector)
     {
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
@@ -91,7 +91,7 @@ public static function provideText(): iterable
     /**
      * @dataProvider provideText
      *
-     * @param mixed $text
+     * @param string $text
      */
     public function testSeeText($text): void
     {
@@ -139,7 +139,7 @@ public function testSeeFail(): void
     /**
      * @dataProvider provideText
      *
-     * @param mixed $text
+     * @param string $text
      */
     public function testSeeElement($text): void
     {
@@ -171,6 +171,16 @@ public function testSeeElementID(): void
         $this->assertTrue($dom->see('Hello World', '#heading'));
     }
 
+    public function testSeeElementIDZero(): void
+    {
+        $dom = new DOMParser();
+
+        $html = '<html><body><h1 id="0">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
+
+        $this->assertTrue($dom->see('Hello World', '#0'));
+    }
+
     public function testSeeElementIDFails(): void
     {
         $dom = new DOMParser();

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public static function provideText(): iterable`
`91`	`91`	`/**`
`92`	`92`	`* @dataProvider provideText`
`93`	`93`	`*`
`94`		`- * @param mixed $text`
	`94`	`+ * @param string $text`
`95`	`95`	`*/`
`96`	`96`	`public function testSeeText($text): void`
`97`	`97`	`{`
`@@ -139,7 +139,7 @@ public function testSeeFail(): void`
`139`	`139`	`/**`
`140`	`140`	`* @dataProvider provideText`
`141`	`141`	`*`
`142`		`- * @param mixed $text`
	`142`	`+ * @param string $text`
`143`	`143`	`*/`
`144`	`144`	`public function testSeeElement($text): void`
`145`	`145`	`{`
`@@ -171,6 +171,16 @@ public function testSeeElementID(): void`
`171`	`171`	`$this->assertTrue($dom->see('Hello World', '#heading'));`
`172`	`172`	`}`
`173`	`173`
	`174`	`+ public function testSeeElementIDZero(): void`
	`175`	`+ {`
	`176`	`+ $dom = new DOMParser();`
	`177`	`+`
	`178`	`+ $html = '<html><body><h1 id="0">Hello World Wide Web</h1></body></html>';`
	`179`	`+ $dom->withString($html);`
	`180`	`+`
	`181`	`+ $this->assertTrue($dom->see('Hello World', '#0'));`
	`182`	`+ }`
	`183`	`+`
`174`	`184`	`public function testSeeElementIDFails(): void`
`175`	`185`	`{`
`176`	`186`	`$dom = new DOMParser();`