From 150a1f78bec1c2438ea38d8150aa3108fdfa41a4 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Wed, 31 Jul 2024 08:23:11 -0600
Subject: [PATCH 01/15] Also convert PNGs

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

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index 842aad737..ced30c2cb 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -29,6 +29,7 @@ function webp_uploads_get_upload_image_mime_transforms(): array {
 		'image/jpeg' => array( 'image/' . $output_format ),
 		'image/webp' => array( 'image/webp' ),
 		'image/avif' => array( 'image/avif' ),
+		'image/png'  => array( 'image/' . $output_format ),
 	);
 
 	// Check setting for whether to generate both JPEG and the modern output format.

From 358e1bf26293e392b858b5bcbcb2608d941d4bd2 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Wed, 31 Jul 2024 11:42:25 -0600
Subject: [PATCH 02/15] Adjust defaults for
 test_it_should_return_default_transforms_when_filter_returns_non_array_type
 test

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

diff --git a/plugins/webp-uploads/tests/test-helper.php b/plugins/webp-uploads/tests/test-helper.php
index a0d6b761c..4dba070b5 100644
--- a/plugins/webp-uploads/tests/test-helper.php
+++ b/plugins/webp-uploads/tests/test-helper.php
@@ -367,12 +367,14 @@ public function test_it_should_return_default_transforms_when_filter_returns_non
 				'image/jpeg' => array( 'image/avif' ),
 				'image/webp' => array( 'image/webp' ),
 				'image/avif' => array( 'image/avif' ),
+				'image/png'  => array( 'image/avif' ),
 			);
 		} else {
 			$default_transforms = array(
 				'image/jpeg' => array( 'image/webp' ),
 				'image/webp' => array( 'image/webp' ),
 				'image/avif' => array( 'image/avif' ),
+				'image/png'  => array( 'image/webp' ),
 			);
 		}
 

From 7c5d47de12e52547674b8bf79020feaa548cc8c2 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 08:01:07 -0600
Subject: [PATCH 03/15] Change language for fallback toggle, removing JPEG
 references

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

diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index dd8c8ed16..5a5d837b7 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -173,11 +173,11 @@ function webp_uploads_generate_webp_jpeg_setting_callback(): void {
 	?>
 		<label for="perflab_generate_webp_and_jpeg">
 			<input name="perflab_generate_webp_and_jpeg" type="checkbox" id="perflab_generate_webp_and_jpeg" aria-describedby="perflab_generate_webp_and_jpeg_description" value="1"<?php checked( '1', get_option( 'perflab_generate_webp_and_jpeg' ) ); ?> />
-			<?php esc_html_e( 'Output JPEG images in addition to the modern format', 'webp-uploads' ); ?>
+			<?php esc_html_e( 'Also generate fallback images in the original upload format', 'webp-uploads' ); ?>
 		</label>
-		<p class="description" id="perflab_generate_webp_and_jpeg_description"><?php esc_html_e( 'Enabling JPEG output can improve compatibility, but will increase the filesystem storage use of your images.', 'webp-uploads' ); ?></p>
+		<p class="description" id="perflab_generate_webp_and_jpeg_description"><?php esc_html_e( 'Enabling fallback image output can improve compatibility, but will increase the filesystem storage use of your images.', 'webp-uploads' ); ?></p>
 		<script>
-			// Listen for clicks on the JPEG output checkbox, enabling/disabling the
+			// Listen for clicks on the fallback output checkbox, enabling/disabling the
 			// picture element checkbox accordingly.
 			document.getElementById( 'perflab_generate_webp_and_jpeg' ).addEventListener( 'change', function () {
 				document.querySelector( '.webp-uploads-use-picture-element' ).classList.toggle( 'webp-uploads-disabled', ! this.checked );
@@ -205,7 +205,7 @@ function webp_uploads_use_picture_element_callback(): void {
 		}
 	</style>
 	<div id="webp_uploads_picture_element_notice" class="notice notice-info inline" <?php echo $jpeg_fallback_enabled ? 'hidden' : ''; ?>>
-		<p><?php esc_html_e( 'This setting requires JPEG also be output as a fallback option.', 'webp-uploads' ); ?></p>
+		<p><?php esc_html_e( 'This setting requires fallback image output to be enabled.', 'webp-uploads' ); ?></p>
 	</div>
 	<div id="webp_uploads_picture_element_fieldset" class="<?php echo ! $jpeg_fallback_enabled ? 'disabled' : ''; ?>">
 		<label for="webp_uploads_use_picture_element" id="webp_uploads_use_picture_element_label">

From bce18791605775611dd89bddf767f03dd42147c8 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 08:03:19 -0600
Subject: [PATCH 04/15] Output PNG when fallback enabled

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

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index ced30c2cb..28c5d891a 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -36,6 +36,7 @@ function webp_uploads_get_upload_image_mime_transforms(): array {
 	if ( webp_uploads_is_jpeg_fallback_enabled() ) {
 		$default_transforms = array(
 			'image/jpeg'              => array( 'image/jpeg', 'image/' . $output_format ),
+			'image/png'               => array( 'image/png', 'image/' . $output_format ),
 			'image/' . $output_format => array( 'image/' . $output_format, 'image/jpeg' ),
 		);
 	}

From 8e21acc04e0589948e0206edf440e950110d07ea Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 08:12:03 -0600
Subject: [PATCH 05/15] Update tests to include png transforms

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

diff --git a/plugins/webp-uploads/tests/test-helper.php b/plugins/webp-uploads/tests/test-helper.php
index 4dba070b5..a66154b64 100644
--- a/plugins/webp-uploads/tests/test-helper.php
+++ b/plugins/webp-uploads/tests/test-helper.php
@@ -433,6 +433,7 @@ public function test_it_should_return_jpeg_and_webp_transforms_when_option_gener
 			$this->assertSame(
 				array(
 					'image/jpeg' => array( 'image/jpeg', 'image/avif' ),
+					'image/png'  => array( 'image/png', 'image/avif' ),
 					'image/avif' => array( 'image/avif', 'image/jpeg' ),
 				),
 				$transforms
@@ -441,6 +442,7 @@ public function test_it_should_return_jpeg_and_webp_transforms_when_option_gener
 			$this->assertSame(
 				array(
 					'image/jpeg' => array( 'image/jpeg', 'image/webp' ),
+					'image/png'  => array( 'image/png', 'image/webp' ),
 					'image/webp' => array( 'image/webp', 'image/jpeg' ),
 				),
 				$transforms

From 85c829a101dd20af871e9f613f580094f695d382 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 08:30:20 -0600
Subject: [PATCH 06/15] Refine docs and checkbox for fallback image

---
 plugins/webp-uploads/readme.txt   | 2 +-
 plugins/webp-uploads/settings.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/webp-uploads/readme.txt b/plugins/webp-uploads/readme.txt
index 77bb6db11..65e19c998 100644
--- a/plugins/webp-uploads/readme.txt
+++ b/plugins/webp-uploads/readme.txt
@@ -13,7 +13,7 @@ Converts images to more modern formats such as WebP or AVIF during upload.
 
 This plugin adds WebP and AVIF support for media uploads within the WordPress application. By default, AVIF images will be generated if supported on the hosting server, otherwise WebP will be used as the output format. When both formats are available, the output format can be selected under `Settings > Media`. Modern images will be generated only for new uploads, pre-existing images will only converted to a modern format if images are regenerated. Images can be regenerated with a plugin like [Regenerate Thumbnails](https://wordpress.org/plugins/regenerate-thumbnails/) or via WP-CLI with the `wp media regenerate` [command](https://developer.wordpress.org/cli/commands/media/regenerate/).
 
-By default, only modern image format sub-sizes will be generated for JPEG uploads - only the original uploaded file will still exist as a JPEG image, generated image sizes use be WebP or AVIF files. To change this behavior, there is a checkbox in `Settings > Media` "Also output JPEG" that - when checked - will result in the plugin generating both JPEG and WebP or AVIF images for every sub-size (noting again that this will only affect newly uploaded images, i.e. after making said change).
+By default, only modern image format sub-sizes will be generated for JPEG uploads - only the original uploaded file will still exist as a JPEG image, generated image sizes use be WebP or AVIF files. To change this behavior, there is a checkbox in `Settings > Media` "Output fallback images" that - when checked - will result in the plugin generating both the original forman as well as WebP or AVIF images for every sub-size (noting again that this will only affect newly uploaded images, i.e. after making said change).
 
 _This plugin was formerly known as WebP Uploads._
 
diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index 5a5d837b7..d220e1739 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -86,10 +86,10 @@ function webp_uploads_add_media_settings_fields(): void {
 		return;
 	}
 
-	// Add JPEG Output settings field.
+	// Add fallback image output settings field.
 	add_settings_field(
 		'perflab_generate_webp_and_jpeg',
-		__( 'Also output JPEG', 'webp-uploads' ),
+		__( 'Output fallback images', 'webp-uploads' ),
 		'webp_uploads_generate_webp_jpeg_setting_callback',
 		'media',
 		'perflab_modern_image_format_settings',

From 5c77ad6b0ded4482264b1ba531e5327e49bdf8e6 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 09:13:56 -0600
Subject: [PATCH 07/15] update picture element description

---
 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 d220e1739..a2b18e8f0 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -213,7 +213,7 @@ function webp_uploads_use_picture_element_callback(): void {
 			<?php esc_html_e( 'Use <picture> Element', 'webp-uploads' ); ?>
 			<em><?php esc_html_e( '(experimental)', 'webp-uploads' ); ?></em>
 		</label>
-		<p class="description" id="webp_uploads_use_picture_element_description"><?php esc_html_e( 'The picture element serves a modern image format with a fallback to JPEG. Warning: Make sure you test your theme and plugins for compatibility. In particular, CSS selectors will not match images when using the child combinator (e.g. figure > img).', 'webp-uploads' ); ?></p>
+		<p class="description" id="webp_uploads_use_picture_element_description"><?php esc_html_e( 'The picture element serves a modern image format with a fallback to the original upload format. Warning: Make sure you test your theme and plugins for compatibility. In particular, CSS selectors will not match images when using the child combinator (e.g. figure > img).', 'webp-uploads' ); ?></p>
 	</div>
 	<?php
 }

From 06b36f1a6df73c88703ddef2092008cb60a936c2 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 10:20:56 -0600
Subject: [PATCH 08/15] Enable PNG in picture element

---
 plugins/webp-uploads/picture-element.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/webp-uploads/picture-element.php b/plugins/webp-uploads/picture-element.php
index 1d9a96388..04987c86f 100644
--- a/plugins/webp-uploads/picture-element.php
+++ b/plugins/webp-uploads/picture-element.php
@@ -59,6 +59,7 @@ function webp_uploads_wrap_image_in_picture( string $image, string $context, int
 			'image/avif',
 			'image/webp',
 			'image/jpeg',
+			'image/png',
 		),
 		$attachment_id
 	);

From 0b14a5bffd3ba7a160e398ac028ae978420e34af Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 10:27:59 -0600
Subject: [PATCH 09/15] update doc block for
 webp_uploads_picture_element_mime_types filter

---
 plugins/webp-uploads/picture-element.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/webp-uploads/picture-element.php b/plugins/webp-uploads/picture-element.php
index 04987c86f..021e5a461 100644
--- a/plugins/webp-uploads/picture-element.php
+++ b/plugins/webp-uploads/picture-element.php
@@ -44,12 +44,14 @@ function webp_uploads_wrap_image_in_picture( string $image, string $context, int
 	/**
 	 * Filter the image mime types that can be used for the <picture> element.
 	 *
-	 * Default is: ['image/avif', 'image/webp', 'image/jpeg']. Returning an empty array will skip using the `picture` element.
+	 * Default is: ['image/avif', 'image/webp', 'image/jpeg', 'image/png]. Returning an empty array will skip using the `picture` element.
 	 *
 	 * The mime types will output in the picture element in the order they are provided.
 	 * The original image will be used as the fallback image for browsers that don't support the picture element.
 	 *
 	 * @since 2.0.0
+	 * @since n.e.x.t. The 'image/png' mime type was added to the default array.
+	 *
 	 * @param string[] $mime_types    Mime types than can be used.
 	 * @param int      $attachment_id The id of the image being evaluated.
 	 */

From a4ae0c9d5504bfbbcdf292abd1cf6b0eb41af0cf Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Thu, 8 Aug 2024 14:06:44 -0600
Subject: [PATCH 10/15] remove reference to JPEG in uploaded image handling

---
 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 a2b18e8f0..cd9911241 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -145,7 +145,7 @@ function webp_uploads_generate_avif_webp_setting_callback(): void {
 	<label for="perflab_modern_image_format">
 		<?php esc_html_e( 'Generate images in this format', 'webp-uploads' ); ?>
 	</label>
-	<p class="description" id="perflab_modern_image_format_description"><?php esc_html_e( 'Select the format to use when generating new images from uploaded JPEGs.', 'webp-uploads' ); ?></p>
+	<p class="description" id="perflab_modern_image_format_description"><?php esc_html_e( 'Select the format to use when generating new images from uploaded images.', 'webp-uploads' ); ?></p>
 	<?php if ( ! $avif_supported ) : ?>
 		<br />
 		<div class="notice notice-warning inline">

From c8e613c94de038d0fe79f6c58aeae82bcda202ca Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Mon, 26 Aug 2024 09:25:16 -0600
Subject: [PATCH 11/15] remove merge artifact

---
 plugins/webp-uploads/settings.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index 618c9c231..3740c7012 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -175,16 +175,6 @@ function webp_uploads_generate_webp_jpeg_setting_callback(): void {
 			<?php esc_html_e( 'Also generate fallback images in the original upload format', 'webp-uploads' ); ?>
 		</label>
 		<p class="description" id="perflab_generate_webp_and_jpeg_description"><?php esc_html_e( 'Enabling fallback image output can improve compatibility, but will increase the filesystem storage use of your images.', 'webp-uploads' ); ?></p>
-		<script>
-			// Listen for clicks on the fallback output checkbox, enabling/disabling the
-			// picture element checkbox accordingly.
-			document.getElementById( 'perflab_generate_webp_and_jpeg' ).addEventListener( 'change', function () {
-				document.querySelector( '.webp-uploads-use-picture-element' ).classList.toggle( 'webp-uploads-disabled', ! this.checked );
-				document.getElementById( 'webp_uploads_picture_element_notice' ).hidden = this.checked;
-				document.getElementById( 'webp_uploads_use_picture_element' ).classList.toggle( 'disabled', ! this.checked );
-				document.getElementById( 'webp_uploads_picture_element_fieldset' ).classList.toggle( 'disabled', ! this.checked );
-			} );
-		</script>
 	<?php
 }
 

From 18b760d3c550766d9988415044c241071b6b5344 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Mon, 26 Aug 2024 12:09:51 -0600
Subject: [PATCH 12/15] small language fine tuning

---
 plugins/webp-uploads/readme.txt   | 2 +-
 plugins/webp-uploads/settings.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/webp-uploads/readme.txt b/plugins/webp-uploads/readme.txt
index 74ddd8a55..e53deb792 100644
--- a/plugins/webp-uploads/readme.txt
+++ b/plugins/webp-uploads/readme.txt
@@ -13,7 +13,7 @@ Converts images to more modern formats such as WebP or AVIF during upload.
 
 This plugin adds WebP and AVIF support for media uploads within the WordPress application. By default, AVIF images will be generated if supported on the hosting server, otherwise WebP will be used as the output format. When both formats are available, the output format can be selected under `Settings > Media`. Modern images will be generated only for new uploads, pre-existing images will only converted to a modern format if images are regenerated. Images can be regenerated with a plugin like [Regenerate Thumbnails](https://wordpress.org/plugins/regenerate-thumbnails/) or via WP-CLI with the `wp media regenerate` [command](https://developer.wordpress.org/cli/commands/media/regenerate/).
 
-By default, only modern image format sub-sizes will be generated for JPEG uploads - only the original uploaded file will still exist as a JPEG image, generated image sizes use be WebP or AVIF files. To change this behavior, there is a checkbox in `Settings > Media` "Output fallback images" that - when checked - will result in the plugin generating both the original forman as well as WebP or AVIF images for every sub-size (noting again that this will only affect newly uploaded images, i.e. after making said change).
+By default, only modern image format sub-sizes will be generated for JPEG or PNG uploads - only the original uploaded file will still exist as a JPEG/PNG image, generated image sizes will be WebP or AVIF files. To change this behavior, there is a checkbox in `Settings > Media` "Output fallback images" that - when checked - will result in the plugin generating both the original format as well as WebP or AVIF images for every sub-size (noting again that this will only affect newly uploaded images, i.e. after making said change).
 
 _This plugin was formerly known as WebP Uploads._
 
diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index 3740c7012..894044af8 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -230,7 +230,7 @@ function webp_uploads_use_picture_element_callback(): void {
 		</label>
 		<p class="description" id="webp_uploads_use_picture_element_description"><?php esc_html_e( 'The picture element serves a modern image format with a fallback to the original upload format. Warning: Make sure you test your theme and plugins for compatibility. In particular, CSS selectors will not match images when using the child combinator (e.g. figure > img).', 'webp-uploads' ); ?></p>
 		<div id="webp_uploads_jpeg_fallback_notice" class="notice notice-info inline" <?php echo $picture_element_option ? '' : 'hidden'; ?>>
-			<p><?php esc_html_e( 'Picture elements will only be used when JPEG fallback images are available. So this will not apply to any images you may have uploaded while the "Also generate JPEG" setting was disabled.', 'webp-uploads' ); ?></p>
+			<p><?php esc_html_e( 'Picture elements will only be used when fallback images are available. So this will only apply to  images you have uploaded while the "Also generate fallback images" setting was enabled.', 'webp-uploads' ); ?></p>
 		</div>
 	</div>
 	<script>
@@ -239,7 +239,7 @@ function webp_uploads_use_picture_element_callback(): void {
 			document.getElementById( 'webp_uploads_jpeg_fallback_notice' ).hidden = ! this.checked;
 		} );
 
-		// Listen for clicks on the JPEG output checkbox, enabling/disabling the
+		// Listen for clicks on the fallback output checkbox, enabling/disabling the
 		// picture element checkbox accordingly.
 		document.getElementById( 'perflab_generate_webp_and_jpeg' ).addEventListener( 'change', function () {
 			document.querySelector( '.webp-uploads-use-picture-element' ).classList.toggle( 'webp-uploads-disabled', ! this.checked );

From 5189b359722691ebced6ab2dfc82d7dac4d6e77d Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@earthboundhosting.com>
Date: Thu, 29 Aug 2024 07:34:04 -0600
Subject: [PATCH 13/15] Update plugins/webp-uploads/picture-element.php

Co-authored-by: Mukesh Panchal <mukeshpanchal27@users.noreply.github.com>
---
 plugins/webp-uploads/picture-element.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/webp-uploads/picture-element.php b/plugins/webp-uploads/picture-element.php
index c52055968..e5ea68cbf 100644
--- a/plugins/webp-uploads/picture-element.php
+++ b/plugins/webp-uploads/picture-element.php
@@ -56,7 +56,7 @@ function webp_uploads_wrap_image_in_picture( string $image, string $context, int
 	/**
 	 * Filter the image mime types that can be used for the <picture> element.
 	 *
-	 * Default is: ['image/avif', 'image/webp', 'image/jpeg', 'image/png]. Returning an empty array will skip using the `picture` element.
+	 * Default is: ['image/avif', 'image/webp']. Returning an empty array will skip using the `picture` element.
 	 *
 	 * The mime types will output in the picture element in the order they are provided.
 	 * The original image will be used as the fallback image for browsers that don't support the picture element.

From 3d60d82db879e7fa2259b073592804020e246cf5 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 30 Aug 2024 08:11:15 -0600
Subject: [PATCH 14/15] Rename
 webp_uploads_is_jpeg_fallback_enabled->webp_uploads_is_fallback_enabled

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

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index 4b57c1a8a..32b350e0a 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -33,7 +33,7 @@ function webp_uploads_get_upload_image_mime_transforms(): array {
 	);
 
 	// Check setting for whether to generate both JPEG and the modern output format.
-	if ( webp_uploads_is_jpeg_fallback_enabled() ) {
+	if ( webp_uploads_is_fallback_enabled() ) {
 		$default_transforms = array(
 			'image/jpeg'              => array( 'image/jpeg', 'image/' . $output_format ),
 			'image/png'               => array( 'image/png', 'image/' . $output_format ),
@@ -395,7 +395,7 @@ function webp_uploads_sanitize_image_format( $image_format ): string {
  * @return bool True if the option is enabled, false otherwise.
  */
 function webp_uploads_is_picture_element_enabled(): bool {
-	return webp_uploads_is_jpeg_fallback_enabled() && (bool) get_option( 'webp_uploads_use_picture_element', false );
+	return webp_uploads_is_fallback_enabled() && (bool) get_option( 'webp_uploads_use_picture_element', false );
 }
 
 /**
@@ -405,7 +405,7 @@ function webp_uploads_is_picture_element_enabled(): bool {
  *
  * @return bool True if the option is enabled, false otherwise.
  */
-function webp_uploads_is_jpeg_fallback_enabled(): bool {
+function webp_uploads_is_fallback_enabled(): bool {
 	return (bool) get_option( 'perflab_generate_webp_and_jpeg' );
 }
 
diff --git a/plugins/webp-uploads/settings.php b/plugins/webp-uploads/settings.php
index 894044af8..c44d6c452 100644
--- a/plugins/webp-uploads/settings.php
+++ b/plugins/webp-uploads/settings.php
@@ -186,7 +186,7 @@ function webp_uploads_generate_webp_jpeg_setting_callback(): void {
 function webp_uploads_use_picture_element_callback(): void {
 	// Picture element support requires the JPEG output to be enabled.
 	$picture_element_option    = 1 === (int) get_option( 'webp_uploads_use_picture_element', 0 );
-	$jpeg_fallback_enabled     = webp_uploads_is_jpeg_fallback_enabled();
+	$jpeg_fallback_enabled     = webp_uploads_is_fallback_enabled();
 	$picture_element_hidden_id = 'webp_uploads_use_picture_element_hidden';
 	?>
 	<style>

From 9bf832ed8c388c106116a68cb052deb35b833b29 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Wed, 4 Sep 2024 10:29:01 -0600
Subject: [PATCH 15/15] Add some additional @since notations

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

diff --git a/plugins/webp-uploads/helper.php b/plugins/webp-uploads/helper.php
index 32b350e0a..2c11f141c 100644
--- a/plugins/webp-uploads/helper.php
+++ b/plugins/webp-uploads/helper.php
@@ -17,6 +17,7 @@
  *
  * @since 1.0.0
  * @since 2.0.0 Added support for AVIF.
+ * @since n.e.x.t Added support for PNG.
  *
  * @return array<string, array<string>> An array of valid mime types, where the key is the mime type and the value is the extension type.
  */
@@ -402,6 +403,7 @@ function webp_uploads_is_picture_element_enabled(): bool {
  * Checks if the `perflab_generate_webp_and_jpeg` option is enabled.
  *
  * @since 2.0.0
+ * @since n.e.x.t Renamed to webp_uploads_is_fallback_enabled().
  *
  * @return bool True if the option is enabled, false otherwise.
  */