release: fixes

Fix extraneous quotation mark in image URL when changing fetchpriority.  
Fix resize behavior for certain image sizes that were improperly resized.

Author: selul

inc/app_replacer.php

@@ -221,7 +221,7 @@ public static function possible_data_ignore_flags() {
 	 *
 	 * @return array Size mapping.
 	 */
-	protected static function size_to_crop() {
+	public static function size_to_crop() {
 		if ( ! empty( self::$size_to_crop ) ) {
 			return self::$size_to_crop;
 		}
@@ -614,7 +614,7 @@ protected function parse_dimensions_from_filename( $src ) {
 			}
 		} else {
 			$optimized_args = $this->parse_dimension_from_optimized_url( $src );
-			if ( $optimized_args[0] !== 'auto' || $optimized_args[1] !== 'auto' ) {
+			if ( $optimized_args[0] !== false || $optimized_args[1] !== false ) {
 				return [
 					$optimized_args[0] !== 'auto' ? (int) $optimized_args[0] : false,
 					$optimized_args[1] !== 'auto' ? (int) $optimized_args[1] : false,

inc/dam.php

@@ -65,7 +65,6 @@ public function __construct() {
 		add_filter( 'wp_get_attachment_metadata', [ $this, 'alter_attachment_metadata' ], 10, 2 );
 		add_filter( 'image_downsize', [ $this, 'catch_downsize' ], 10, 3 );
 		add_filter( 'wp_prepare_attachment_for_js', [ $this, 'alter_attachment_for_js' ], 10, 3 );
-		add_filter( 'wp_image_src_get_dimensions', [ $this, 'alter_img_tag_w_h' ], 10, 4 );
 		add_filter( 'get_attached_file', [ $this, 'alter_attached_file_response' ], 10, 2 );
 		add_filter( 'wp_calculate_image_srcset', [ $this, 'disable_dam_images_srcset' ], 1, 5 );
 
@@ -204,16 +203,14 @@ public function alter_attachment_image_src( $image, $attachment_id, $size, $icon
 			return $image;
 		}
 		$image_url     = wp_get_attachment_url( $attachment_id );
-		$incoming_size = $this->parse_dimension_from_optimized_url( $image_url );
-		$width         = $incoming_size[0];
-		$height        = $incoming_size[1];
+		list($width, $height) = $this->parse_dimension_from_optimized_url( $image_url );
 
 		// Skip resize in single attachment view on backend.
 		if ( $this->is_attachment_edit_page( $attachment_id ) ) {
 			return [
 				$image_url,
-				$width,
-				$height,
+				$width === 'auto' ? false : $width,
+				$height === 'auto' ? false : $height,
 				false,
 			];
 		}
@@ -657,53 +654,6 @@ public function alter_attachment_for_js( $response, $attachment, $meta ) {
 		return $response;
 	}
 
-	/**
-	 * We have to short-circuit the logic that adds width and height to the img tag.
-	 * It compares the URL basename, and the `file` param for each image.
-	 * This happens for any image that gets its size set non-explicitly
-	 * e.g. an image block with its size set from the sidebar to `thumbnail`).
-	 *
-	 * Optimole has a single basename for all image resizes in its URL.
-	 *
-	 * @param array|false $dimensions    Array with first element being the width
-	 *                                   and second element being the height, or
-	 *                                   false if dimensions could not be determined.
-	 * @param string      $image_src     The image URL (will be Optimole URL).
-	 * @param array       $image_meta    The image metadata.
-	 * @param int         $attachment_id The image attachment ID. Default 0.
-	 */
-	public function alter_img_tag_w_h( $dimensions, $image_src, $image_meta, $attachment_id ) {
-		if ( ! $this->is_dam_imported_image( $attachment_id ) ) {
-			return $dimensions;
-		}
-
-		// Get the dimensions from the optimized URL.
-		$incoming_size = $this->parse_dimension_from_optimized_url( $image_src );
-		$width         = $incoming_size[0];
-		$height        = $incoming_size[1];
-
-		$sizes = Optml_App_Replacer::image_sizes();
-
-		// If this is an image size. Return its dimensions.
-		foreach ( $sizes as $size => $args ) {
-			if ( (int) $args['width'] !== (int) $width ) {
-				continue;
-			}
-
-			if ( (int) $args['height'] !== (int) $height ) {
-				continue;
-			}
-
-			return [
-				$args['width'],
-				$args['height'],
-			];
-		}
-
-		// Fall-through with the original dimensions.
-		return $dimensions;
-	}
-
 	/**
 	 * Replace the image size params in DAM URLs inside a string.
 	 *

inc/lazyload_replacer.php

@@ -253,7 +253,17 @@ public function lazyload_tag_replace( $new_tag, $original_url, $new_url, $optml_
 		}
 		// Remove fetchpriority high attribute when the image is lazyloaded
 		if ( strpos( $new_tag, 'fetchpriority' ) !== false ) {
-			$new_tag = preg_replace( '/\s+fetchpriority=(high|[\'"][^\'"]*high[^\'"]*)(?=[\'"\s>]|$)/i', '', $new_tag );
+			$new_tag = str_ireplace(
+				[
+					'fetchpriority=high',
+					'fetchpriority="high"',
+					"fetchpriority='high'",
+					'fetchpriority=\"high\"',
+					"fetchpriority=\'high\'",
+				],
+				'',
+				$new_tag
+			);
 		}
 
 		if ( self::instance()->settings->get( 'native_lazyload' ) === 'enabled' ) {

inc/media_offload.php

@@ -2441,6 +2441,9 @@ public function filter_saved_data( $post_data, $postarr, $unsanitized_postarr, $
 
 			$size = $this->parse_dimension_from_optimized_url( $url );
 
+			if ( $size[0] === false || $size[1] === false ) {
+				continue;
+			}
 			if ( $size[0] === 'auto' || $size[1] === 'auto' ) {
 				continue;
 			}

inc/tag_replacer.php

@@ -58,10 +58,53 @@ public function init() {
 		add_filter( 'image_downsize', [ $this, 'filter_image_downsize' ], PHP_INT_MAX, 3 );
 		add_filter( 'wp_calculate_image_srcset', [ $this, 'filter_srcset_attr' ], PHP_INT_MAX - 1, 5 );
 		add_filter( 'wp_calculate_image_sizes', [ $this, 'filter_sizes_attr' ], 1, 2 );
+		add_filter( 'wp_image_src_get_dimensions', [ $this, 'filter_image_src_get_dimensions' ], 99, 4 );
 		if ( $this->settings->get( 'retina_images' ) === 'enabled' ) {
 			add_filter( 'wp_get_attachment_image_attributes', [ $this, 'filter_attachment_image_attributes' ], 99, 3 );
 		}
 	}
+
+	/**
+	 * We have to short-circuit the logic that adds width and height to the img tag.
+	 * It compares the URL basename, and the `file` param for each image.
+	 * This happens for any image that gets its size set non-explicitly
+	 * e.g. an image block with its size set from the sidebar to `thumbnail`).
+	 *
+	 * Optimole has a single basename for all image resizes in its URL.
+	 *
+	 * @param mixed $dimensions The dimensions of the image.
+	 * @param mixed $image_src The source of the image.
+	 * @param mixed $image_meta The meta of the image.
+	 * @param mixed $attachment_id The ID of the attachment.
+	 */
+	public function filter_image_src_get_dimensions( $dimensions, $image_src, $image_meta, $attachment_id ) {
+
+		list($width, $height) = $this->parse_dimension_from_optimized_url( $image_src );
+
+		if ( false === $width || false === $height ) {
+			return $dimensions;
+		}
+		$sizes = Optml_App_Replacer::image_sizes();
+
+		// If this is an image size. Return its dimensions.
+		foreach ( $sizes as $size => $args ) {
+			if ( (int) $args['width'] !== (int) $width ) {
+				continue;
+			}
+
+			if ( (int) $args['height'] !== (int) $height ) {
+				continue;
+			}
+
+			return [
+				$args['width'],
+				$args['height'],
+			];
+		}
+
+		// Fall-through with the original dimensions.
+		return $dimensions;
+	}
 	/**
 	 * Filter the attachment image attributes to add the srcset attribute with retina support.
 	 *
@@ -511,7 +554,8 @@ public function filter_image_downsize( $image, $attachment_id, $size ) {
 		}
 
 		$image_meta = wp_get_attachment_metadata( $attachment_id );
-		$sizes = $this->size_to_dimension( $size, $image_meta );
+		$sizes = $this->size_to_dimension( $size, $image_meta, $attachment_id );
+
 		$image_url = $this->strip_image_size_from_url( $image_url );
 
 		$new_url = apply_filters( 'optml_content_url', $image_url, $sizes );

inc/traits/dam_offload_utils.php

@@ -91,8 +91,8 @@ private function get_all_image_sizes() {
 	 */
 	private function parse_dimension_from_optimized_url( $url ) {
 		$catch  = [];
-		$height = 'auto';
-		$width  = 'auto';
+		$height = false;
+		$width  = false;
 		preg_match( '/\/w:(.*)\/h:(.*)\/q:/', $url, $catch );
 		if ( isset( $catch[1] ) && isset( $catch[2] ) ) {
 			$width  = $catch[1];

inc/traits/normalizer.php

@@ -195,16 +195,18 @@ public function to_bound_integer( $value, $min, $max ) {
 	 *
 	 * @param mixed $size The size of the image. Can be an array of width and height, a predefined size, or 'full'.
 	 * @param array $image_meta Metadata of the image, including width and height.
+	 * @param int   $attachment_id The ID of the attachment.
 	 *
 	 * @return array The dimensions of the image, including width, height, and optional resize parameters.
 	 */
-	public function size_to_dimension( $size, $image_meta ) {
+	public function size_to_dimension( $size, $image_meta, $attachment_id = null ) {
 		// default size
 		$sizes = [
 			'width'  => isset( $image_meta['width'] ) ? intval( $image_meta['width'] ) : false,
 			'height' => isset( $image_meta['height'] ) ? intval( $image_meta['height'] ) : false,
 		];
 		$image_args = Optml_App_Replacer::image_sizes();
+		$sizes2crop = Optml_App_Replacer::size_to_crop();
 		switch ( $size ) {
 			case is_array( $size ):
 				$width  = isset( $size[0] ) ? (int) $size[0] : false;
@@ -216,16 +218,20 @@ public function size_to_dimension( $size, $image_meta ) {
 				if ( isset( self::$dimension_cache[ $cache_key ] ) ) {
 					return self::$dimension_cache[ $cache_key ];
 				}
-				$image_resized = image_resize_dimensions( $sizes['width'], $sizes['height'], $width, $height );
-				if ( $image_resized ) {
-					$width  = $image_resized[6];
-					$height = $image_resized[7];
-				} else {
-					$width  = $image_meta['width'];
-					$height = $image_meta['height'];
+				if ( $attachment_id ) {
+					$intermediate = image_get_intermediate_size( $attachment_id, $size );
+					if ( $intermediate ) {
+						$sizes['width'] = $intermediate['width'];
+						$sizes['height'] = $intermediate['height'];
+					}
 				}
-				list( $sizes['width'], $sizes['height'] ) = image_constrain_size_for_editor( $width, $height, $size );
 
+				list( $sizes['width'], $sizes['height'] ) = image_constrain_size_for_editor( $sizes['width'], $sizes['height'], $size );
+				$resize = apply_filters( 'optml_default_crop', [] );
+				if ( isset( $sizes2crop[ $sizes['width'] . $sizes['height'] ] ) ) {
+					$resize = $this->to_optml_crop( $sizes2crop[ $sizes['width'] . $sizes['height'] ] );
+				}
+				$sizes['resize'] = $resize;
 				self::$dimension_cache[ $cache_key ] = $sizes;
 				break;
 			case 'full' !== $size && isset( $image_args[ $size ] ):

tests/test-dam.php

@@ -22,6 +22,11 @@ class Test_Dam extends WP_UnitTestCase {
 	 */
 	private $dam;
 
+	/**
+	 * @var Optml_Manager
+	 */
+	private $manager;
+
 	const MOCK_ATTACHMENTS = [
 		[
 			'url'  => 'https://cloudUrlTest.test/w:auto/h:auto/q:auto/id:b1b12ee03bf3945d9d9bb963ce79cd4f/https://test-site.test/9.jpg',
@@ -83,6 +88,7 @@ public function setUp(): void {
 
 		$plugin         = Optml_Main::instance();
 		$this->dam      = $plugin->dam;
+		$this->manager      = $plugin->manager;
 		$this->settings = $plugin->admin->settings;
 		$this->settings->update( 'service_data', [
 			'cdn_key'    => 'test123',
@@ -339,7 +345,7 @@ public function test_alter_image_tag_w_h() {
 			// Set these images as thumbnails.
 			$args     = [ 'width' => 150, 'height' => 150, 'crop' => true ];
 			$test_url = $this->dam->replace_dam_url_args( $args, $current_attachment['url'] );
-			$altered_dimensions = $this->dam->alter_img_tag_w_h( $other_dimensions, $test_url, [], $id );
+			$altered_dimensions = $this->manager->tag_replacer->filter_image_src_get_dimensions( $other_dimensions, $test_url, [], $id );
 
 			$this->assertEquals( 150, $altered_dimensions[0] );
 			$this->assertEquals( 150, $altered_dimensions[1] );
@@ -350,7 +356,7 @@ public function test_alter_image_tag_w_h() {
 				$args = $this->dam->size_to_dimension( $size, wp_get_attachment_metadata($id) );
 
 				$test_url = $this->dam->replace_dam_url_args( $args, $current_attachment['url'] );
-				$altered_dimensions = $this->dam->alter_img_tag_w_h( $other_dimensions, $test_url, [], $id );
+				$altered_dimensions = $this->manager->tag_replacer->filter_image_src_get_dimensions( $other_dimensions, $test_url, [], $id );
 
 				$this->assertEquals( $image_size_args['width'], $altered_dimensions[0] );
 				$this->assertEquals( $image_size_args['height'], $altered_dimensions[1] );
@@ -364,7 +370,7 @@ public function test_alter_image_tag_w_h() {
 			];
 
 			$test_url = $this->dam->replace_dam_url_args( $args, $current_attachment['url'] );
-			$altered_dimensions = $this->dam->alter_img_tag_w_h( $other_dimensions, $test_url, [], $id );
+			$altered_dimensions = $this->manager->tag_replacer->filter_image_src_get_dimensions( $other_dimensions, $test_url, [], $id );
 
 			$this->assertEquals( $other_dimensions[0], $altered_dimensions[0] );
 			$this->assertEquals( $other_dimensions[1], $altered_dimensions[1] );