Merge branch 'trunk' into fix/no-crop-if-crop-is-array

Author: b1ink0

plugins/embed-optimizer/hooks.php

@@ -187,6 +187,11 @@ 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.
@@ -253,7 +258,7 @@ function embed_optimizer_update_markup( WP_HTML_Tag_Processor $html_processor, b
 					}
 				}
 			}
-		} while ( $html_processor->next_tag() );
+		} 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/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/set-up.php

@@ -17,7 +17,7 @@
 
 		$sample_size = od_get_url_metrics_breakpoint_sample_size();
 		for ( $j = 0; $j < $sample_size; $j++ ) {
-			OD_URL_Metrics_Post_Type::store_url_metric(
+			$test_case->store_url_metric(
 				od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 				$test_case->get_sample_url_metric(
 					array(

plugins/embed-optimizer/tests/test-cases/single-wordpress-tv-embed-outside-viewport-on-mobile/set-up.php

@@ -15,7 +15,7 @@
 			$elements[0]['isLCP']             = false;
 		}
 
-		OD_URL_Metrics_Post_Type::store_url_metric(
+		$test_case->store_url_metric(
 			od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 			$test_case->get_sample_url_metric(
 				array(

plugins/embed-optimizer/tests/test-cases/single-youtube-embed-inside-viewport-with-only-mobile-url-metrics/set-up.php

@@ -1,6 +1,6 @@
 <?php
 return static function ( Test_Embed_Optimizer_Optimization_Detective $test_case ): void {
-	OD_URL_Metrics_Post_Type::store_url_metric(
+	$test_case->store_url_metric(
 		od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 		$test_case->get_sample_url_metric(
 			array(

plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-on-mobile/set-up.php

@@ -17,7 +17,7 @@
 
 		$sample_size = od_get_url_metrics_breakpoint_sample_size();
 		for ( $i = 0; $i < $sample_size; $i++ ) {
-			OD_URL_Metrics_Post_Type::store_url_metric(
+			$test_case->store_url_metric(
 				od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 				$test_case->get_sample_url_metric(
 					array(

plugins/embed-optimizer/tests/test-cases/single-youtube-embed-outside-viewport-with-only-mobile-url-metrics/set-up.php

@@ -1,6 +1,6 @@
 <?php
 return static function ( Test_Embed_Optimizer_Optimization_Detective $test_case ): void {
-	OD_URL_Metrics_Post_Type::store_url_metric(
+	$test_case->store_url_metric(
 		od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 		$test_case->get_sample_url_metric(
 			array(

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

@@ -226,7 +226,11 @@ 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() ) {
+		// 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/tests/test-cases/background-image-outside-viewport-on-all-breakpoints-but-not-desktop-with-fully-populated-sample-data/set-up.php

@@ -12,7 +12,7 @@ static function () use ( $breakpoint_max_widths ) {
 
 	foreach ( $breakpoint_max_widths as $non_desktop_viewport_width ) {
 		for ( $i = 0; $i < $sample_size; $i++ ) {
-			OD_URL_Metrics_Post_Type::store_url_metric(
+			$test_case->store_url_metric(
 				od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 				$test_case->get_sample_url_metric(
 					array(
@@ -32,7 +32,7 @@ static function () use ( $breakpoint_max_widths ) {
 	}
 
 	for ( $i = 0; $i < $sample_size; $i++ ) {
-		OD_URL_Metrics_Post_Type::store_url_metric(
+		$test_case->store_url_metric(
 			od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 			$test_case->get_sample_url_metric(
 				array(

plugins/image-prioritizer/tests/test-cases/background-image-outside-viewport-with-desktop-metrics-missing/set-up.php

@@ -10,7 +10,7 @@ static function () use ( $breakpoint_max_widths ) {
 	);
 
 	foreach ( $breakpoint_max_widths as $non_desktop_viewport_width ) {
-		OD_URL_Metrics_Post_Type::store_url_metric(
+		$test_case->store_url_metric(
 			od_get_url_metrics_slug( od_get_normalized_query_vars() ),
 			$test_case->get_sample_url_metric(
 				array(

plugins/image-prioritizer/tests/test-cases/common-lcp-image-and-lazy-loaded-image-outside-viewport-with-fully-populated-sample-data/set-up.php

@@ -4,7 +4,7 @@
 	$sample_size = od_get_url_metrics_breakpoint_sample_size();
 	foreach ( array_merge( od_get_breakpoint_max_widths(), array( 1000 ) ) as $viewport_width ) {
 		for ( $i = 0; $i < $sample_size; $i++ ) {
-			OD_URL_Metrics_Post_Type::store_url_metric(
+			$test_case->store_url_metric(
 				$slug,
 				$test_case->get_sample_url_metric(
 					array(