Make is_{javascript,json}_script_tag methods private

Author: sirreal

src/wp-includes/html-api/class-wp-html-tag-processor.php

@@ -3952,7 +3952,7 @@ static function ( $tag_match ) {
 	 *
 	 * @return bool True if the script tag will be evaluated as JavaScript.
 	 */
-	public function is_javascript_script_tag(): bool {
+	private function is_javascript_script_tag(): bool {
 		if ( 'SCRIPT' !== $this->get_tag() || $this->get_namespace() !== 'html' ) {
 			return false;
 		}
@@ -4063,7 +4063,7 @@ public function is_javascript_script_tag(): bool {
 	 *
 	 * @return bool True if the script tag should be treated as JSON.
 	 */
-	public function is_json_script_tag(): bool {
+	private function is_json_script_tag(): bool {
 		if ( 'SCRIPT' !== $this->get_tag() || $this->get_namespace() !== 'html' ) {
 			return false;
 		}

tests/phpunit/tests/html-api/wpHtmlTagProcessorScriptTag.php

@@ -23,9 +23,13 @@ class Tests_HtmlApi_WpHtmlTagProcessorScriptTag extends WP_UnitTestCase {
 	public function test_is_javascript_script_tag( string $html, bool $expected_result ) {
 		$processor = new WP_HTML_Tag_Processor( $html );
 		$processor->next_tag();
+
+		$result = ( function () {
+			return $this->is_javascript_script_tag();
+		} )->call( $processor );
 		$this->assertSame(
 			$expected_result,
-			$processor->is_javascript_script_tag(),
+			$result,
 			'Failed to correctly identify JavaScript script tag'
 		);
 	}
@@ -122,9 +126,11 @@ public static function data_is_javascript_script_tag(): array {
 	public function test_is_javascript_script_tag_returns_false_before_finding_tags() {
 		$processor = new WP_HTML_Tag_Processor( 'Just some text' );
 		$processor->next_token();
-
+		$result = ( function () {
+			return $this->is_javascript_script_tag();
+		} )->call( $processor );
 		$this->assertFalse(
-			$processor->is_javascript_script_tag(),
+			$result,
 			'Should return false when not stopped on script tag'
 		);
 	}
@@ -139,8 +145,11 @@ public function test_is_javascript_script_tag_returns_false_for_non_html_namespa
 		$processor->change_parsing_namespace( 'svg' );
 		$processor->next_tag();
 		$this->assertSame( 'SCRIPT', $processor->get_tag() );
+		$result = ( function () {
+			return $this->is_javascript_script_tag();
+		} )->call( $processor );
 		$this->assertFalse(
-			$processor->is_javascript_script_tag(),
+			$result,
 			'Should return false for script tags in non-HTML namespace'
 		);
 	}
@@ -158,9 +167,12 @@ public function test_is_javascript_script_tag_returns_false_for_non_html_namespa
 	public function test_is_json_script_tag( string $html, bool $expected_result ) {
 		$processor = new WP_HTML_Tag_Processor( $html );
 		$processor->next_tag();
+		$result = ( function () {
+			return $this->is_json_script_tag();
+		} )->call( $processor );
 		$this->assertSame(
 			$expected_result,
-			$processor->is_json_script_tag(),
+			$result,
 			'Failed to correctly identify JSON script tag'
 		);
 	}
@@ -224,8 +236,11 @@ public static function data_is_json_script_tag(): array {
 	public function test_is_json_script_tag_returns_false_before_finding_tags() {
 		$processor = new WP_HTML_Tag_Processor( 'Just some text' );
 		$processor->next_token();
+		$result = ( function () {
+			return $this->is_json_script_tag();
+		} )->call( $processor );
 		$this->assertFalse(
-			$processor->is_json_script_tag(),
+			$result,
 			'Should return false when not stopped on script tag'
 		);
 	}
@@ -240,8 +255,11 @@ public function test_is_json_script_tag_returns_false_for_non_html_namespace() {
 		$processor->change_parsing_namespace( 'svg' );
 		$processor->next_tag();
 		$this->assertSame( 'SCRIPT', $processor->get_tag() );
+		$result = ( function () {
+			return $this->is_json_script_tag();
+		} )->call( $processor );
 		$this->assertFalse(
-			$processor->is_json_script_tag(),
+			$result,
 			'Should return false for script tags in non-HTML namespace'
 		);
 	}