Changeset 38013

Timestamp:

07/08/2016 12:53:08 PM (9 years ago)

Author:

ocean90

Message:

Bootstrap: Clean up wp_convert_hr_to_bytes().

• Don't return a value higher than PHP_INT_MAX.
• Add unit tests.

Props jrf.
See #32075.

Location:

trunk

Files:

• src/wp-includes/load.php (modified) (2 diffs)
• tests/phpunit/tests/load (added)
• tests/phpunit/tests/load/convertHrToBytes.php (added)

trunk/src/wp-includes/load.php

@@ -957 +957 @@
  *
  * @since 2.6.0
- * @since 4.6.0 Moved from functions.php to load.php
+ * @since 4.6.0 Moved from functions.php to load.php.
  *
  * @return bool True if SSL, otherwise false.
@@ -980 +980 @@
  *
  * @since 2.3.0
- * @since 4.6.0 Moved from media.php to load.php
- *
- * @param string $size A shorthand byte value.
+ * @since 4.6.0 Moved from media.php to load.php.
+ *
+ * @link http://php.net/manual/en/function.ini-get.php
+ * @link http://php.net/manual/en/faq.using.php#faq.using.shorthandbytes
+ *
+ * @param string $value A (PHP ini) byte value, either shorthand or ordinary.
  * @return int An integer byte value.
  */
-function wp_convert_hr_to_bytes( $size ) {
-    $size  = strtolower( $size );
-    $bytes = (int) $size;
-    if ( strpos( $size, 'k' ) !== false )
-        $bytes = intval( $size ) * KB_IN_BYTES;
-    elseif ( strpos( $size, 'm' ) !== false )
-        $bytes = intval($size) * MB_IN_BYTES;
-    elseif ( strpos( $size, 'g' ) !== false )
-        $bytes = intval( $size ) * GB_IN_BYTES;
-    return $bytes;
-}
+function wp_convert_hr_to_bytes( $value ) {
+    $value = strtolower( trim( $value ) );
+    $bytes = (int) $value;
+
+    if ( false !== strpos( $value, 'g' ) ) {
+        $bytes *= GB_IN_BYTES;
+    } elseif ( false !== strpos( $value, 'm' ) ) {
+        $bytes *= MB_IN_BYTES;
+    } elseif ( false !== strpos( $value, 'k' ) ) {
+        $bytes *= KB_IN_BYTES;
+    }
+
+    // Deal with large (float) values which run into the maximum integer size.
+    return min( $bytes, PHP_INT_MAX );
+}