clean up code

Author: selul

inc/app_replacer.php

@@ -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

@@ -203,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,
 			];
 		}
@@ -656,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/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

@@ -65,7 +65,12 @@ public function init() {
 	}
 
 	/**
-	 *  Get the dimensions of the image based on the optimized url fro Optimole.
+	 * 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.
@@ -74,9 +79,11 @@ public function init() {
 	 */
 	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;
+		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.

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

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