From 95e7878a90742395bbf7bd552860a4b548ad89da Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Thu, 14 Nov 2024 17:03:06 +0530
Subject: [PATCH 01/11] Add settings for generate fallback images in all sizes.
 Add functionality to use added new settings

---
 plugins/webp-uploads/helper.php    |  11 +++
 plugins/webp-uploads/hooks.php     |   8 ++-
 plugins/webp-uploads/settings.php  | 110 +++++++++++++++++++++++++++++
 plugins/webp-uploads/uninstall.php |   1 +
 4 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index 6c8062664c..71f1cef4f5 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -411,6 +411,17 @@ function webp_uploads_is_fallback_enabled(): bool {
 	return (bool) get_option( 'perflab_generate_webp_and_jpeg' );
 }
 
+/**
+ * Checks if the `perflab_generate_fallback_all_sizes` option is enabled.
+ *
+ * @since n.e.x.t
+ *
+ * @return bool True if the option is enabled, false otherwise.
+ */
+function webp_uploads_is_fallback_all_sizes_enabled(): bool {
+	return (bool) get_option( 'perflab_generate_fallback_all_sizes' );
+}
+
 /**
  * Retrieves the image URL for a specified MIME type from the attachment metadata.
  *
diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
index a7a9b308da..c385bc65d8 100644
--- a/plugins/webp-uploads/hooks.php
+++ b/plugins/webp-uploads/hooks.php
@@ -719,7 +719,13 @@ function webp_uploads_get_image_sizes_additional_mime_type_support(): array {
 	);
 
 	foreach ( $additional_sizes as $size => $size_details ) {
-		$allowed_sizes[ $size ] = ! empty( $size_details['provide_additional_mime_types'] );
+		if ( isset( $size_details['provide_additional_mime_types'] ) ) {
+			// Give priority to the 'provide_additional_mime_types' property.
+			$allowed_sizes[ $size ] = ! empty( $size_details['provide_additional_mime_types'] );
+		} else {
+			// If 'provide_additional_mime_types' is not set, use the fallback all sizes setting.
+			$allowed_sizes[ $size ] = webp_uploads_is_fallback_all_sizes_enabled();
+		}
 	}
 
 	/**
diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index c44d6c452a..3f701ae819 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -40,6 +40,18 @@ function webp_uploads_register_media_settings_field(): void {
 			'show_in_rest' => false,
 		)
 	);
+
+	// Add a setting to generate fallback images in all sizes including custom sizes.
+	register_setting(
+		'media',
+		'perflab_generate_fallback_all_sizes',
+		array(
+			'type'         => 'boolean',
+			'default'      => false,
+			'show_in_rest' => false,
+		)
+	);
+
 	// Add a setting to use the picture element.
 	register_setting(
 		'media',
@@ -96,6 +108,16 @@ function webp_uploads_add_media_settings_fields(): void {
 		array( 'class' => 'perflab-generate-webp-and-jpeg' )
 	);
 
+	// Add setting field for generating fallback images in all sizes including custom sizes.
+	add_settings_field(
+		'perflab_generate_fallback_all_sizes',
+		__( 'Output all fallback images', 'webp-uploads' ),
+		'webp_uploads_generate_fallback_all_sizes_callback',
+		'media',
+		'perflab_modern_image_format_settings',
+		array( 'class' => 'perflab-generate-fallback-all-sizes' )
+	);
+
 	// Add picture element support settings field.
 	add_settings_field(
 		'webp_uploads_use_picture_element',
@@ -178,6 +200,94 @@ function webp_uploads_generate_webp_jpeg_setting_callback(): void {
 	<?php
 }
 
+
+/**
+ * Renders the settings field for generating fallback images in all sizes.
+ *
+ * @since n.e.x.t
+ */
+function webp_uploads_generate_fallback_all_sizes_callback(): void {
+	$fallback_all_sizes_enabled   = 1 === (int) get_option( 'perflab_generate_fallback_all_sizes', 0 );
+	$fallback_enabled             = webp_uploads_is_fallback_enabled();
+	$fallback_all_sizes_hidden_id = 'perflab_generate_fallback_all_sizes_hidden';
+
+	?>
+	<style>
+		#perflab_generate_fallback_all_sizes_fieldset.disabled label,
+		#perflab_generate_fallback_all_sizes_fieldset.disabled p {
+			opacity: 0.7;
+		}
+	</style>
+	<div id="perflab_generate_fallback_all_sizes_notice" class="notice notice-info inline" <?php echo $fallback_enabled ? 'hidden' : ''; ?>>
+		<p><?php esc_html_e( 'This setting requires fallback image output to be enabled.', 'webp-uploads' ); ?></p>
+	</div>
+	<div id="perflab_generate_fallback_all_sizes_fieldset" class="<?php echo ! $fallback_enabled ? 'disabled' : ''; ?>">
+		<label for="perflab_generate_fallback_all_sizes" id="perflab_generate_fallback_all_sizes_label">
+			<input
+				type="checkbox"
+				id="perflab_generate_fallback_all_sizes"
+				name="perflab_generate_fallback_all_sizes"
+				aria-describedby="perflab_generate_fallback_all_sizes_description"
+				value="1"
+				<?php checked( $fallback_all_sizes_enabled ); ?>
+				<?php disabled( ! $fallback_enabled ); ?>
+			>
+			<?php
+			/*
+			 * If the checkbox is disabled, but the option is enabled, include a hidden input to continue sending the
+			 * same value upon form submission.
+			 */
+			if ( ! $fallback_enabled && $fallback_all_sizes_enabled ) {
+				?>
+				<input
+					type="hidden"
+					id="<?php echo esc_attr( $fallback_all_sizes_hidden_id ); ?>"
+					name="perflab_generate_fallback_all_sizes"
+					value="1"
+				>
+				<?php
+			}
+			esc_html_e( 'Generate fallback images in all sizes including custom sizes', 'webp-uploads' );
+			?>
+		</label>
+		<p class="description" id="perflab_generate_fallback_all_sizes_description"><?php esc_html_e( 'Enabling this option will generate fallback images in all sizes including custom sizes. Note: uses even more storage space.', 'webp-uploads' ); ?></p>
+	</div>
+	<script>
+	( function ( fallbackAllSizesHiddenId ) {
+		const fallbackCheckbox = document.getElementById( 'perflab_generate_webp_and_jpeg' );
+		const fallbackAllSizesCheckbox = document.getElementById( 'perflab_generate_fallback_all_sizes' );
+		const fallbackAllSizesFieldset = document.getElementById( 'perflab_generate_fallback_all_sizes_fieldset' );
+		const fallbackAllSizesNotice = document.getElementById( 'perflab_generate_fallback_all_sizes_notice' );
+
+		function toggleFallbackAllSizes() {
+			const fallbackEnabled = fallbackCheckbox.checked;
+			fallbackAllSizesFieldset.classList.toggle( 'disabled', ! fallbackEnabled );
+			fallbackAllSizesCheckbox.disabled = ! fallbackEnabled;
+			fallbackAllSizesNotice.hidden = fallbackEnabled;
+
+			// Remove or inject hidden input to preserve original setting value as needed.
+			if ( fallbackEnabled ) {
+				const hiddenInput = document.getElementById( fallbackAllSizesHiddenId );
+				if ( hiddenInput ) {
+					hiddenInput.parentElement.removeChild( hiddenInput );
+				}
+			} else if ( fallbackAllSizesCheckbox.checked && ! document.getElementById( fallbackAllSizesHiddenId ) ) {
+				// The hidden input is only needed if the value was originally set (i.e., the checkbox enabled).
+				const hiddenInput = document.createElement( 'input' );
+				hiddenInput.type = 'hidden';
+				hiddenInput.id = fallbackAllSizesHiddenId;
+				hiddenInput.name = fallbackAllSizesCheckbox.name;
+				hiddenInput.value = fallbackAllSizesCheckbox.value;
+				fallbackAllSizesCheckbox.parentElement.insertBefore( hiddenInput, fallbackAllSizesCheckbox.nextSibling );
+			}
+		}
+
+		fallbackCheckbox.addEventListener( 'change', toggleFallbackAllSizes );
+	} )( <?php echo wp_json_encode( $fallback_all_sizes_hidden_id ); ?> );
+	</script>
+	<?php
+}
+
 /**
  * Renders the settings field for the 'webp_uploads_use_picture_element' setting.
  *
diff --git a/plugins/webp-uploads/uninstall.php b/plugins/webp-uploads/uninstall.php
index 46fba3c78d..6238df06c2 100644
--- a/plugins/webp-uploads/uninstall.php
+++ b/plugins/webp-uploads/uninstall.php
@@ -38,4 +38,5 @@
  */
 function webp_uploads_delete_plugin_option(): void {
 	delete_option( 'perflab_generate_webp_and_jpeg' );
+	delete_option( 'perflab_generate_fallback_all_sizes' );
 }

