Skip to content

Commit 440ce37

Browse files
lancewillettlancewillett
committed
Tests: Make option test data providers static.
Declare the 14 data providers in the option tests as `public static` for compatibility with newer PHPUnit versions. Preserve all datasets and assertions. Developed in: WordPress#13956 Props therssoftware, mukesh27. See #66211. git-svn-id: https://develop.svn.wordpress.org/trunk@64087 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 12728ef commit 440ce37

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎tests/phpunit/tests/option/multisite.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public function test_sanitize_network_option_illegal_names( $option_value, $sani
201201
$this->assertSame( $sanitized_option_value, get_site_option( 'illegal_names' ) );
202202
}
203203

204-
public function data_illegal_names() {
204+
public static function data_illegal_names() {
205205
return array(
206206
array( array( '', 'Woo', '' ), array( 'Woo' ) ),
207207
array( 'foo bar', array( 'foo', 'bar' ) ),
@@ -237,7 +237,7 @@ public function test_sanitize_network_option_banned_email_domains( $option_value
237237
$this->assertSame( $sanitized_option_value, get_site_option( 'banned_email_domains' ) );
238238
}
239239

240-
public function data_email_domains() {
240+
public static function data_email_domains() {
241241
return array(
242242
array( array( 'woo', '', 'boo.com', 'foo.net.biz..' ), array( 'woo', 'boo.com' ) ),
243243
array( "foo\nbar", array( 'foo', 'bar' ) ),

‎tests/phpunit/tests/option/networkOption.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function test_get_network_option_network_id_parameter( $network_id, $expe
147147
$this->assertSame( $expected_response, get_network_option( $network_id, $option, true ) );
148148
}
149149

150-
public function data_network_id_parameter() {
150+
public static function data_network_id_parameter() {
151151
return array(
152152
// Numeric values should always be accepted.
153153
array( 1, true ),

‎tests/phpunit/tests/option/option.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function test_delete_option_bad_option_name( $option_name ) {
219219
*
220220
* @return array
221221
*/
222-
public function data_bad_option_names() {
222+
public static function data_bad_option_names() {
223223
return array(
224224
'empty string' => array( '' ),
225225
'string 0' => array( '0' ),
@@ -288,7 +288,7 @@ public function test_delete_option_valid_but_undesired_option_names( $option_nam
288288
*
289289
* @return array
290290
*/
291-
public function data_valid_but_undesired_option_names() {
291+
public static function data_valid_but_undesired_option_names() {
292292
return array(
293293
'string 123' => array( '123' ),
294294
'integer 123' => array( 123 ),
@@ -341,7 +341,7 @@ public function test_option_autoloading( $name, $autoload_value, $expected ) {
341341
*
342342
* @return array
343343
*/
344-
public function data_option_autoloading() {
344+
public static function data_option_autoloading() {
345345
return array(
346346
// Supported values.
347347
array( 'autoload_true', true, 'on' ),
@@ -379,7 +379,7 @@ public function test_update_option_autoloading_large_option( $autoload, $expecte
379379
$this->assertSame( $expected, $actual->autoload );
380380
}
381381

382-
public function data_option_autoloading_large_option() {
382+
public static function data_option_autoloading_large_option() {
383383
return array(
384384
'on' => array(
385385
'autoload' => 'on',
@@ -578,7 +578,7 @@ public function test_get_option_does_not_hit_the_external_cache_multiple_times_f
578578
*
579579
* @return array[]
580580
*/
581-
public function data_get_option_does_not_hit_the_external_cache_multiple_times_for_the_same_option() {
581+
public static function data_get_option_does_not_hit_the_external_cache_multiple_times_for_the_same_option() {
582582
return array(
583583
'exists, autoload' => array( 1, true, true ),
584584
'exists, not autoloaded' => array( 3, true, false ),

‎tests/phpunit/tests/option/sanitizeOption.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function test_sanitize_option( $option_name, $sanitized, $original ) {
2020
*
2121
* @return array
2222
*/
23-
public function data_sanitize_option() {
23+
public static function data_sanitize_option() {
2424
return array(
2525
array( 'admin_email', 'mail@example.com', 'mail@example.com' ),
2626
array( 'admin_email', get_option( 'admin_email' ), 'invalid' ),
@@ -105,7 +105,7 @@ public function test_sanitize_option_upload_path( $provided, $expected ) {
105105
$this->assertSame( $expected, sanitize_option( 'upload_path', $provided ) );
106106
}
107107

108-
public function data_sanitize_option_upload_path() {
108+
public static function data_sanitize_option_upload_path() {
109109
return array(
110110
array( '<a href="http://www.example.com">Link</a>', 'Link' ),
111111
array( '<scr' . 'ipt>url</scr' . 'ipt>', 'url' ),
@@ -162,7 +162,7 @@ public function test_sanitize_option_permalink_structure( $provided, $expected,
162162
$this->assertEquals( $expected, $actual );
163163
}
164164

165-
public function data_sanitize_option_permalink_structure() {
165+
public static function data_sanitize_option_permalink_structure() {
166166
return array(
167167
array( '', '', true ),
168168
array( '%postname', false, false ),

‎tests/phpunit/tests/option/themeMods.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function test_theme_mod_default_value_with_percent_symbols( $default_valu
7373
$this->assertSame( $expected, get_theme_mod( 'test_name', $default_value ) );
7474
}
7575

76-
public function data_theme_mod_default_value_with_percent_symbols() {
76+
public static function data_theme_mod_default_value_with_percent_symbols() {
7777
return array(
7878
array(
7979
'100%',

‎tests/phpunit/tests/option/wpDetermineOptionAutoloadValue.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function test_determine_option_autoload_value( $autoload, $expected ) {
2424
$this->assertSame( $expected, $test );
2525
}
2626

27-
public function data_values() {
27+
public static function data_values() {
2828
return array(
2929
'yes' => array(
3030
'autoload' => 'yes',

‎tests/phpunit/tests/option/wpPrimeOptionCaches.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public function test_wp_prime_option_caches_does_not_trigger_db_queries_for_allo
427427
*
428428
* @return array[]
429429
*/
430-
public function data_option_types() {
430+
public static function data_option_types() {
431431
return array(
432432
'null' => array( null ),
433433
'(bool) false' => array( false ),

0 commit comments

Comments
 (0)