Changeset 52932

Timestamp:

03/14/2022 04:30:35 PM (3 years ago)

Author:

hellofromTonya

Message:

Media: Relocate wp_filesize() function for use in frontend and backend.

A new function wp_filesize() was added with [52837]. The function lived in the wp-admin/includes/file.php file. However, this admin specific function is not loaded into memory when hitting media/edit endpoint. The result was a 500 Internal Server Error. Why? The function is invoked with that endpoint, but the function does not exist in memory.

This commit relocates the new function to the wp-includes/functions.php file. In doing so, the function is available for both the frontend and backend.

Follow-up to [52837].

Props talldanwp, spacedmonkey, costdev, antonvlasenko.
Fixes #55367.

Location:

trunk

Files:

• src/wp-admin/includes/file.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/file.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-admin/includes/file.php

@@ -2556 +2556 @@
     return false;
 }
-
-/**
- * Wrapper for PHP filesize with filters and casting the result as an integer.
- *
- * @since 6.0.0
- *
- * @link https://www.php.net/manual/en/function.filesize.php
- *
- * @param string $path Path to the file.
- * @return int The size of the file in bytes, or 0 in the event of an error.
- */
-function wp_filesize( $path ) {
-    /**
-     * Filters the result of wp_filesize before the PHP function is run.
-     *
-     * @since 6.0.0
-     *
-     * @param null|int $size The unfiltered value. Returning an int from the callback bypasses the filesize call.
-     * @param string   $path Path to the file.
-     */
-    $size = apply_filters( 'pre_wp_filesize', null, $path );
-
-    if ( is_int( $size ) ) {
-        return $size;
-    }
-
-    $size = (int) @filesize( $path );
-
-    /**
-     * Filters the size of the file.
-     *
-     * @since 6.0.0
-     *
-     * @param int    $size The result of PHP filesize on the file.
-     * @param string $path Path to the file.
-     */
-    return (int) apply_filters( 'wp_filesize', $size, $path );
-}

trunk/src/wp-includes/functions.php

@@ -3460 +3460 @@
 
 /**
+ * Wrapper for PHP filesize with filters and casting the result as an integer.
+ *
+ * @since 6.0.0
+ *
+ * @link https://www.php.net/manual/en/function.filesize.php
+ *
+ * @param string $path Path to the file.
+ * @return int The size of the file in bytes, or 0 in the event of an error.
+ */
+function wp_filesize( $path ) {
+    /**
+     * Filters the result of wp_filesize before the PHP function is run.
+     *
+     * @since 6.0.0
+     *
+     * @param null|int $size The unfiltered value. Returning an int from the callback bypasses the filesize call.
+     * @param string   $path Path to the file.
+     */
+    $size = apply_filters( 'pre_wp_filesize', null, $path );
+
+    if ( is_int( $size ) ) {
+        return $size;
+    }
+
+    $size = (int) @filesize( $path );
+
+    /**
+     * Filters the size of the file.
+     *
+     * @since 6.0.0
+     *
+     * @param int    $size The result of PHP filesize on the file.
+     * @param string $path Path to the file.
+     */
+    return (int) apply_filters( 'wp_filesize', $size, $path );
+}
+
+/**
  * Retrieve list of allowed mime types and file extensions.
  *

trunk/tests/phpunit/tests/file.php

@@ -263 +263 @@
         return $keys;
     }
-
-    /**
-     * @ticket 49412
-     * @covers ::wp_filesize
-     */
-    function test_wp_filesize_with_nonexistent_file() {
-        $file = 'nonexistent/file.jpg';
-        $this->assertEquals( 0, wp_filesize( $file ) );
-    }
-
-    /**
-     * @ticket 49412
-     * @covers ::wp_filesize
-     */
-    function test_wp_filesize() {
-        $file = DIR_TESTDATA . '/images/test-image-upside-down.jpg';
-
-        $this->assertEquals( filesize( $file ), wp_filesize( $file ) );
-
-        $filter = function() {
-            return 999;
-        };
-
-        add_filter( 'wp_filesize', $filter );
-
-        $this->assertEquals( 999, wp_filesize( $file ) );
-
-        $pre_filter = function() {
-            return 111;
-        };
-
-        add_filter( 'pre_wp_filesize', $pre_filter );
-
-        $this->assertEquals( 111, wp_filesize( $file ) );
-    }
 }

trunk/tests/phpunit/tests/functions.php

@@ -2107 +2107 @@
         $this->assertFalse( wp_get_default_extension_for_mime_type( null ), 'false not returned when null as mime type supplied' );
     }
+
+    /**
+     * @ticket 49412
+     * @covers ::wp_filesize
+     */
+    function test_wp_filesize_with_nonexistent_file() {
+        $file = 'nonexistent/file.jpg';
+        $this->assertEquals( 0, wp_filesize( $file ) );
+    }
+
+    /**
+     * @ticket 49412
+     * @covers ::wp_filesize
+     */
+    function test_wp_filesize() {
+        $file = DIR_TESTDATA . '/images/test-image-upside-down.jpg';
+
+        $this->assertEquals( filesize( $file ), wp_filesize( $file ) );
+
+        $filter = function() {
+            return 999;
+        };
+
+        add_filter( 'wp_filesize', $filter );
+
+        $this->assertEquals( 999, wp_filesize( $file ) );
+
+        $pre_filter = function() {
+            return 111;
+        };
+
+        add_filter( 'pre_wp_filesize', $pre_filter );
+
+        $this->assertEquals( 111, wp_filesize( $file ) );
+    }
 }