Changeset 50814 for trunk/src/wp-includes/media.php

Timestamp:

05/05/2021 05:06:17 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Media: Some documentation and test improvements for WebP support:

• Document that WebP constants are only defined in PHP 7.1+.
• Correct the $filename parameter type in wp_get_webp_info().
• Use a consistent message when skipping tests due to the lack of WebP support.
• Remove unnecessary else branches after markTestSkipped().
• Replace assertEquals() with more appropriate assertions.

Follow-up to [50810].

See #35725.

File:

• trunk/src/wp-includes/media.php (modified) (6 diffs)

trunk/src/wp-includes/media.php

@@ -5025 +5025 @@
  * @since 5.8.0
  *
- * @param [type] $filename Path to a WebP file.
+ * @param string $filename Path to a WebP file.
  * @return array $webp_info {
  *     An array of WebP image information.
@@ -5039 +5039 @@
         $height = false;
         $type   = false;
+
         if ( ! 'image/webp' === wp_get_image_mime( $filename ) ) {
                 return compact( 'width', 'height', 'type' );
         }
+
         try {
                 $handle = fopen( $filename, 'rb' );
@@ -5084 +5086 @@
         } catch ( Exception $e ) {
         }
+
         return compact( 'width', 'height', 'type' );
 }
@@ -5098 +5101 @@
         $webp_info = wp_get_webp_info( $filename );
         $type      = $webp_info['type'];
+
         return $type && 'lossy' === $type;
 }
@@ -5114 +5118 @@
         // Try getimagesize() first.
         $info = getimagesize( $filename, $imageinfo );
+
         if ( false !== $info ) {
                 return $info;
         }
-        // For PHP versions that don't support WebP images, extract the image
-        // size info from the file headers.
+
+        // For PHP versions that don't support WebP images,
+        // extract the image size info from the file headers.
         if ( 'image/webp' === wp_get_image_mime( $filename ) ) {
                 $webp_info = wp_get_webp_info( $filename );
@@ -5124 +5130 @@
                 $height    = $webp_info['height'];
 
-                        // Mimic the native return format.
+                // Mimic the native return format.
                 if ( $width && $height ) {
                         return array(