Merge pull request #3324 from samsonasik/support-multibyte-search-on-domparser-see

lonnieezell · web-flow · commit 1ebffe7ae891 · 2020-07-15T22:18:14.000-05:00
Fixes #3319 add multibyte support on DOMParser::see()
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
@@ -142,8 +142,8 @@ public function see(string $search = null, string $element = null): bool
 		// If Element is null, we're just scanning for text
 		if (is_null($element))
 		{
-			$content = $this->dom->saveHTML();
-			return strpos($content, $search) !== false;
+			$content = $this->dom->saveHTML($this->dom->documentElement);
+			return mb_strpos($content, $search) !== false;
 		}
 
 		$result = $this->doXPath($search, $element);
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
@@ -66,14 +66,25 @@ public function testParseSelectorWithAttribute()
 		$this->assertEquals(['href' => 'http://example.com'], $selector['attr']);
 	}
 
-	public function testSeeText()
+	public function provideText()
+	{
+		return [
+			['Hello World'],
+			['Hellö Wörld'],
+		];
+	}
+
+	/**
+	 * @dataProvider provideText
+	 */
+	public function testSeeText($text)
 	{
 		$dom = new DOMParser();
 
-		$html = '<html><body><h1>Hello World</h1></body></html>';
+		$html = '<html><body><h1>' . $text . '</h1></body></html>';
 		$dom->withString($html);
 
-		$this->assertTrue($dom->see('Hello World'));
+		$this->assertTrue($dom->see($text));
 	}
 
 	public function testSeeHTML()
@@ -96,14 +107,17 @@ public function testSeeFail()
 		$this->assertFalse($dom->see('Hello Worlds'));
 	}
 
-	public function testSeeElement()
+	/**
+	 * @dataProvider provideText
+	 */
+	public function testSeeElement($text)
 	{
 		$dom = new DOMParser();
 
-		$html = '<html><body><h1>Hello World</h1></body></html>';
+		$html = '<html><body><h1> ' . $text . '</h1></body></html>';
 		$dom->withString($html);
 
-		$this->assertTrue($dom->see('Hello World', 'h1'));
+		$this->assertTrue($dom->see($text, 'h1'));
 	}
 
 	public function testSeeElementPartialText()

Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,8 @@ public function see(string $search = null, string $element = null): bool`
`142`	`142`	`// If Element is null, we're just scanning for text`
`143`	`143`	`if (is_null($element))`
`144`	`144`	`{`
`145`		`- $content = $this->dom->saveHTML();`
`146`		`- return strpos($content, $search) !== false;`
	`145`	`+ $content = $this->dom->saveHTML($this->dom->documentElement);`
	`146`	`+ return mb_strpos($content, $search) !== false;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`$result = $this->doXPath($search, $element);`