Skip to content

Commit 5571c8e

Browse files
rodrigoprimorodrigoprimo
committed
Update some tests to have more whitespaces, comments and annotations
1 parent 3ca5d1f commit 5571c8e

File tree

3 files changed

+75
-45
lines changed

3 files changed

+75
-45
lines changed

‎WordPress/Tests/WP/OptionAutoloadUnitTest.inc‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ $ok = ADD_OPTION( 'my_option', new stdClass(), '', null );
1919
$ok = add_option( 'my_option', autoload: FALSE, value: 'my_value' );
2020
$ok = add_option( 'my_option', autoload: false );
2121
$ok = add_option( autoload: false, deprecated: '', value: 'my_value', option: 'my_option' );
22-
$ok = \update_option( 'my_option', 'new_value', \true );
23-
$ok = update_option( 'my_option', 'new_value', \false );
22+
$ok = \update_option( 'my_option' , 'new_value' , \true );
23+
$ok = update_option(
24+
'my_option',
25+
'new_value',
26+
// phpcs:ignore Standard.Category.Sniff -- For test reasons.
27+
/* comment */ \false /* comment */
28+
);
2429
$ok = Update_Option( 'my_option', 'new_value', \NULL );
2530
$ok = update_option( 'my_option', autoload: TrUe, value: 'new_value' );
2631
$ok = update_option( autoload: false, value: 'my_value', option: 'my_option' );
@@ -53,7 +58,12 @@ $ignored = ADD_OPTION( 'my_option', 'my_value', '', $obj->yes );
5358
$ignored = add_option( 'my_option', 'my_value', '', $some_variable ? 'yes' : 'no' );
5459
$ignored = Add_Option( 'my_option', 'my_value', '', 'ye' . 's' );
5560
$ignored = add_option( 'my_option', 'my_value', '', (function () { return 'yes'; })() );
56-
$ignored = add_option( 'my_option', 'new_value', '', yes);
61+
$ignored = add_option(
62+
'my_option',
63+
'new_value',
64+
'',
65+
/* comment */ yes /* comment */
66+
);
5767
$ignored = wp_set_options_autoload( array( 'option1', 'option2' ), $some_variable );
5868
$ignored = wp_set_OPTION_autoload( 'option1', $some_variable );
5969
$ignored = wp_set_option_autoload_values(
@@ -85,7 +95,7 @@ $ignored = wp_set_option_autoload_values(options: []);
8595
* Invalid function calls that are ignored by the sniff as a mandatory parameter is missing.
8696
*/
8797
$ignored = wp_set_option_autoload_values();
88-
$ignored = wp_set_options_autoload();
98+
$ignored = wp_set_options_autoload( /* some comment */ );
8999
$ignored = wp_set_options_autoload( array( 'option1', 'option2' ) );
90100
$ignored = wp_set_option_autoload();
91101
$ignored = wp_set_option_autoload( 'option1' );
@@ -108,7 +118,7 @@ $warning = add_option( 'my_option', 'my_value', '', 'invalid_value' );
108118
$warning = add_option( 'my_option', 'my_value', '', 'true' );
109119
$warning = add_option( 'my_option', 'my_value', '', "false" );
110120
$warning = add_option( 'my_option', 'my_value', '', array('some', 'array') );
111-
$warning = add_option( 'my_option', 'my_value', '', ['some', 'array'] );
121+
$warning = /* comment */ add_option /* comment */ ( 'my_option', 'my_value', '', ['some', 'array'] );
112122
$warning = add_option( option: 'my_option' );
113123
$warning = add_option( value: 'my_value', option: 'my_option' );
114124
$warning = add_option( value: 'my_value', deprecated: '', option: 'my_option' );
@@ -117,7 +127,11 @@ $warning = add_option( 'my_option', 'my_value', '', 'YES' ); // the uppercase ve
117127
$warning = update_option( 'my_option', 'new_value' );
118128
$warning = update_option( 'my_option', 'new_value', 'auto' );
119129
$warning = update_option( 'my_option', 'new_value', 'auto-on' );
120-
$warning = update_option( 'my_option', 'new_value', 'auto-off' );
130+
$warning = update_option(
131+
/* option name */ 'my_option',
132+
'new_value' /* option value */,
133+
/* autoload value */ 'auto-off' // phpcs:ignore Standard.Category.Sniff -- For test reasons.
134+
);
121135
$warning = update_option( 'my_option', 'new_value', 'invalid_value' );
122136
$warning = update_option( value: 'new_value', option: 'my_option' );
123137
$warning = update_option( value: 'new_value', autoload: 'auto', option: 'my_option' );
@@ -128,6 +142,7 @@ $warning = wp_set_option_autoload( 'option1', 'invalid_value' );
128142
$warning = wp_set_option_autoload( 'option1', \NuLL );
129143
$warning = wp_set_option_autoload_values( ['option1' => null] );
130144
$warning = wp_set_option_autoload_values(
145+
// phpcs:ignore Standard.Category.Sniff -- For test reasons.
131146
[
132147
'option1' => '',
133148
'option2' => 'true',
@@ -137,7 +152,7 @@ $warning = wp_set_option_autoload_values(
137152
'option6' => 'YES',
138153
'option7' => 'invalid_value',
139154
'option8' => 'auto',
140-
'option9' => 'auto-on',
155+
'option9' /* some comment */ => /* some comment */ 'auto-on',
141156
'option10' => 'auto-off',
142157
'option11',
143158
/* some comment */ 'option12' /* some comment */,

‎WordPress/Tests/WP/OptionAutoloadUnitTest.inc.fixed‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ $ok = ADD_OPTION( 'my_option', new stdClass(), '', null );
1919
$ok = add_option( 'my_option', autoload: FALSE, value: 'my_value' );
2020
$ok = add_option( 'my_option', autoload: false );
2121
$ok = add_option( autoload: false, deprecated: '', value: 'my_value', option: 'my_option' );
22-
$ok = \update_option( 'my_option', 'new_value', \true );
23-
$ok = update_option( 'my_option', 'new_value', \false );
22+
$ok = \update_option( 'my_option' , 'new_value' , \true );
23+
$ok = update_option(
24+
'my_option',
25+
'new_value',
26+
// phpcs:ignore Standard.Category.Sniff -- For test reasons.
27+
/* comment */ \false /* comment */
28+
);
2429
$ok = Update_Option( 'my_option', 'new_value', \NULL );
2530
$ok = update_option( 'my_option', autoload: TrUe, value: 'new_value' );
2631
$ok = update_option( autoload: false, value: 'my_value', option: 'my_option' );
@@ -53,7 +58,12 @@ $ignored = ADD_OPTION( 'my_option', 'my_value', '', $obj->yes );
5358
$ignored = add_option( 'my_option', 'my_value', '', $some_variable ? 'yes' : 'no' );
5459
$ignored = Add_Option( 'my_option', 'my_value', '', 'ye' . 's' );
5560
$ignored = add_option( 'my_option', 'my_value', '', (function () { return 'yes'; })() );
56-
$ignored = add_option( 'my_option', 'new_value', '', yes);
61+
$ignored = add_option(
62+
'my_option',
63+
'new_value',
64+
'',
65+
/* comment */ yes /* comment */
66+
);
5767
$ignored = wp_set_options_autoload( array( 'option1', 'option2' ), $some_variable );
5868
$ignored = wp_set_OPTION_autoload( 'option1', $some_variable );
5969
$ignored = wp_set_option_autoload_values(
@@ -85,7 +95,7 @@ $ignored = wp_set_option_autoload_values(options: []);
8595
* Invalid function calls that are ignored by the sniff as a mandatory parameter is missing.
8696
*/
8797
$ignored = wp_set_option_autoload_values();
88-
$ignored = wp_set_options_autoload();
98+
$ignored = wp_set_options_autoload( /* some comment */ );
8999
$ignored = wp_set_options_autoload( array( 'option1', 'option2' ) );
90100
$ignored = wp_set_option_autoload();
91101
$ignored = wp_set_option_autoload( 'option1' );
@@ -108,7 +118,7 @@ $warning = add_option( 'my_option', 'my_value', '', 'invalid_value' );
108118
$warning = add_option( 'my_option', 'my_value', '', 'true' );
109119
$warning = add_option( 'my_option', 'my_value', '', "false" );
110120
$warning = add_option( 'my_option', 'my_value', '', array('some', 'array') );
111-
$warning = add_option( 'my_option', 'my_value', '', ['some', 'array'] );
121+
$warning = /* comment */ add_option /* comment */ ( 'my_option', 'my_value', '', ['some', 'array'] );
112122
$warning = add_option( option: 'my_option' );
113123
$warning = add_option( value: 'my_value', option: 'my_option' );
114124
$warning = add_option( value: 'my_value', deprecated: '', option: 'my_option' );
@@ -117,7 +127,11 @@ $warning = add_option( 'my_option', 'my_value', '', 'YES' ); // the uppercase ve
117127
$warning = update_option( 'my_option', 'new_value' );
118128
$warning = update_option( 'my_option', 'new_value', 'auto' );
119129
$warning = update_option( 'my_option', 'new_value', 'auto-on' );
120-
$warning = update_option( 'my_option', 'new_value', 'auto-off' );
130+
$warning = update_option(
131+
/* option name */ 'my_option',
132+
'new_value' /* option value */,
133+
/* autoload value */ 'auto-off' // phpcs:ignore Standard.Category.Sniff -- For test reasons.
134+
);
121135
$warning = update_option( 'my_option', 'new_value', 'invalid_value' );
122136
$warning = update_option( value: 'new_value', option: 'my_option' );
123137
$warning = update_option( value: 'new_value', autoload: 'auto', option: 'my_option' );
@@ -128,6 +142,7 @@ $warning = wp_set_option_autoload( 'option1', 'invalid_value' );
128142
$warning = wp_set_option_autoload( 'option1', \NuLL );
129143
$warning = wp_set_option_autoload_values( ['option1' => null] );
130144
$warning = wp_set_option_autoload_values(
145+
// phpcs:ignore Standard.Category.Sniff -- For test reasons.
131146
[
132147
'option1' => '',
133148
'option2' => 'true',
@@ -137,7 +152,7 @@ $warning = wp_set_option_autoload_values(
137152
'option6' => 'YES',
138153
'option7' => 'invalid_value',
139154
'option8' => 'auto',
140-
'option9' => 'auto-on',
155+
'option9' /* some comment */ => /* some comment */ 'auto-on',
141156
'option10' => 'auto-off',
142157
'option11',
143158
/* some comment */ 'option12' /* some comment */,

‎WordPress/Tests/WP/OptionAutoloadUnitTest.php‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,12 @@ public function getErrorList() {
3636
*/
3737
public function getWarningList() {
3838
return array(
39-
96 => 1,
40-
97 => 1,
41-
98 => 1,
42-
99 => 1,
43-
100 => 1,
44-
105 => 1,
39+
106 => 1,
4540
107 => 1,
4641
108 => 1,
4742
109 => 1,
4843
110 => 1,
49-
111 => 1,
50-
112 => 1,
51-
113 => 1,
52-
114 => 1,
5344
115 => 1,
54-
116 => 1,
5545
117 => 1,
5646
118 => 1,
5747
119 => 1,
@@ -65,9 +55,7 @@ public function getWarningList() {
6555
127 => 1,
6656
128 => 1,
6757
129 => 1,
68-
132 => 1,
6958
133 => 1,
70-
134 => 1,
7159
135 => 1,
7260
136 => 1,
7361
137 => 1,
@@ -77,40 +65,52 @@ public function getWarningList() {
7765
141 => 1,
7866
142 => 1,
7967
143 => 1,
68+
147 => 1,
8069
148 => 1,
8170
149 => 1,
8271
150 => 1,
8372
151 => 1,
8473
152 => 1,
8574
153 => 1,
75+
154 => 1,
76+
155 => 1,
77+
156 => 1,
78+
157 => 1,
8679
158 => 1,
87-
159 => 1,
88-
160 => 1,
89-
161 => 1,
90-
162 => 1,
9180
163 => 1,
9281
164 => 1,
93-
170 => 1,
82+
165 => 1,
83+
166 => 1,
84+
167 => 1,
85+
168 => 1,
86+
173 => 1,
87+
174 => 1,
88+
175 => 1,
89+
176 => 1,
9490
177 => 1,
91+
178 => 1,
9592
179 => 1,
96-
180 => 1,
97-
181 => 1,
98-
182 => 1,
99-
183 => 1,
100-
184 => 1,
10193
185 => 1,
102-
187 => 1,
103-
188 => 1,
104-
189 => 1,
105-
190 => 1,
106-
193 => 1,
94+
192 => 1,
10795
194 => 1,
10896
195 => 1,
10997
196 => 1,
110-
201 => 1,
111-
207 => 1,
98+
197 => 1,
99+
198 => 1,
100+
199 => 1,
101+
200 => 1,
102+
202 => 1,
103+
203 => 1,
104+
204 => 1,
105+
205 => 1,
106+
208 => 1,
112107
209 => 1,
113-
212 => 1,
108+
210 => 1,
109+
211 => 1,
110+
216 => 1,
111+
222 => 1,
112+
224 => 1,
113+
227 => 1,
114114
);
115115
}
116116
}

0 commit comments

Comments
 (0)