Changeset 44785

Timestamp:

03/01/2019 08:57:26 PM (6 years ago)

Author:

jorbin

Message:

Replace usages of basename() with wp_basename() in order to support multibyte filenames

This is focused on the pieces of code that touch media files and the tests that support them. basename isn't multibyte compatible out of the box. See ​http://php.net/basename and ​https://bugs.php.net/bug.php?id=62119.

See #43170.
Props Viper007Bond.

Location:

trunk

Files:

• src/wp-admin/custom-background.php (modified) (1 diff)
• src/wp-admin/custom-header.php (modified) (6 diffs)
• src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• src/wp-admin/includes/class-wp-site-icon.php (modified) (2 diffs)
• src/wp-admin/includes/image-edit.php (modified) (1 diff)
• src/wp-admin/includes/image.php (modified) (4 diffs)
• src/wp-admin/includes/import.php (modified) (1 diff)
• src/wp-admin/includes/media.php (modified) (3 diffs)
• src/wp-admin/includes/misc.php (modified) (1 diff)
• src/wp-content/themes/twentyten/loop-attachment.php (modified) (1 diff)
• src/wp-includes/class-wp-customize-manager.php (modified) (3 diffs)
• src/wp-includes/customize/class-wp-customize-media-control.php (modified) (1 diff)
• src/wp-includes/deprecated.php (modified) (3 diffs)
• src/wp-includes/functions.php (modified) (2 diffs)
• src/wp-includes/media.php (modified) (1 diff)
• src/wp-includes/post.php (modified) (7 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (2 diffs)
• tests/phpunit/includes/abstract-testcase.php (modified) (1 diff)
• tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php (modified) (2 diffs)
• tests/phpunit/tests/ajax/Attachments.php (modified) (2 diffs)
• tests/phpunit/tests/ajax/MediaEdit.php (modified) (2 diffs)
• tests/phpunit/tests/blocks/block-parser.php (modified) (1 diff)
• tests/phpunit/tests/blocks/render.php (modified) (1 diff)
• tests/phpunit/tests/general/template.php (modified) (2 diffs)
• tests/phpunit/tests/image/editor.php (modified) (2 diffs)
• tests/phpunit/tests/image/intermediateSize.php (modified) (1 diff)
• tests/phpunit/tests/image/resize.php (modified) (9 diffs)
• tests/phpunit/tests/image/siteIcon.php (modified) (3 diffs)
• tests/phpunit/tests/media.php (modified) (1 diff)
• tests/phpunit/tests/post/attachments.php (modified) (21 diffs)
• tests/phpunit/tests/rest-api/rest-attachments-controller.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/wp/getMediaItem.php (modified) (1 diff)

trunk/src/wp-admin/custom-background.php

@@ -495 +495 @@
         $type     = $file['type'];
         $file     = $file['file'];
-        $filename = basename( $file );
+        $filename = wp_basename( $file );
 
         // Construct the object array

trunk/src/wp-admin/custom-header.php

@@ -821 +821 @@
         } elseif ( $width > $max_width ) {
             $oitar = $width / $max_width;
-            $image = wp_crop_image( $attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace( basename( $file ), 'midsize-' . basename( $file ), $file ) );
+            $image = wp_crop_image( $attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace( wp_basename( $file ), 'midsize-' . wp_basename( $file ), $file ) );
             if ( ! $image || is_wp_error( $image ) ) {
                 wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
@@ -829 +829 @@
             $image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
 
-            $url    = str_replace( basename( $url ), basename( $image ), $url );
+            $url    = str_replace( wp_basename( $url ), wp_basename( $image ), $url );
             $width  = $width / $oitar;
             $height = $height / $oitar;
@@ -896 +896 @@
         $type     = $file['type'];
         $file     = $file['file'];
-        $filename = basename( $file );
+        $filename = wp_basename( $file );
 
         // Construct the object array
@@ -985 +985 @@
 
         // Cleanup.
-        $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
+        $medium = str_replace( wp_basename( $original ), 'midsize-' . wp_basename( $original ), $original );
         if ( file_exists( $medium ) ) {
             wp_delete_file( $medium );
@@ -1209 +1209 @@
         $parent     = get_post( $parent_attachment_id );
         $parent_url = wp_get_attachment_url( $parent->ID );
-        $url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+        $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
         $size       = @getimagesize( $cropped );
@@ -1216 +1216 @@
         $object = array(
             'ID'             => $parent_attachment_id,
-            'post_title'     => basename( $cropped ),
+            'post_title'     => wp_basename( $cropped ),
             'post_mime_type' => $image_type,
             'guid'           => $url,

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3652 +3652 @@
 
             $parent_url = wp_get_attachment_url( $attachment_id );
-            $url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+            $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
             $size       = @getimagesize( $cropped );
@@ -3658 +3658 @@
 
             $object = array(
-                'post_title'     => basename( $cropped ),
+                'post_title'     => wp_basename( $cropped ),
                 'post_content'   => $url,
                 'post_mime_type' => $image_type,

trunk/src/wp-admin/includes/class-wp-site-icon.php

@@ -86 +86 @@
         $parent     = get_post( $parent_attachment_id );
         $parent_url = wp_get_attachment_url( $parent->ID );
-        $url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+        $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
         $size       = @getimagesize( $cropped );
@@ -93 +93 @@
         $object = array(
             'ID'             => $parent_attachment_id,
-            'post_title'     => basename( $cropped ),
+            'post_title'     => wp_basename( $cropped ),
             'post_content'   => $url,
             'post_mime_type' => $image_type,

trunk/src/wp-admin/includes/image-edit.php

@@ -34 +34 @@
     $can_restore  = false;
     if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
-        $can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+        $can_restore = $backup_sizes['full-orig']['file'] != wp_basename( $meta['file'] );
     }
 

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

@@ -48 +48 @@
 
     if ( ! $dst_file ) {
-        $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+        $dst_file = str_replace( wp_basename( $src_file ), 'cropped-' . wp_basename( $src_file ), $src_file );
     }
 
@@ -57 +57 @@
     wp_mkdir_p( dirname( $dst_file ) );
 
-    $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+    $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), wp_basename( $dst_file ) );
 
     $result = $editor->save( $dst_file );
@@ -190 +190 @@
                     break;
             }
-            $basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
+            $basename = str_replace( '.', '-', wp_basename( $file ) ) . '-image' . $ext;
             $uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );
             if ( false === $uploaded['error'] ) {
@@ -712 +712 @@
 
     if ( $src_file ) {
-        $dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
-        $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+        $dst_file = str_replace( wp_basename( $dst_file ), 'copy-' . wp_basename( $dst_file ), $dst_file );
+        $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), wp_basename( $dst_file ) );
 
         /*

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

@@ -100 +100 @@
     // Construct the object array
     $object = array(
-        'post_title'     => basename( $upload['file'] ),
+        'post_title'     => wp_basename( $upload['file'] ),
         'post_content'   => $upload['url'],
         'post_mime_type' => $upload['type'],

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

@@ -435 +435 @@
     $type    = $file['type'];
     $file    = $file['file'];
-    $title   = preg_replace( '/\.[^.]+$/', '', basename( $file ) );
+    $title   = preg_replace( '/\.[^.]+$/', '', wp_basename( $file ) );
     $content = '';
 
@@ -827 +827 @@
             $title = esc_html( wp_unslash( $_POST['title'] ) );
             if ( empty( $title ) ) {
-                $title = esc_html( basename( $src ) );
+                $title = esc_html( wp_basename( $src ) );
             }
 
@@ -931 +931 @@
 
         $file_array         = array();
-        $file_array['name'] = basename( $matches[0] );
+        $file_array['name'] = wp_basename( $matches[0] );
 
         // Download file to temp location.

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

@@ -363 +363 @@
                 <?php
                 $file_description = esc_html( get_file_description( $filename ) );
-                if ( $file_description !== $filename && basename( $filename ) !== $file_description ) {
+                if ( $file_description !== $filename && wp_basename( $filename ) !== $file_description ) {
                     $file_description .= '<br /><span class="nonessential">(' . esc_html( $filename ) . ')</span>';
                 }

trunk/src/wp-content/themes/twentyten/loop-attachment.php

@@ -139 +139 @@
                         </div><!-- #nav-below -->
         <?php else : ?>
-                        <a href="<?php echo esc_url( wp_get_attachment_url() ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo esc_html( basename( get_permalink() ) ); ?></a>
+                        <a href="<?php echo esc_url( wp_get_attachment_url() ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo esc_html( wp_basename( get_permalink() ) ); ?></a>
     <?php endif; ?>
                         </div><!-- .entry-attachment -->

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -1361 +1361 @@
 
                     // Copy file to temp location so that original file won't get deleted from theme after sideloading.
-                    $temp_file_name = wp_tempnam( basename( $file_path ) );
+                    $temp_file_name = wp_tempnam( wp_basename( $file_path ) );
                     if ( $temp_file_name && copy( $file_path, $temp_file_name ) ) {
                         $file_array['tmp_name'] = $temp_file_name;
@@ -1622 +1622 @@
                 continue;
             }
-            $file_name = basename( $attachment['file'] );
+            $file_name = wp_basename( $attachment['file'] );
 
             // Skip file types that are not recognized.
@@ -4595 +4595 @@
         if ( $this->return_url ) {
             $return_url = $this->return_url;
-        } elseif ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+        } elseif ( $referer && ! in_array( wp_basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
             $return_url = $referer;
         } elseif ( $this->preview_url ) {

trunk/src/wp-includes/customize/class-wp-customize-media-control.php

@@ -93 +93 @@
                     'type'  => $type,
                     'icon'  => wp_mime_type_icon( $type ),
-                    'title' => basename( $this->setting->default ),
+                    'title' => wp_basename( $this->setting->default ),
                 );
 

trunk/src/wp-includes/deprecated.php

@@ -1879 +1879 @@
         // We have a thumbnail desired, specified and existing
 
-        $src_file = basename($src);
+        $src_file = wp_basename($src);
     } elseif ( wp_attachment_is_image( $post->ID ) ) {
         // We have an image without a thumbnail
@@ -1889 +1889 @@
 
         $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-        $src_file = $icon_dir . '/' . basename($src);
+        $src_file = $icon_dir . '/' . wp_basename($src);
     }
 
@@ -3059 +3059 @@
 function get_theme_data( $theme_file ) {
     _deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
-    $theme = new WP_Theme( basename( dirname( $theme_file ) ), dirname( dirname( $theme_file ) ) );
+    $theme = new WP_Theme( wp_basename( dirname( $theme_file ) ), dirname( dirname( $theme_file ) ) );
 
     $theme_data = array(

trunk/src/wp-includes/functions.php

@@ -2097 +2097 @@
                     $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
                 } else {
-                    $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+                    $error_path = wp_basename( $uploads['basedir'] ) . $uploads['subdir'];
                 }
 
@@ -2382 +2382 @@
             $error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
         } else {
-            $error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+            $error_path = wp_basename( $upload['basedir'] ) . $upload['subdir'];
         }
 

trunk/src/wp-includes/media.php

@@ -2872 +2872 @@
 
     $file     = get_attached_file( $attachment->ID );
-    $filename = basename( $file );
+    $filename = wp_basename( $file );
 
     $objects = array( 'attachment' );

trunk/src/wp-includes/post.php

@@ -5475 +5475 @@
         // Don't delete the thumb if another attachment uses it.
         if ( ! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id ) ) ) {
-            $thumbfile = str_replace( basename( $file ), $meta['thumb'], $file );
+            $thumbfile = str_replace( wp_basename( $file ), $meta['thumb'], $file );
             if ( ! empty( $thumbfile ) ) {
                 $thumbfile = path_join( $uploadpath['basedir'], $thumbfile );
@@ -5491 +5491 @@
         $intermediate_dir = path_join( $uploadpath['basedir'], dirname( $file ) );
         foreach ( $meta['sizes'] as $size => $sizeinfo ) {
-            $intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file );
+            $intermediate_file = str_replace( wp_basename( $file ), $sizeinfo['file'], $file );
             if ( ! empty( $intermediate_file ) ) {
                 $intermediate_file = path_join( $uploadpath['basedir'], $intermediate_file );
@@ -5617 +5617 @@
             } elseif ( false !== strpos( $file, 'wp-content/uploads' ) ) {
                 // Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
-                $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
+                $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . wp_basename( $file );
             } else {
                 // It's a newly-uploaded file, therefore $file is relative to the basedir.
@@ -5705 +5705 @@
     $file = get_attached_file( $post->ID );
 
-    if ( ! empty( $imagedata['thumb'] ) && ( $thumbfile = str_replace( basename( $file ), $imagedata['thumb'], $file ) ) && file_exists( $thumbfile ) ) {
+    if ( ! empty( $imagedata['thumb'] ) && ( $thumbfile = str_replace( wp_basename( $file ), $imagedata['thumb'], $file ) ) && file_exists( $thumbfile ) ) {
         /**
          * Filters the attachment thumbnail file path.
@@ -5745 +5745 @@
     }
 
-    $url = str_replace( basename( $url ), basename( $thumb ), $url );
+    $url = str_replace( wp_basename( $url ), wp_basename( $thumb ), $url );
 
     /**
@@ -5897 +5897 @@
                 if ( $dh = opendir( $dir ) ) {
                     while ( false !== $file = readdir( $dh ) ) {
-                        $file = basename( $file );
+                        $file = wp_basename( $file );
                         if ( substr( $file, 0, 1 ) == '.' ) {
                             continue;
@@ -5916 +5916 @@
 
         $types = array();
-        // Icon basename - extension = MIME wildcard.
+        // Icon wp_basename - extension = MIME wildcard.
         foreach ( $icon_files as $file => $uri ) {
-            $types[ preg_replace( '/^([^.]*).*$/', '$1', basename( $file ) ) ] =& $icon_files[ $file ];
+            $types[ preg_replace( '/^([^.]*).*$/', '$1', wp_basename( $file ) ) ] =& $icon_files[ $file ];
         }
 

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -115 +115 @@
         }
 
-        $name       = basename( $file['file'] );
+        $name       = wp_basename( $file['file'] );
         $name_parts = pathinfo( $name );
         $name       = trim( substr( $name, 0, -( 1 + strlen( $name_parts['extension'] ) ) ) );
@@ -144 +144 @@
 
         if ( empty( $attachment->post_title ) ) {
-            $attachment->post_title = preg_replace( '/\.[^.]+$/', '', basename( $file ) );
+            $attachment->post_title = preg_replace( '/\.[^.]+$/', '', wp_basename( $file ) );
         }
 

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -1063 +1063 @@
 
         $attachment = array(
-            'post_title'     => basename( $upload['file'] ),
+            'post_title'     => wp_basename( $upload['file'] ),
             'post_content'   => '',
             'post_type'      => 'attachment',

trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php

@@ -47 +47 @@
     function create_upload_object( $file, $parent = 0 ) {
         $contents = file_get_contents( $file );
-        $upload   = wp_upload_bits( basename( $file ), null, $contents );
+        $upload   = wp_upload_bits( wp_basename( $file ), null, $contents );
 
         $type = '';
@@ -60 +60 @@
 
         $attachment = array(
-            'post_title'     => basename( $upload['file'] ),
+            'post_title'     => wp_basename( $upload['file'] ),
             'post_content'   => '',
             'post_type'      => 'attachment',

trunk/tests/phpunit/tests/ajax/Attachments.php

@@ -30 +30 @@
         $contents = file_get_contents( $filename );
 
-        $upload     = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $attachment = $this->_make_attachment( $upload );
 
@@ -81 +81 @@
         $contents = file_get_contents( $filename );
 
-        $upload     = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $attachment = $this->_make_attachment( $upload );
 

trunk/tests/phpunit/tests/ajax/MediaEdit.php

@@ -33 +33 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $id     = $this->_make_attachment( $upload );
 
@@ -64 +64 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $id     = $this->_make_attachment( $upload );
 

trunk/tests/phpunit/tests/blocks/block-parser.php

@@ -86 +86 @@
      */
     protected function clean_fixture_filename( $filename ) {
-        $filename = basename( $filename );
+        $filename = wp_basename( $filename );
         $filename = preg_replace( '/\..+$/', '', $filename );
         return $filename;

trunk/tests/phpunit/tests/blocks/render.php

@@ -359 +359 @@
      */
     protected function clean_fixture_filename( $filename ) {
-        $filename = basename( $filename );
+        $filename = wp_basename( $filename );
         $filename = preg_replace( '/\..+$/', '', $filename );
         return $filename;

trunk/tests/phpunit/tests/general/template.php

@@ -232 +232 @@
         $contents = file_get_contents( $filename );
 
-        $upload              = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload              = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->site_icon_url = $upload['url'];
 
@@ -410 +410 @@
         $filename = DIR_TESTDATA . '/images/test-image.jpg';
         $contents = file_get_contents( $filename );
-        $upload   = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload   = wp_upload_bits( wp_basename( $filename ), null, $contents );
 
         // Save the data.

trunk/tests/phpunit/tests/image/editor.php

@@ -131 +131 @@
 
         // Test with no parameters
-        $this->assertEquals( 'canola-100x50.jpg', basename( $editor->generate_filename() ) );
+        $this->assertEquals( 'canola-100x50.jpg', wp_basename( $editor->generate_filename() ) );
 
         // Test with a suffix only
-        $this->assertEquals( 'canola-new.jpg', basename( $editor->generate_filename( 'new' ) ) );
+        $this->assertEquals( 'canola-new.jpg', wp_basename( $editor->generate_filename( 'new' ) ) );
 
         // Test with a destination dir only
@@ -140 +140 @@
 
         // Test with a suffix only
-        $this->assertEquals( 'canola-100x50.png', basename( $editor->generate_filename( null, null, 'png' ) ) );
+        $this->assertEquals( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
 
         // Combo!

trunk/tests/phpunit/tests/image/intermediateSize.php

@@ -18 +18 @@
     public function _make_attachment( $file, $parent_post_id = 0 ) {
         $contents = file_get_contents( $file );
-        $upload   = wp_upload_bits( basename( $file ), null, $contents );
+        $upload   = wp_upload_bits( wp_basename( $file ), null, $contents );
 
         return parent::_make_attachment( $upload, $parent_post_id );

trunk/tests/phpunit/tests/image/resize.php

@@ -30 +30 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 25, 25 );
 
-        $this->assertEquals( 'test-image-25x25.jpg', basename( $image ) );
+        $this->assertEquals( 'test-image-25x25.jpg', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 25, $w );
@@ -46 +46 @@
         }
 
-        $this->assertEquals( 'test-image-25x25.png', basename( $image ) );
+        $this->assertEquals( 'test-image-25x25.png', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 25, $w );
@@ -62 +62 @@
         }
 
-        $this->assertEquals( 'test-image-25x25.gif', basename( $image ) );
+        $this->assertEquals( 'test-image-25x25.gif', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 25, $w );
@@ -82 +82 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 96 );
 
-        $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', basename( $image ) );
+        $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 64, $w );
@@ -94 +94 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 0 );
 
