Skip to content

Commit 9f6c94b

Browse files
committed
Adds more testcases. Option value is no longer case sensitive
1 parent be87a89 commit 9f6c94b

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

WordPress/Sniffs/PHP/IniSetSniff.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
6060
'highlight.keyword' => array(),
6161
'highlight.string' => array(),
6262
'short_open_tag' => array(
63-
'valid_values' => array( 'true', '1', 'On' ),
63+
'valid_values' => array( 'true', '1', 'on' ),
6464
),
6565
);
6666

@@ -115,7 +115,7 @@ class IniSetSniff extends AbstractFunctionParameterSniff {
115115
'message' => 'Use `wp_raise_memory_limit()` or hook into the filters in that function.',
116116
),
117117
'short_open_tag' => array(
118-
'invalid_values' => array( 'false', '0', 'Off' ),
118+
'invalid_values' => array( 'false', '0', 'off' ),
119119
'message' => 'Turning off short_open_tag is prohibited as it can break other plugins.',
120120
),
121121
);
@@ -140,14 +140,14 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
140140
$option_value = $this->strip_quotes( $parameters[2]['raw'] );
141141
if ( isset( $this->whitelisted_options[ $option_name ] ) ) {
142142
$whitelisted_option = $this->whitelisted_options[ $option_name ];
143-
if ( ! isset( $whitelisted_option['valid_values'] ) || in_array( $option_value, $whitelisted_option['valid_values'], true ) ) {
143+
if ( ! isset( $whitelisted_option['valid_values'] ) || in_array( strtolower( $option_value ), $whitelisted_option['valid_values'], true ) ) {
144144
return;
145145
}
146146
}
147147

148148
if ( isset( $this->blacklisted_options[ $option_name ] ) ) {
149149
$blacklisted_option = $this->blacklisted_options[ $option_name ];
150-
if ( ! isset( $blacklisted_option['invalid_values'] ) || in_array( $option_value, $blacklisted_option['invalid_values'], true ) ) {
150+
if ( ! isset( $blacklisted_option['invalid_values'] ) || in_array( strtolower( $option_value ), $blacklisted_option['invalid_values'], true ) ) {
151151
$this->phpcsFile->addError(
152152
'%s(%s, %s) found. %s',
153153
$stackPtr,

WordPress/Tests/PHP/IniSetUnitTest.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
ini_set('auto_detect_line_endings', true); // Ok.
4+
ini_set( 'auto_detect_line_endings',true) ; // Ok.
45
ini_set('highlight.bg', '#FFFFFF'); // Ok.
56
ini_set('highlight.comment', '#FFFFFF'); // Ok.
67
ini_set('highlight.default', '#FFFFFF'); // Ok.
@@ -10,8 +11,10 @@ ini_set('highlight.string', '#FFFFFF'); // Ok.
1011
ini_set('short_open_tag', true); // Ok.
1112
ini_set('short_open_tag', 1); // Ok.
1213
ini_set('short_open_tag', 'On'); // Ok.
14+
ini_set('short_open_tag', 'on'); // Ok.
1315

1416
ini_set('bcmath.scale', 0); // Error.
17+
ini_set( 'bcmath.scale' ,0 ); // Error.
1518
ini_set('display_errors', 0); // Error.
1619
ini_set('error_reporting', 0); // Error.
1720
ini_set('filter.default', 'full_special_chars'); // Error.
@@ -25,10 +28,13 @@ ini_set('log_errors', true); // Error.
2528
ini_set('max_execution_time', 60); // Error.
2629
ini_set('memory_limit', -1); // Error.
2730
ini_set('short_open_tag', false); // Error.
31+
ini_set('short_open_tag', FALSE); // Error.
32+
ini_set('short_open_tag', FaLsE); // Error.
2833
ini_set('short_open_tag', 0); // Error.
2934
ini_set('short_open_tag', 'Off'); // Error.
3035

3136
ini_set('report_memleaks', true); // Warning.
37+
ini_set('report_memleaks',true); // Warning.
3238
ini_set('short_open_tag', 1230); // Warning.
3339
ini_set($test, 1230); // Warning.
3440

WordPress/Tests/PHP/IniSetUnitTest.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class IniSetUnitTest extends AbstractSniffUnitTest {
2727
*/
2828
public function getErrorList() {
2929
return array(
30-
14 => 1,
31-
15 => 1,
3230
16 => 1,
3331
17 => 1,
3432
18 => 1,
@@ -43,7 +41,12 @@ public function getErrorList() {
4341
27 => 1,
4442
28 => 1,
4543
29 => 1,
46-
36 => 1,
44+
30 => 1,
45+
31 => 1,
46+
32 => 1,
47+
33 => 1,
48+
34 => 1,
49+
42 => 1,
4750
);
4851
}
4952

@@ -54,10 +57,11 @@ public function getErrorList() {
5457
*/
5558
public function getWarningList() {
5659
return array(
57-
31 => 1,
58-
32 => 1,
59-
33 => 1,
60+
36 => 1,
6061
37 => 1,
62+
38 => 1,
63+
39 => 1,
64+
43 => 1,
6165
);
6266
}
6367

0 commit comments

Comments
 (0)