Skip to content

Commit 083ad26

Browse files
rodrigoprimojrfnl
andcommitted
Apply suggestions from code review
Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
1 parent a0b04f6 commit 083ad26

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

WordPress/Sniffs/Arrays/ArrayDeclarationSpacingSniff.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* @since 3.0.0 Removed various whitespace related checks and fixers in favor of the PHPCSExtra
4040
* `NormalizedArrays.Arrays.ArrayBraceSpacing` sniff.
4141
* @since 3.4.0 The `allow_single_item_single_line_associative_arrays` property has been
42-
* deprecated in favor of `allow_single_item_single_line_explicit_key_arrays`.
42+
* deprecated in favor of the new `allow_single_item_single_line_explicit_key_arrays` property.
4343
*/
4444
final class ArrayDeclarationSpacingSniff extends Sniff {
4545

@@ -130,9 +130,9 @@ protected function process_single_line_array( $stackPtr, $opener, $closer ) {
130130
// the deprecated property's value.
131131
$allow_single_item = $this->allow_single_item_single_line_explicit_key_arrays;
132132
if ( true === $allow_single_item
133-
&& true !== $this->allow_single_item_single_line_associative_arrays
133+
&& false === $this->allow_single_item_single_line_associative_arrays
134134
) {
135-
$allow_single_item = $this->allow_single_item_single_line_associative_arrays;
135+
$allow_single_item = false;
136136
}
137137

138138
$array_items = PassedParameters::getParameters( $this->phpcsFile, $stackPtr );

WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,9 @@ $bad = array( 'key' => 'value' ); // Bad.
8888
$bad = array( 'key1' => 'value1', 'key2' => 'value2' ); // Bad.
8989

9090
// phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_explicit_key_arrays true
91+
92+
// phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays null
93+
94+
$ok = array( 'key' => 'value' ); // OK, invalid value for deprecated property should be ignored.
95+
96+
// phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays true

WordPress/Tests/Arrays/ArrayDeclarationSpacingUnitTest.1.inc.fixed

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,9 @@ $bad = array(
146146
); // Bad.
147147

148148
// phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_explicit_key_arrays true
149+
150+
// phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays null
151+
152+
$ok = array( 'key' => 'value' ); // OK, invalid value for deprecated property should be ignored.
153+
154+
// phpcs:set WordPress.Arrays.ArrayDeclarationSpacing allow_single_item_single_line_associative_arrays true

0 commit comments

Comments
 (0)