From 8473bb866cb4ee3410a2cd5f855181a7f7c06d32 Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Fri, 15 Nov 2024 13:57:00 +0530
Subject: [PATCH 02/11] Add generator tag for tracking usage of generate all
 fallback image sizes option

---
 plugins/webp-uploads/hooks.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
index c385bc65d8..bd66d9520b 100644
--- a/plugins/webp-uploads/hooks.php
+++ b/plugins/webp-uploads/hooks.php
@@ -770,6 +770,10 @@ function webp_uploads_modify_webp_quality( int $quality, string $mime_type ): in
 function webp_uploads_render_generator(): void {
 	// Use the plugin slug as it is immutable.
 	echo '<meta name="generator" content="webp-uploads ' . esc_attr( WEBP_UPLOADS_VERSION ) . '">' . "\n";
+
+	if ( webp_uploads_is_fallback_all_sizes_enabled() ) {
+		echo '<meta name="generator" content="webp-uploads-fallback-all-sizes ' . esc_attr( WEBP_UPLOADS_VERSION ) . '">' . "\n";
+	}
 }
 add_action( 'wp_head', 'webp_uploads_render_generator' );
 

From fa34edfbbd86ffc71f8d1cfab73559d79b8f0610 Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Thu, 21 Nov 2024 18:29:30 +0530
Subject: [PATCH 03/11] Remove use of empty()

