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

Timestamp:

10/08/2020 09:13:57 PM (4 years ago)

Author:

SergeyBiryukov

Message:

General: Replace older-style PHP type conversion functions with type casts.

This improves performance, readability, and consistency throughout core.

• intval() → (int)
• strval() → (string)
• floatval() → (float)

Props ayeshrajans.
Fixes #42918.

File:

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

trunk/src/wp-includes/media.php

@@ -71 +71 @@
         $max_height = $size[1];
     } elseif ( 'thumb' === $size || 'thumbnail' === $size ) {
-        $max_width  = intval( get_option( 'thumbnail_size_w' ) );
-        $max_height = intval( get_option( 'thumbnail_size_h' ) );
+        $max_width  = (int) get_option( 'thumbnail_size_w' );
+        $max_height = (int) get_option( 'thumbnail_size_h' );
         // Last chance thumbnail size defaults.
         if ( ! $max_width && ! $max_height ) {
@@ -79 +79 @@
         }
     } elseif ( 'medium' === $size ) {
-        $max_width  = intval( get_option( 'medium_size_w' ) );
-        $max_height = intval( get_option( 'medium_size_h' ) );
+        $max_width  = (int) get_option( 'medium_size_w' );
+        $max_height = (int) get_option( 'medium_size_h' );
 
     } elseif ( 'medium_large' === $size ) {
-        $max_width  = intval( get_option( 'medium_large_size_w' ) );
-        $max_height = intval( get_option( 'medium_large_size_h' ) );
-
-        if ( intval( $content_width ) > 0 ) {
-            $max_width = min( intval( $content_width ), $max_width );
+        $max_width  = (int) get_option( 'medium_large_size_w' );
+        $max_height = (int) get_option( 'medium_large_size_h' );
+
+        if ( (int) $content_width > 0 ) {
+            $max_width = min( (int) $content_width, $max_width );
         }
     } elseif ( 'large' === $size ) {
@@ -96 +96 @@
          * can resize it in the editor if they wish.
          */
-        $max_width  = intval( get_option( 'large_size_w' ) );
-        $max_height = intval( get_option( 'large_size_h' ) );
-
-        if ( intval( $content_width ) > 0 ) {
-            $max_width = min( intval( $content_width ), $max_width );
+        $max_width  = (int) get_option( 'large_size_w' );
+        $max_height = (int) get_option( 'large_size_h' );
+
+        if ( (int) $content_width > 0 ) {
+            $max_width = min( (int) $content_width, $max_width );
         }
     } elseif ( ! empty( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ), true ) ) {
-        $max_width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
-        $max_height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
+        $max_width  = (int) $_wp_additional_image_sizes[ $size ]['width'];
+        $max_height = (int) $_wp_additional_image_sizes[ $size ]['height'];
         // Only in admin. Assume that theme authors know what they're doing.
-        if ( intval( $content_width ) > 0 && 'edit' === $context ) {
-            $max_width = min( intval( $content_width ), $max_width );
+        if ( (int) $content_width > 0 && 'edit' === $context ) {
+            $max_width = min( (int) $content_width, $max_width );
         }
     } else { // $size === 'full' has no constraint.
@@ -156 +156 @@
     $out = '';
     if ( $width ) {
-        $out .= 'width="' . intval( $width ) . '" ';
+        $out .= 'width="' . (int) $width . '" ';
     }
     if ( $height ) {
-        $out .= 'height="' . intval( $height ) . '" ';
+        $out .= 'height="' . (int) $height . '" ';
     }
     return $out;
@@ -776 +776 @@
         foreach ( $imagedata['sizes'] as $_size => $data ) {
             // If there's an exact match to an existing image size, short circuit.
-            if ( intval( $data['width'] ) === intval( $size[0] ) && intval( $data['height'] ) === intval( $size[1] ) ) {
+            if ( (int) $data['width'] === (int) $size[0] && (int) $data['height'] === (int) $size[1] ) {
                 $candidates[ $data['width'] * $data['height'] ] = $data;
                 break;
@@ -897 +897 @@
         if ( isset( $additional_sizes[ $size_name ]['width'] ) ) {
             // For sizes added by plugins and themes.
-            $size_data['width'] = intval( $additional_sizes[ $size_name ]['width'] );
+            $size_data['width'] = (int) $additional_sizes[ $size_name ]['width'];
         } else {
             // For default sizes set in options.
-            $size_data['width'] = intval( get_option( "{$size_name}_size_w" ) );
+            $size_data['width'] = (int) get_option( "{$size_name}_size_w" );
         }
 
         if ( isset( $additional_sizes[ $size_name ]['height'] ) ) {
-            $size_data['height'] = intval( $additional_sizes[ $size_name ]['height'] );
+            $size_data['height'] = (int) $additional_sizes[ $size_name ]['height'];
         } else {
-            $size_data['height'] = intval( get_option( "{$size_name}_size_h" ) );
+            $size_data['height'] = (int) get_option( "{$size_name}_size_h" );
         }
 
@@ -2216 +2216 @@
     );
 
-    $id = intval( $atts['id'] );
+    $id = (int) $atts['id'];
 
     if ( ! empty( $atts['include'] ) ) {
@@ -2294 +2294 @@
     }
 
-    $columns   = intval( $atts['columns'] );
+    $columns   = (int) $atts['columns'];
     $itemwidth = $columns > 0 ? floor( 100 / $columns ) : 100;
     $float     = is_rtl() ? 'right' : 'left';
@@ -2554 +2554 @@
     );
 
-    $id = intval( $atts['id'] );
+    $id = (int) $atts['id'];
 
     if ( 'audio' !== $atts['type'] ) {
@@ -3331 +3331 @@
 
     foreach ( $attachments as $k => $attachment ) {
-        if ( intval( $attachment->ID ) === intval( $post->ID ) ) {
+        if ( (int) $attachment->ID === (int) $post->ID ) {
             break;
         }
@@ -4517 +4517 @@
                 // Specify the post ID of the gallery we're viewing if the shortcode doesn't reference another post already.
                 if ( ! isset( $shortcode_attrs['id'] ) ) {
-                    $shortcode[3] .= ' id="' . intval( $post->ID ) . '"';
+                    $shortcode[3] .= ' id="' . (int) $post->ID . '"';
                 }