-        $this->assertEquals( '2007-06-17DSC_4173-128x193.jpg', basename( $image ) );
+        $this->assertEquals( '2007-06-17DSC_4173-128x193.jpg', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 128, $w );
@@ -106 +106 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 0, 96 );
 
-        $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', basename( $image ) );
+        $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 64, $w );
@@ -118 +118 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 150, true );
 
-        $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', basename( $image ) );
+        $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 150, $w );
@@ -130 +130 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 100, true );
 
-        $this->assertEquals( '2007-06-17DSC_4173-150x100.jpg', basename( $image ) );
+        $this->assertEquals( '2007-06-17DSC_4173-150x100.jpg', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 150, $w );
@@ -142 +142 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 50, 150, true );
 
-        $this->assertEquals( '2007-06-17DSC_4173-50x150.jpg', basename( $image ) );
+        $this->assertEquals( '2007-06-17DSC_4173-50x150.jpg', wp_basename( $image ) );
         list($w, $h, $type) = getimagesize( $image );
         $this->assertEquals( 50, $w );

trunk/tests/phpunit/tests/image/siteIcon.php

@@ -102 +102 @@
         $attachment_id = $this->_insert_attachment();
         $parent_url    = get_post( $attachment_id )->guid;
-        $cropped       = str_replace( basename( $parent_url ), 'cropped-test-image.jpg', $parent_url );
+        $cropped       = str_replace( wp_basename( $parent_url ), 'cropped-test-image.jpg', $parent_url );
 
         $object = $this->wp_site_icon->create_attachment_object( $cropped, $attachment_id );
