From 7cd8e5793c9593a411e2d4371c1585c6f2e2fd3f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 7 Jan 2023 00:36:22 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `phpunit/tests/compat/mbStrlen.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 `$string` parameter to `$input_string` in the unit tests for `mb_strlen()` polyfill. 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]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #56788. git-svn-id: https://develop.svn.wordpress.org/trunk@55036 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/compat/mbStrlen.php | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/phpunit/tests/compat/mbStrlen.php b/tests/phpunit/tests/compat/mbStrlen.php index e34b44534b..472d5a3bac 100644 --- a/tests/phpunit/tests/compat/mbStrlen.php +++ b/tests/phpunit/tests/compat/mbStrlen.php @@ -19,24 +19,24 @@ class Tests_Compat_mbStrlen extends WP_UnitTestCase { /** * @dataProvider utf8_string_lengths */ - public function test_mb_strlen( $string, $expected_character_length ) { - $this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) ); + public function test_mb_strlen( $input_string, $expected_character_length ) { + $this->assertSame( $expected_character_length, _mb_strlen( $input_string, 'UTF-8' ) ); } /** * @dataProvider utf8_string_lengths */ - public function test_mb_strlen_via_regex( $string, $expected_character_length ) { + public function test_mb_strlen_via_regex( $input_string, $expected_character_length ) { _wp_can_use_pcre_u( false ); - $this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) ); + $this->assertSame( $expected_character_length, _mb_strlen( $input_string, 'UTF-8' ) ); _wp_can_use_pcre_u( 'reset' ); } /** * @dataProvider utf8_string_lengths */ - public function test_8bit_mb_strlen( $string, $expected_character_length, $expected_byte_length ) { - $this->assertSame( $expected_byte_length, _mb_strlen( $string, '8bit' ) ); + public function test_8bit_mb_strlen( $input_string, $expected_character_length, $expected_byte_length ) { + $this->assertSame( $expected_byte_length, _mb_strlen( $input_string, '8bit' ) ); } /** @@ -47,42 +47,42 @@ class Tests_Compat_mbStrlen extends WP_UnitTestCase { public function utf8_string_lengths() { return array( array( - 'string' => 'баба', + 'input_string' => 'баба', 'expected_character_length' => 4, 'expected_byte_length' => 8, ), array( - 'string' => 'баб', + 'input_string' => 'баб', 'expected_character_length' => 3, 'expected_byte_length' => 6, ), array( - 'string' => 'I am your б', + 'input_string' => 'I am your б', 'expected_character_length' => 11, 'expected_byte_length' => 12, ), array( - 'string' => '1111111111', + 'input_string' => '1111111111', 'expected_character_length' => 10, 'expected_byte_length' => 10, ), array( - 'string' => '²²²²²²²²²²', + 'input_string' => '²²²²²²²²²²', 'expected_character_length' => 10, 'expected_byte_length' => 20, ), array( - 'string' => '３３３３３３３３３３', + 'input_string' => '３３３３３３３３３３', 'expected_character_length' => 10, 'expected_byte_length' => 30, ), array( - 'string' => '𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜', + 'input_string' => '𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜', 'expected_character_length' => 10, 'expected_byte_length' => 40, ), array( - 'string' => '1²３𝟜1²３𝟜1²３𝟜', + 'input_string' => '1²３𝟜1²３𝟜1²３𝟜', 'expected_character_length' => 12, 'expected_byte_length' => 30, ),