Refactor image dimension handling in Optimole

- Removed the `wp_image_src_get_dimensions` filter from `Optml_Dam` class.
- Added a new `filter_image_src_get_dimensions` method in `Optml_Tag_Replacer` class to handle image dimensions based on optimized URLs.
- Updated `size_to_dimension` method in `Optml_Normalizer` trait to accept an optional `attachment_id` parameter for improved image size retrieval.

Author: selul

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 );
 

inc/tag_replacer.php

@@ -58,10 +58,46 @@ 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 );
 		}
 	}
+
+	/**
+	 *  Get the dimensions of the image based on the optimized url fro Optimole.
+	 *
+	 * @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 ) {
+
+		$incoming_size = $this->parse_dimension_from_optimized_url( $image_src );
+		list($width, $height) = $incoming_size;
+
+		$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 +547,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/normalizer.php

@@ -195,10 +195,11 @@ 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,
@@ -216,16 +217,15 @@ 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 );
 				self::$dimension_cache[ $cache_key ] = $sizes;
 				break;
 			case 'full' !== $size && isset( $image_args[ $size ] ):