@@ -116 +116 @@
         $attachment_id = $this->_insert_attachment();
         $parent_url    = get_post( $attachment_id )->guid;
-        $cropped       = str_replace( basename( $parent_url ), 'cropped-test-image.jpg', $parent_url );
+        $cropped       = str_replace( wp_basename( $parent_url ), 'cropped-test-image.jpg', $parent_url );
 
         $object     = $this->wp_site_icon->create_attachment_object( $cropped, $attachment_id );
@@ -164 +164 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
 
         $this->attachment_id = $this->_make_attachment( $upload );

trunk/tests/phpunit/tests/media.php

@@ -1525 +1525 @@
         $hash = 'e' . time() . rand( 100, 999 );
 
-        $filename_base = basename( $image_meta['file'], '.png' );
+        $filename_base = wp_basename( $image_meta['file'], '.png' );
 
         // Add the hash to the image URL

trunk/tests/phpunit/tests/post/attachments.php

@@ -28 +28 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -40 +40 @@
         // medium, medium_large, and full size will both point to the original
         $downsize = image_downsize( $id, 'medium' );
-        $this->assertEquals( basename( $upload['file'] ), basename( $downsize[0] ) );
+        $this->assertEquals( wp_basename( $upload['file'] ), wp_basename( $downsize[0] ) );
         $this->assertEquals( 50, $downsize[1] );
         $this->assertEquals( 50, $downsize[2] );
 
         $downsize = image_downsize( $id, 'medium_large' );
