mirror of
git://develop.git.wordpress.org/
synced 2025-02-06 23:50:43 +01:00
Code Modernization: Rename parameters that use reserved keywords in phpunit/tests/customize/setting.php
.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names. This commit renames the `$default` parameter to `$default_value` in: * `Tests_WP_Customize_Setting::custom_type_getter()` * `Tests_WP_Customize_Setting::custom_type_value_filter()` Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021], [55023], [55027], [55028], [55034], [55036], [55037], [55038], [55039], [55049]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@55050 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
f3dc0609c0
commit
c45465ca9f
@ -316,13 +316,13 @@ class Tests_WP_Customize_Setting extends WP_UnitTestCase {
|
||||
*/
|
||||
protected $custom_type_data_previewed;
|
||||
|
||||
private function custom_type_getter( $name, $default = null ) {
|
||||
private function custom_type_getter( $name, $default_value = null ) {
|
||||
if ( did_action( "customize_preview_{$name}" ) && array_key_exists( $name, $this->custom_type_data_previewed ) ) {
|
||||
$value = $this->custom_type_data_previewed[ $name ];
|
||||
} elseif ( array_key_exists( $name, $this->custom_type_data_saved ) ) {
|
||||
$value = $this->custom_type_data_saved[ $name ];
|
||||
} else {
|
||||
$value = $default;
|
||||
$value = $default_value;
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
@ -334,17 +334,17 @@ class Tests_WP_Customize_Setting extends WP_UnitTestCase {
|
||||
/**
|
||||
* Filter for `customize_value_{$id_base}`.
|
||||
*
|
||||
* @param mixed $default
|
||||
* @param mixed $default_value
|
||||
* @param WP_Customize_Setting $setting
|
||||
*
|
||||
* @return mixed|null
|
||||
*/
|
||||
public function custom_type_value_filter( $default, $setting = null ) {
|
||||
public function custom_type_value_filter( $default_value, $setting = null ) {
|
||||
$name = preg_replace( '/^customize_value_/', '', current_filter() );
|
||||
$this->assertInstanceOf( 'WP_Customize_Setting', $setting );
|
||||
$id_data = $setting->id_data();
|
||||
$this->assertSame( $name, $id_data['base'] );
|
||||
return $this->custom_type_getter( $name, $default );
|
||||
return $this->custom_type_getter( $name, $default_value );
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user