---
 plugins/webp-uploads/hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
index ad1475618a..cb5ae8bae2 100644
--- a/plugins/webp-uploads/hooks.php
+++ b/plugins/webp-uploads/hooks.php
@@ -721,7 +721,7 @@ function webp_uploads_get_image_sizes_additional_mime_type_support(): array {
 	foreach ( $additional_sizes as $size => $size_details ) {
 		if ( isset( $size_details['provide_additional_mime_types'] ) ) {
 			// Give priority to the 'provide_additional_mime_types' property.
-			$allowed_sizes[ $size ] = ! empty( $size_details['provide_additional_mime_types'] );
+			$allowed_sizes[ $size ] = (bool) $size_details['provide_additional_mime_types'];
 		} else {
 			// If 'provide_additional_mime_types' is not set, use the fallback all sizes setting.
 			$allowed_sizes[ $size ] = webp_uploads_is_fallback_all_sizes_enabled();

From e8460fe3254ffb41f96af7ac523d25c981de9946 Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Fri, 22 Nov 2024 14:47:16 +0530
Subject: [PATCH 04/11] Change the function, option, variable names

---
 plugins/webp-uploads/helper.php    |  6 +--
 plugins/webp-uploads/hooks.php     |  4 +-
 plugins/webp-uploads/settings.php  | 76 +++++++++++++++---------------
 plugins/webp-uploads/uninstall.php |  2 +-
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index 745f954b0c..f57563442d 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -412,14 +412,14 @@ function webp_uploads_is_fallback_enabled(): bool {
 }
 
 /**
- * Checks if the `perflab_generate_fallback_all_sizes` option is enabled.
+ * Checks if the `perflab_generate_all_fallback_sizes` option is enabled.
  *
  * @since n.e.x.t
  *
  * @return bool True if the option is enabled, false otherwise.
  */
-function webp_uploads_is_fallback_all_sizes_enabled(): bool {
-	return (bool) get_option( 'perflab_generate_fallback_all_sizes' );
+function webp_uploads_should_generate_all_fallback_sizes(): bool {
+	return (bool) get_option( 'perflab_generate_all_fallback_sizes' );
 }
 
 /**
diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
index cb5ae8bae2..f3d8a6dc2e 100644
--- a/plugins/webp-uploads/hooks.php
+++ b/plugins/webp-uploads/hooks.php
@@ -724,7 +724,7 @@ function webp_uploads_get_image_sizes_additional_mime_type_support(): array {
 			$allowed_sizes[ $size ] = (bool) $size_details['provide_additional_mime_types'];
 		} else {
 			// If 'provide_additional_mime_types' is not set, use the fallback all sizes setting.
-			$allowed_sizes[ $size ] = webp_uploads_is_fallback_all_sizes_enabled();
+			$allowed_sizes[ $size ] = webp_uploads_should_generate_all_fallback_sizes();
 		}
 	}
 
@@ -771,7 +771,7 @@ function webp_uploads_render_generator(): void {
 	// Use the plugin slug as it is immutable.
 	echo '<meta name="generator" content="webp-uploads ' . esc_attr( WEBP_UPLOADS_VERSION ) . '">' . "\n";
 
-	if ( webp_uploads_is_fallback_all_sizes_enabled() ) {
+	if ( webp_uploads_should_generate_all_fallback_sizes() ) {
 		echo '<meta name="generator" content="webp-uploads-fallback-all-sizes ' . esc_attr( WEBP_UPLOADS_VERSION ) . '">' . "\n";
 	}
 }
diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index 3f701ae819..c2d78da889 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -44,7 +44,7 @@ function webp_uploads_register_media_settings_field(): void {
 	// Add a setting to generate fallback images in all sizes including custom sizes.
 	register_setting(
 		'media',
-		'perflab_generate_fallback_all_sizes',
+		'perflab_generate_all_fallback_sizes',
 		array(
 			'type'         => 'boolean',
 			'default'      => false,
@@ -110,9 +110,9 @@ function webp_uploads_add_media_settings_fields(): void {
 
 	// Add setting field for generating fallback images in all sizes including custom sizes.
 	add_settings_field(
-		'perflab_generate_fallback_all_sizes',
-		__( 'Output all fallback images', 'webp-uploads' ),
-		'webp_uploads_generate_fallback_all_sizes_callback',
+		'perflab_generate_all_fallback_sizes',
+		__( 'Generate all fallback image sizes', 'webp-uploads' ),
+		'webp_uploads_generate_all_fallback_sizes_callback',
 		'media',
 		'perflab_modern_image_format_settings',
 		array( 'class' => 'perflab-generate-fallback-all-sizes' )
@@ -202,34 +202,34 @@ function webp_uploads_generate_webp_jpeg_setting_callback(): void {
 
 
 /**
- * Renders the settings field for generating fallback images in all sizes.
+ * Renders the settings field for generating all fallback image sizes.
  *
  * @since n.e.x.t
  */
-function webp_uploads_generate_fallback_all_sizes_callback(): void {
-	$fallback_all_sizes_enabled   = 1 === (int) get_option( 'perflab_generate_fallback_all_sizes', 0 );
+function webp_uploads_generate_all_fallback_sizes_callback(): void {
+	$all_fallback_sizes_enabled   = 1 === (int) get_option( 'perflab_generate_all_fallback_sizes', 0 );
 	$fallback_enabled             = webp_uploads_is_fallback_enabled();
-	$fallback_all_sizes_hidden_id = 'perflab_generate_fallback_all_sizes_hidden';
+	$all_fallback_sizes_hidden_id = 'perflab_generate_all_fallback_sizes_hidden';
 
 	?>
 	<style>
-		#perflab_generate_fallback_all_sizes_fieldset.disabled label,
-		#perflab_generate_fallback_all_sizes_fieldset.disabled p {
+		#perflab_generate_all_fallback_sizes_fieldset.disabled label,
+		#perflab_generate_all_fallback_sizes_fieldset.disabled p {
 			opacity: 0.7;
 		}
 	</style>
-	<div id="perflab_generate_fallback_all_sizes_notice" class="notice notice-info inline" <?php echo $fallback_enabled ? 'hidden' : ''; ?>>
+	<div id="perflab_generate_all_fallback_sizes_notice" class="notice notice-info inline" <?php echo $fallback_enabled ? 'hidden' : ''; ?>>
 		<p><?php esc_html_e( 'This setting requires fallback image output to be enabled.', 'webp-uploads' ); ?></p>
 	</div>
-	<div id="perflab_generate_fallback_all_sizes_fieldset" class="<?php echo ! $fallback_enabled ? 'disabled' : ''; ?>">
-		<label for="perflab_generate_fallback_all_sizes" id="perflab_generate_fallback_all_sizes_label">
+	<div id="perflab_generate_all_fallback_sizes_fieldset" class="<?php echo ! $fallback_enabled ? 'disabled' : ''; ?>">
+		<label for="perflab_generate_all_fallback_sizes" id="perflab_generate_all_fallback_sizes_label">
 			<input
 				type="checkbox"
-				id="perflab_generate_fallback_all_sizes"
-				name="perflab_generate_fallback_all_sizes"
-				aria-describedby="perflab_generate_fallback_all_sizes_description"
+				id="perflab_generate_all_fallback_sizes"
+				name="perflab_generate_all_fallback_sizes"
+				aria-describedby="perflab_generate_all_fallback_sizes_description"
 				value="1"
-				<?php checked( $fallback_all_sizes_enabled ); ?>
+				<?php checked( $all_fallback_sizes_enabled ); ?>
 				<?php disabled( ! $fallback_enabled ); ?>
 			>
 			<?php
@@ -237,53 +237,53 @@ function webp_uploads_generate_fallback_all_sizes_callback(): void {
 			 * If the checkbox is disabled, but the option is enabled, include a hidden input to continue sending the
 			 * same value upon form submission.
 			 */
-			if ( ! $fallback_enabled && $fallback_all_sizes_enabled ) {
+			if ( ! $fallback_enabled && $all_fallback_sizes_enabled ) {
 				?>
 				<input
 					type="hidden"
-					id="<?php echo esc_attr( $fallback_all_sizes_hidden_id ); ?>"
-					name="perflab_generate_fallback_all_sizes"
+					id="<?php echo esc_attr( $all_fallback_sizes_hidden_id ); ?>"
+					name="perflab_generate_all_fallback_sizes"
 					value="1"
 				>
 				<?php
 			}
-			esc_html_e( 'Generate fallback images in all sizes including custom sizes', 'webp-uploads' );
+			esc_html_e( 'Generate all fallback image sizes including custom sizes', 'webp-uploads' );
 			?>
 		</label>
-		<p class="description" id="perflab_generate_fallback_all_sizes_description"><?php esc_html_e( 'Enabling this option will generate fallback images in all sizes including custom sizes. Note: uses even more storage space.', 'webp-uploads' ); ?></p>
+		<p class="description" id="perflab_generate_all_fallback_sizes_description"><?php esc_html_e( 'Enabling this option will generate all fallback image sizes including custom sizes. Note: uses even more storage space.', 'webp-uploads' ); ?></p>
 	</div>
 	<script>
-	( function ( fallbackAllSizesHiddenId ) {
+	( function ( allFallbackSizesHiddenId ) {
 		const fallbackCheckbox = document.getElementById( 'perflab_generate_webp_and_jpeg' );
-		const fallbackAllSizesCheckbox = document.getElementById( 'perflab_generate_fallback_all_sizes' );
-		const fallbackAllSizesFieldset = document.getElementById( 'perflab_generate_fallback_all_sizes_fieldset' );
-		const fallbackAllSizesNotice = document.getElementById( 'perflab_generate_fallback_all_sizes_notice' );
+		const allFallbackSizesCheckbox = document.getElementById( 'perflab_generate_all_fallback_sizes' );
+		const allFallbackSizesFieldset = document.getElementById( 'perflab_generate_all_fallback_sizes_fieldset' );
+		const allFallbackSizesNotice = document.getElementById( 'perflab_generate_all_fallback_sizes_notice' );
 
-		function toggleFallbackAllSizes() {
+		function toggleAllFallbackSizes() {
 			const fallbackEnabled = fallbackCheckbox.checked;
-			fallbackAllSizesFieldset.classList.toggle( 'disabled', ! fallbackEnabled );
-			fallbackAllSizesCheckbox.disabled = ! fallbackEnabled;
-			fallbackAllSizesNotice.hidden = fallbackEnabled;
+			allFallbackSizesFieldset.classList.toggle( 'disabled', ! fallbackEnabled );
+			allFallbackSizesCheckbox.disabled = ! fallbackEnabled;
+			allFallbackSizesNotice.hidden = fallbackEnabled;
 
 			// Remove or inject hidden input to preserve original setting value as needed.
 			if ( fallbackEnabled ) {
-				const hiddenInput = document.getElementById( fallbackAllSizesHiddenId );
+				const hiddenInput = document.getElementById( allFallbackSizesHiddenId );
 				if ( hiddenInput ) {
 					hiddenInput.parentElement.removeChild( hiddenInput );
 				}
-			} else if ( fallbackAllSizesCheckbox.checked && ! document.getElementById( fallbackAllSizesHiddenId ) ) {
+			} else if ( allFallbackSizesCheckbox.checked && ! document.getElementById( allFallbackSizesHiddenId ) ) {
 				// The hidden input is only needed if the value was originally set (i.e., the checkbox enabled).
 				const hiddenInput = document.createElement( 'input' );
 				hiddenInput.type = 'hidden';
-				hiddenInput.id = fallbackAllSizesHiddenId;
-				hiddenInput.name = fallbackAllSizesCheckbox.name;
-				hiddenInput.value = fallbackAllSizesCheckbox.value;
-				fallbackAllSizesCheckbox.parentElement.insertBefore( hiddenInput, fallbackAllSizesCheckbox.nextSibling );
+				hiddenInput.id = allFallbackSizesHiddenId;
+				hiddenInput.name = allFallbackSizesCheckbox.name;
+				hiddenInput.value = allFallbackSizesCheckbox.value;
+				allFallbackSizesCheckbox.parentElement.insertBefore( hiddenInput, allFallbackSizesCheckbox.nextSibling );
 			}
 		}
 
-		fallbackCheckbox.addEventListener( 'change', toggleFallbackAllSizes );
-	} )( <?php echo wp_json_encode( $fallback_all_sizes_hidden_id ); ?> );
+		fallbackCheckbox.addEventListener( 'change', toggleAllFallbackSizes );
+	} )( <?php echo wp_json_encode( $all_fallback_sizes_hidden_id ); ?> );
 	</script>
 	<?php
 }
diff --git a/plugins/webp-uploads/uninstall.php b/plugins/webp-uploads/uninstall.php
index 6238df06c2..8b3fae0aee 100644
--- a/plugins/webp-uploads/uninstall.php
+++ b/plugins/webp-uploads/uninstall.php
@@ -38,5 +38,5 @@
  */
 function webp_uploads_delete_plugin_option(): void {
 	delete_option( 'perflab_generate_webp_and_jpeg' );
-	delete_option( 'perflab_generate_fallback_all_sizes' );
+	delete_option( 'perflab_generate_all_fallback_sizes' );
 }

From 6ddd884971a93cbfaeb242d3317aaa1f60d56731 Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Fri, 22 Nov 2024 17:51:03 +0530
Subject: [PATCH 05/11] Move logic to separate function

---
 plugins/webp-uploads/hooks.php | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
index f3d8a6dc2e..351b8e2f3e 100644
--- a/plugins/webp-uploads/hooks.php
+++ b/plugins/webp-uploads/hooks.php
@@ -719,13 +719,7 @@ function webp_uploads_get_image_sizes_additional_mime_type_support(): array {
 	);
 
 	foreach ( $additional_sizes as $size => $size_details ) {
-		if ( isset( $size_details['provide_additional_mime_types'] ) ) {
-			// Give priority to the 'provide_additional_mime_types' property.
-			$allowed_sizes[ $size ] = (bool) $size_details['provide_additional_mime_types'];
-		} else {
-			// If 'provide_additional_mime_types' is not set, use the fallback all sizes setting.
-			$allowed_sizes[ $size ] = webp_uploads_should_generate_all_fallback_sizes();
-		}
+		$allowed_sizes[ $size ] = ! empty( $size_details['provide_additional_mime_types'] );
 	}
 
 	/**
@@ -816,3 +810,25 @@ function webp_uploads_opt_in_extra_image_sizes(): void {
 	}
 }
 add_action( 'plugins_loaded', 'webp_uploads_opt_in_extra_image_sizes' );
+
+/**
+ * Enables additional MIME type support for all image sizes based on the generate all fallback sizes settings.
+ *
+ * @since n.e.x.t
+ *
+ * @param array<string, bool> $allowed_sizes A map of image size names and whether they are allowed to have additional MIME types.
+ *
+ * @return array<string, bool> Modified map of image sizes with additional MIME type support.
+ */
+function webp_uploads_enable_additional_mime_type_support_for_all_sizes( array $allowed_sizes ): array {
+	if ( ! webp_uploads_should_generate_all_fallback_sizes() ) {
+		return $allowed_sizes;
+	}
+
+	foreach ( array_keys( $allowed_sizes ) as $size ) {
+		$allowed_sizes[ $size ] = true;
+	}
+
+	return $allowed_sizes;
+}
+add_filter( 'webp_uploads_image_sizes_with_additional_mime_type_support', 'webp_uploads_enable_additional_mime_type_support_for_all_sizes' );

From b80a9b0e5790f03b22db8be1620a210700d0a9cf Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Mon, 25 Nov 2024 19:31:40 +0530
Subject: [PATCH 06/11] Remove generator tag

---
 plugins/webp-uploads/hooks.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
index 351b8e2f3e..b4db41861d 100644
--- a/plugins/webp-uploads/hooks.php
+++ b/plugins/webp-uploads/hooks.php
@@ -764,10 +764,6 @@ function webp_uploads_modify_webp_quality( int $quality, string $mime_type ): in
 function webp_uploads_render_generator(): void {
 	// Use the plugin slug as it is immutable.
 	echo '<meta name="generator" content="webp-uploads ' . esc_attr( WEBP_UPLOADS_VERSION ) . '">' . "\n";
-
-	if ( webp_uploads_should_generate_all_fallback_sizes() ) {
-		echo '<meta name="generator" content="webp-uploads-fallback-all-sizes ' . esc_attr( WEBP_UPLOADS_VERSION ) . '">' . "\n";
-	}
 }
 add_action( 'wp_head', 'webp_uploads_render_generator' );
 

From 4fdbcc06d6fa0866f356d7653d45d26ff62b3e33 Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Mon, 2 Dec 2024 14:55:41 +0530
Subject: [PATCH 07/11] Fix fallback option retrieval and clean up docblock in
 webp uploads plugin

---
 plugins/webp-uploads/helper.php | 2 +-
 plugins/webp-uploads/hooks.php  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index f57563442d..2d8e1784ed 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -419,7 +419,7 @@ function webp_uploads_is_fallback_enabled(): bool {
  * @return bool True if the option is enabled, false otherwise.
  */
 function webp_uploads_should_generate_all_fallback_sizes(): bool {
-	return (bool) get_option( 'perflab_generate_all_fallback_sizes' );
+	return (bool) get_option( 'perflab_generate_all_fallback_sizes', 0 );
 }
 
 /**
diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
index b4db41861d..0e36bbca5a 100644
--- a/plugins/webp-uploads/hooks.php
+++ b/plugins/webp-uploads/hooks.php
@@ -813,7 +813,6 @@ function webp_uploads_opt_in_extra_image_sizes(): void {
  * @since n.e.x.t
  *
  * @param array<string, bool> $allowed_sizes A map of image size names and whether they are allowed to have additional MIME types.
- *
  * @return array<string, bool> Modified map of image sizes with additional MIME type support.
  */
 function webp_uploads_enable_additional_mime_type_support_for_all_sizes( array $allowed_sizes ): array {

From 3a647137c35afd2d2fe57d7af7a80c653d3defa4 Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Mon, 2 Dec 2024 15:00:35 +0530
Subject: [PATCH 08/11] Use existing function for getting option value

---
 plugins/webp-uploads/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index c2d78da889..cad0352e11 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -207,7 +207,7 @@ function webp_uploads_generate_webp_jpeg_setting_callback(): void {
  * @since n.e.x.t
  */
 function webp_uploads_generate_all_fallback_sizes_callback(): void {
-	$all_fallback_sizes_enabled   = 1 === (int) get_option( 'perflab_generate_all_fallback_sizes', 0 );
+	$all_fallback_sizes_enabled   = webp_uploads_should_generate_all_fallback_sizes();
 	$fallback_enabled             = webp_uploads_is_fallback_enabled();
 	$all_fallback_sizes_hidden_id = 'perflab_generate_all_fallback_sizes_hidden';
 

From 36fbfd7623a2067e5d9cd9f6c85b44f06be7869e Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Tue, 3 Dec 2024 23:41:04 +0530
Subject: [PATCH 09/11] Update docblock for
 webp_uploads_should_generate_all_fallback_sizes function

---
 plugins/webp-uploads/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index 2d8e1784ed..95fc15e18e 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -416,7 +416,7 @@ function webp_uploads_is_fallback_enabled(): bool {
  *
  * @since n.e.x.t
  *
- * @return bool True if the option is enabled, false otherwise.
+ * @return bool Whether the option is enabled. Default is false.
  */
 function webp_uploads_should_generate_all_fallback_sizes(): bool {
 	return (bool) get_option( 'perflab_generate_all_fallback_sizes', 0 );

From e29a33ee1dc4dc9c46f6996505a58f14c39c2935 Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Wed, 4 Dec 2024 23:15:16 +0530
Subject: [PATCH 10/11] Add test case for generating fallback images for all
 sizes option enabled

---
 plugins/webp-uploads/tests/test-load.php | 40 ++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/plugins/webp-uploads/tests/test-load.php b/plugins/webp-uploads/tests/test-load.php
index 69ff75be07..3539fc17da 100644
--- a/plugins/webp-uploads/tests/test-load.php
+++ b/plugins/webp-uploads/tests/test-load.php
@@ -1045,4 +1045,44 @@ public function temp_filename(): string {
 
 		return $filename;
 	}
+
+	/**
+	 * Test that fallback images are generated for all sizes when the `perflab_generate_all_fallback_sizes` option is enabled.
+	 *
+	 * @dataProvider data_provider_supported_image_types
+	 *
+	 * @param string $image_type The image type.
+	 */
+	public function test_it_should_generate_fallback_images_for_all_sizes_when_generate_all_fallback_sizes_option_is_enabled( string $image_type ): void {
+		$mime_type = 'image/' . $image_type;
+
+		// Ensure the MIME type is supported; skip the test if not.
+		if ( ! webp_uploads_mime_type_supported( $mime_type ) ) {
+			$this->markTestSkipped( 'Mime type ' . $mime_type . ' is not supported.' );
+		}
+
+		// Register custom image sizes.
+		add_image_size( 'custom_size_1', 200, 200, true );
+		add_image_size( 'custom_size_2', 400, 400, true );
+
+		// Generate image output type and fallback image.
+		update_option( 'perflab_generate_webp_and_jpeg', true );
+
+		// Generate fallback images for all sizes.
+		update_option( 'perflab_generate_all_fallback_sizes', true );
+
+		$this->set_image_output_type( $image_type );
+
+		$attachment_id = self::factory()->attachment->create_upload_object( TESTS_PLUGIN_DIR . '/tests/data/images/leaves.jpg' );
+
+		// Clean up custom sizes.
+		remove_image_size( 'custom_size_1' );
+		remove_image_size( 'custom_size_2' );
+
+		// Verify that fallback images are generated for custom sizes.
+		foreach ( array( 'custom_size_1', 'custom_size_2' ) as $size_name ) {
+			$this->assertImageHasSizeSource( $attachment_id, $size_name, 'image/jpeg' );
+			$this->assertImageHasSizeSource( $attachment_id, $size_name, $mime_type );
+		}
+	}
 }

From 10e0c39982038fa2470f5d4de64fb5a6d50e211e Mon Sep 17 00:00:00 2001
From: b1ink0 <aditya.dhade@rtcamp.com>
Date: Fri, 6 Dec 2024 19:23:01 +0530
Subject: [PATCH 11/11] Cleanup test attachment after assertions

---
 plugins/webp-uploads/tests/test-load.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/webp-uploads/tests/test-load.php b/plugins/webp-uploads/tests/test-load.php
index 3539fc17da..8935827664 100644
--- a/plugins/webp-uploads/tests/test-load.php
+++ b/plugins/webp-uploads/tests/test-load.php
@@ -1084,5 +1084,7 @@ public function test_it_should_generate_fallback_images_for_all_sizes_when_gener
 			$this->assertImageHasSizeSource( $attachment_id, $size_name, 'image/jpeg' );
 			$this->assertImageHasSizeSource( $attachment_id, $size_name, $mime_type );
 		}
+
+		wp_delete_attachment( $attachment_id );
 	}
 }