-        $this->assertEquals( basename( $upload['file'] ), basename( $downsize[0] ) );
+        $this->assertEquals( wp_basename( $upload['file'] ), wp_basename( $downsize[0] ) );
         $this->assertEquals( 50, $downsize[1] );
         $this->assertEquals( 50, $downsize[2] );
 
         $downsize = image_downsize( $id, 'full' );
-        $this->assertEquals( basename( $upload['file'] ), basename( $downsize[0] ) );
+        $this->assertEquals( wp_basename( $upload['file'] ), wp_basename( $downsize[0] ) );
         $this->assertEquals( 50, $downsize[1] );
         $this->assertEquals( 50, $downsize[2] );
@@ -67 +67 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -87 +87 @@
         // image_downsize() should return the correct images and sizes
         $downsize = image_downsize( $id, 'thumbnail' );
-        $this->assertEquals( 'a2-small-150x150.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( 'a2-small-150x150.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 150, $downsize[1] );
         $this->assertEquals( 150, $downsize[2] );
@@ -93 +93 @@
         // medium, medium_large, and full will both point to the original
         $downsize = image_downsize( $id, 'medium' );
-        $this->assertEquals( 'a2-small.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( 'a2-small.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 400, $downsize[1] );
         $this->assertEquals( 300, $downsize[2] );
 
         $downsize = image_downsize( $id, 'medium_large' );
