vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-02 19:54:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code Modernization: Use dirname() with the $levels parameter.

Browse Source 
PHP 7.0 introduced the `$levels` parameter to the `dirname()` function, which means nested calls to `dirname()` are no longer needed.

Note: This is enforced by WPCS 3.0.0.

Reference: [https://www.php.net/manual/en/function.dirname.php PHP Manual: dirname()].

Follow-up to [56141].

Props jrf.
See #59161, #58831.

git-svn-id: https://develop.svn.wordpress.org/trunk@56552 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2023-09-11 04:51:09 +00:00
parent 858bd4b25f
commit aeba9d183d
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-admin/includes/theme.php
View File

@@ -156,7 +156,7 @@ function get_page_templates( $post = null, $post_type = 'page' ) {
* @return string
*/
function _get_template_edit_filename( $fullpath, $containingfolder ) {
return str_replace( dirname( dirname( $containingfolder ) ), '', $fullpath );
return str_replace( dirname( $containingfolder, 2 ), '', $fullpath );
}
/**

2
src/wp-admin/maint/repair.php
View File

@@ -7,7 +7,7 @@
*/
define( 'WP_REPAIRING', true );
require_once dirname( dirname( __DIR__ ) ) . '/wp-load.php';
require_once dirname( __DIR__, 2 ) . '/wp-load.php';
header( 'Content-Type: text/html; charset=utf-8' );
?>

4
tests/phpunit/includes/bootstrap.php
View File

@@ -10,7 +10,7 @@ if ( defined( 'WP_TESTS_CONFIG_FILE_PATH' ) ) {
if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) {
// Support the config file from the root of the develop repository.
if ( basename( $config_file_path ) === 'phpunit' && basename( dirname( $config_file_path ) ) === 'tests' ) {
$config_file_path = dirname( dirname( $config_file_path ) );
$config_file_path = dirname( $config_file_path, 2 );
}
}
$config_file_path .= '/wp-tests-config.php';
@@ -79,7 +79,7 @@ if ( version_compare( $phpunit_version, '5.7.21', '<' ) ) {
*/
if ( ! class_exists( 'Yoast\PHPUnitPolyfills\Autoload' ) ) {
// Default location of the autoloader for WP core test runs.
$phpunit_polyfills_autoloader = dirname( dirname( dirname( __DIR__ ) ) ) . '/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
$phpunit_polyfills_autoloader = dirname( __DIR__, 3 ) . '/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
$phpunit_polyfills_error = false;
// Allow for a custom installation location to be provided for plugin/theme integration tests.

2
tests/phpunit/tests/filesystem/base.php
View File

@@ -24,7 +24,7 @@ abstract class WP_Filesystem_UnitTestCase extends WP_UnitTestCase {
return 'MockFS';
}
public function filter_abstraction_file( $file ) {
return dirname( dirname( __DIR__ ) ) . '/includes/mock-fs.php';
return dirname( __DIR__, 2 ) . '/includes/mock-fs.php';
}
public function test_is_MockFS_sane() {

2
tests/phpunit/tests/pomo/pluralForms.php
View File

@@ -43,7 +43,7 @@ class PluralFormsTest extends WP_UnitTestCase {
* @group external-http
*/
public function test_regression( $lang, $nplurals, $expression ) {
require_once dirname( dirname( __DIR__ ) ) . '/includes/plural-form-function.php';
require_once dirname( __DIR__, 2 ) . '/includes/plural-form-function.php';
$parenthesized = self::parenthesize_plural_expression( $expression );
$old_style = tests_make_plural_form_function( $nplurals, $parenthesized );