Opt to vary query arg for next_tag() by OD version

Co-authored-by: felixarntz <[email protected]>

Author: westonruter

plugins/embed-optimizer/hooks.php

@@ -44,13 +44,8 @@ function embed_optimizer_add_non_optimization_detective_hooks(): void {
  * @param string $optimization_detective_version Current version of the optimization detective plugin.
  */
 function embed_optimizer_init_optimization_detective( string $optimization_detective_version ): void {
-	if (
-		version_compare( (string) strtok( $optimization_detective_version, '-' ), '1.0.0', '<' )
-		||
-		'1.0.0-beta1' === $optimization_detective_version
-		||
-		'1.0.0-beta2' === $optimization_detective_version
-	) {
+	$required_od_version = '0.9.0';
+	if ( version_compare( (string) strtok( $optimization_detective_version, '-' ), $required_od_version, '<' ) ) {
 		add_action(
 			'admin_notices',
 			static function (): void {
@@ -192,6 +187,12 @@ function embed_optimizer_update_markup( WP_HTML_Tag_Processor $html_processor, b
 	$trigger_error  = static function ( string $message ) use ( $function_name ): void {
 		wp_trigger_error( $function_name, esc_html( $message ) );
 	};
+
+	// As of 1.0.0-beta3, next_tag() allows $query and is beginning to migrate to skip tag closers by default.
+	// In versions prior to this, the method always visited closers and passing a $query actually threw an exception.
+	$tag_query = version_compare( OPTIMIZATION_DETECTIVE_VERSION, '1.0.0-beta3', '>=' )
+		? array( 'tag_closers' => 'visit' )
+		: null;
 	try {
 		/*
 		 * Determine how to lazy load the embed.
@@ -258,7 +259,7 @@ function embed_optimizer_update_markup( WP_HTML_Tag_Processor $html_processor, b
 					}
 				}
 			}
-		} while ( $html_processor->next_tag( array( 'tag_closers' => 'visit' ) ) );
+		} while ( $html_processor->next_tag( $tag_query ) );
 		// If there was only one non-inline script, make it lazy.
 		if ( 1 === $script_count && ! $has_inline_script && $html_processor->has_bookmark( $bookmark_names['script'] ) ) {
 			$needs_lazy_script = true;

plugins/image-prioritizer/class-image-prioritizer-img-tag-visitor.php

@@ -226,7 +226,12 @@ private function process_picture( OD_HTML_Tag_Processor $processor, OD_Tag_Visit
 		$crossorigin    = null;
 
 		// Loop through child tags until we reach the closing PICTURE tag.
-		while ( $processor->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+		// As of 1.0.0-beta3, next_tag() allows $query and is beginning to migrate to skip tag closers by default.
+		// In versions prior to this, the method always visited closers and passing a $query actually threw an exception.
+		$tag_query = version_compare( OPTIMIZATION_DETECTIVE_VERSION, '1.0.0-beta3', '>=' )
+			? array( 'tag_closers' => 'visit' )
+			: null;
+		while ( $processor->next_tag( $tag_query ) ) {
 			$tag = $processor->get_tag();
 
 			// If we reached the closing PICTURE tag, break.

plugins/image-prioritizer/helper.php

@@ -21,13 +21,8 @@
  * @param string $optimization_detective_version Current version of the optimization detective plugin.
  */
 function image_prioritizer_init( string $optimization_detective_version ): void {
-	if (
-		version_compare( (string) strtok( $optimization_detective_version, '-' ), '1.0.0', '<' )
-		||
-		'1.0.0-beta1' === $optimization_detective_version
-		||
-		'1.0.0-beta2' === $optimization_detective_version
-	) {
+	$required_od_version = '0.9.0';
+	if ( ! version_compare( (string) strtok( $optimization_detective_version, '-' ), $required_od_version, '>=' ) ) {
 		add_action(
 			'admin_notices',
 			static function (): void {