-        $this->assertEquals( 'a2-small.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( 'a2-small.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 400, $downsize[1] );
         $this->assertEquals( 300, $downsize[2] );
 
         $downsize = image_downsize( $id, 'full' );
-        $this->assertEquals( 'a2-small.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( 'a2-small.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 400, $downsize[1] );
         $this->assertEquals( 300, $downsize[2] );
@@ -123 +123 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -147 +147 @@
         // image_downsize() should return the correct images and sizes
         $downsize = image_downsize( $id, 'thumbnail' );
-        $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 150, $downsize[1] );
         $this->assertEquals( 150, $downsize[2] );
 
         $downsize = image_downsize( $id, 'medium' );
-        $this->assertEquals( '2007-06-17DSC_4173-400x602.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( '2007-06-17DSC_4173-400x602.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 400, $downsize[1] );
         $this->assertEquals( 602, $downsize[2] );
 
         $downsize = image_downsize( $id, 'medium_large' );
-        $this->assertEquals( '2007-06-17DSC_4173-600x904.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( '2007-06-17DSC_4173-600x904.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 600, $downsize[1] );
         $this->assertEquals( 904, $downsize[2] );
 
         $downsize = image_downsize( $id, 'full' );
-        $this->assertEquals( '2007-06-17DSC_4173.jpg', basename( $downsize[0] ) );
+        $this->assertEquals( '2007-06-17DSC_4173.jpg', wp_basename( $downsize[0] ) );
         $this->assertEquals( 680, $downsize[1] );
         $this->assertEquals( 1024, $downsize[2] );
