vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/trunk@44785 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Aaron Jorbin
2019-03-01 20:57:26 +00:00
parent 4c45ff7c43
commit e421f262dc
32 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/phpunit/includes/abstract-testcase.php
View File

@@ -1062,7 +1062,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Framework_TestCase {
}
$attachment = array(
'post_title' => basename( $upload['file'] ),
'post_title' => wp_basename( $upload['file'] ),
'post_content' => '',
'post_type' => 'attachment',
'post_parent' => $parent_post_id,

4
tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php
View File

@@ -46,7 +46,7 @@ class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
*/
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 = '';
if ( ! empty( $upload['type'] ) ) {
@@ -59,7 +59,7 @@ class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
}
$attachment = array(
'post_title' => basename( $upload['file'] ),
'post_title' => wp_basename( $upload['file'] ),
'post_content' => '',
'post_type' => 'attachment',
'post_parent' => $parent,

4
tests/phpunit/tests/ajax/Attachments.php
View File

@@ -29,7 +29,7 @@ class Tests_Ajax_Attachments extends WP_Ajax_UnitTestCase {
$filename = DIR_TESTDATA . '/images/canola.jpg';
$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 );
// Set up a default request
@@ -80,7 +80,7 @@ class Tests_Ajax_Attachments extends WP_Ajax_UnitTestCase {
$filename = DIR_TESTDATA . '/formatting/entities.txt';
$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 );
// Set up a default request

4
tests/phpunit/tests/ajax/MediaEdit.php
View File

@@ -32,7 +32,7 @@ class Tests_Ajax_MediaEdit extends WP_Ajax_UnitTestCase {
$filename = DIR_TESTDATA . '/images/canola.jpg';
$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 );
$_REQUEST['action'] = 'image-editor';
@@ -63,7 +63,7 @@ class Tests_Ajax_MediaEdit extends WP_Ajax_UnitTestCase {
$filename = DIR_TESTDATA . '/images/canola.jpg';
$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 );
$_REQUEST['action'] = 'image-editor';

2
tests/phpunit/tests/blocks/block-parser.php
View File

@@ -85,7 +85,7 @@ class WP_Test_Block_Parser extends WP_UnitTestCase {
* @return string The cleaned fixture name.
*/
protected function clean_fixture_filename( $filename ) {
$filename = basename( $filename );
$filename = wp_basename( $filename );
$filename = preg_replace( '/\..+$/', '', $filename );
return $filename;
}

2
tests/phpunit/tests/blocks/render.php
View File

@@ -358,7 +358,7 @@ class WP_Test_Block_Render extends WP_UnitTestCase {
* @return string The cleaned fixture name.
*/
protected function clean_fixture_filename( $filename ) {
$filename = basename( $filename );
$filename = wp_basename( $filename );
$filename = preg_replace( '/\..+$/', '', $filename );
return $filename;
}

4
tests/phpunit/tests/general/template.php
View File

@@ -231,7 +231,7 @@ class Tests_General_Template extends WP_UnitTestCase {
$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 );
$this->site_icon_url = $upload['url'];
// Save the data
@@ -409,7 +409,7 @@ class Tests_General_Template extends WP_UnitTestCase {
function _insert_custom_logo() {
$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.
$this->custom_logo_url = $upload['url'];

6
tests/phpunit/tests/image/editor.php
View File

@@ -130,16 +130,16 @@ class Tests_Image_Editor extends WP_Image_UnitTestCase {
);
// 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
$this->assertEquals( trailingslashit( realpath( get_temp_dir() ) ), trailingslashit( realpath( dirname( $editor->generate_filename( null, get_temp_dir() ) ) ) ) );
// 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!
$this->assertEquals( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );

2
tests/phpunit/tests/image/intermediateSize.php
View File

@@ -17,7 +17,7 @@ class Tests_Image_Intermediate_Size extends WP_UnitTestCase {
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 );
}

18
tests/phpunit/tests/image/resize.php
View File

@@ -29,7 +29,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
function test_resize_jpg() {
$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 );
$this->assertEquals( 25, $h );
@@ -45,7 +45,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
$this->fail( sprintf( 'No PNG support in the editor engine %s on this system', $this->editor_engine ) );
}
$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 );
$this->assertEquals( 25, $h );
@@ -61,7 +61,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
$this->fail( sprintf( 'No GIF support in the editor engine %s on this system', $this->editor_engine ) );
}
$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 );
$this->assertEquals( 25, $h );
@@ -81,7 +81,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
function test_resize_thumb_128x96() {
$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 );
$this->assertEquals( 96, $h );
@@ -93,7 +93,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
function test_resize_thumb_128x0() {
$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 );
$this->assertEquals( 193, $h );
@@ -105,7 +105,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
function test_resize_thumb_0x96() {
$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 );
$this->assertEquals( 96, $h );
@@ -117,7 +117,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
function test_resize_thumb_150x150_crop() {
$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 );
$this->assertEquals( 150, $h );
@@ -129,7 +129,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
function test_resize_thumb_150x100_crop() {
$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 );
$this->assertEquals( 100, $h );
@@ -141,7 +141,7 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
function test_resize_thumb_50x150_crop() {
$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 );
$this->assertEquals( 150, $h );

6
tests/phpunit/tests/image/siteIcon.php
View File

@@ -101,7 +101,7 @@ class Tests_WP_Site_Icon extends WP_UnitTestCase {
function test_create_attachment_object() {
$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 );
@@ -115,7 +115,7 @@ class Tests_WP_Site_Icon extends WP_UnitTestCase {
function test_insert_cropped_attachment() {
$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 );
$cropped_id = $this->wp_site_icon->insert_attachment( $object, $cropped );
@@ -163,7 +163,7 @@ class Tests_WP_Site_Icon extends WP_UnitTestCase {
$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 );
$this->attachment_id = $this->_make_attachment( $upload );
return $this->attachment_id;

2
tests/phpunit/tests/media.php
View File

@@ -1524,7 +1524,7 @@ EOF;
// Copy hash generation method used in wp_save_image().
$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
$image_url = str_replace( $filename_base, $filename_base . '-' . $hash, $image_url );

56
tests/phpunit/tests/post/attachments.php
View File

@@ -27,7 +27,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
$id = $this->_make_attachment( $upload );
@@ -39,17 +39,17 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
// 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] );
@@ -66,7 +66,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$filename = ( DIR_TESTDATA . '/images/a2-small.jpg' );
$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'] ) );
$id = $this->_make_attachment( $upload );
@@ -86,23 +86,23 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
// 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] );
// 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] );
@@ -122,7 +122,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$filename = ( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG' );
$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'] ) );
$id = $this->_make_attachment( $upload );
@@ -146,22 +146,22 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
// 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] );
}
@@ -181,7 +181,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$filename = ( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG' );
$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'] ) );
$id = $this->_make_attachment( $upload );
@@ -224,7 +224,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
$upload['url'] = '';
@@ -241,7 +241,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
$id = $this->_make_attachment( $upload );
@@ -267,7 +267,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
$attachment_id = $this->_make_attachment( $upload );
@@ -299,7 +299,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
// Set attachment ID.
@@ -324,7 +324,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
// Set attachment ID.
@@ -349,7 +349,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
// Set attachment ID
@@ -377,7 +377,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
// Set attachment ID.
@@ -405,7 +405,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
// Set attachment ID
@@ -432,7 +432,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertTrue( empty( $upload['error'] ) );
// Set attachment ID
@@ -454,7 +454,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$attachment_id = $this->_make_attachment( $upload );
$this->assertTrue( wp_attachment_is_image( $attachment_id ) );
@@ -472,7 +472,7 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$filename = DIR_TESTDATA . '/images/test-image.psd';
$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 );
$this->assertFalse( wp_attachment_is_image( $attachment_id ) );
@@ -489,13 +489,13 @@ class Tests_Post_Attachments extends WP_UnitTestCase {
$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 );
$this->assertFalse( $upload['error'] );
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' ) );

2
tests/phpunit/tests/rest-api/rest-attachments-controller.php
View File

@@ -1435,7 +1435,7 @@ class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Control
)
);
$filename = basename( $this->test_file2 );
$filename = wp_basename( $this->test_file2 );
$request = new WP_REST_Request( 'GET', '/wp/v2/media' );
$request->set_param( 'search', $filename );

2
tests/phpunit/tests/xmlrpc/wp/getMediaItem.php
View File

@@ -20,7 +20,7 @@ class Tests_XMLRPC_wp_getMediaItem extends WP_XMLRPC_UnitTestCase {
$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 );
$this->attachment_data = get_post( $this->attachment_id, ARRAY_A );