@@ -182 +182 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -225 +225 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -242 +242 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -268 +268 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -300 +300 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -325 +325 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -350 +350 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -378 +378 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -406 +406 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -433 +433 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $this->assertTrue( empty( $upload['error'] ) );
 
@@ -455 +455 @@
         $contents = file_get_contents( $filename );
 
-        $upload        = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload        = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $attachment_id = $this->_make_attachment( $upload );
 
@@ -473 +473 @@
         $contents = file_get_contents( $filename );
 
-        $upload        = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload        = wp_upload_bits( wp_basename( $filename ), null, $contents );
         $attachment_id = $this->_make_attachment( $upload );
 
@@ -490 +490 @@
         $contents = file_get_contents( $filename );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
 
         $this->assertFalse( $upload['error'] );
@@ -496 +496 @@
         add_filter( 'upload_mimes', array( $this, 'blacklist_jpg_mime_type' ) );
 
-        $upload = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
 
         remove_filter( 'upload_mimes', array( $this, 'blacklist_jpg_mime_type' ) );

trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -1436 +1436 @@
         );
 
-        $filename = basename( $this->test_file2 );
+        $filename = wp_basename( $this->test_file2 );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/media' );

trunk/tests/phpunit/tests/xmlrpc/wp/getMediaItem.php

@@ -21 +21 @@
         $filename = ( DIR_TESTDATA . '/images/waffles.jpg' );
         $contents = file_get_contents( $filename );
-        $upload   = wp_upload_bits( basename( $filename ), null, $contents );
+        $upload   = wp_upload_bits( wp_basename( $filename ), null, $contents );
 
         $this->attachment_id   = $this->_make_attachment( $upload, self::$post_id );