Merge pull request #445 from PHPCSStandards/internal/isshortarrayorlist-minor-tweak

IsShortArrayOrList::walkInside(): minor efficiency tweak

Author: jrfnl

PHPCSUtils/Internal/IsShortArrayOrList.php

@@ -472,7 +472,7 @@ private function walkInside($opener, $recursions = 0)
              * If we encounter a completely empty item, this must be a short list as arrays cannot contain
              * empty items.
              */
-            if ($item['raw'] === '') {
+            if ($item['clean'] === '') {
                 return self::SHORT_LIST;
             }
 

Tests/Internal/IsShortArrayOrList/WalkInsideTest.inc

@@ -139,6 +139,8 @@ $array = [
     [, $a, $b],
     /* testNestedShortListEmptyEntryInMiddle */
     [$a,, $b],
+    /* testNestedShortListEmptyEntryInMiddleWithComment */
+    [$a, /*empty*/, $b],
     /* testNestedShortListEmptyEntryAtEnd */
     [$a, $b, , ],
 

Tests/Internal/IsShortArrayOrList/WalkInsideTest.php

@@ -225,6 +225,10 @@ public function dataWalkInsideResolved()
                 'testMarker' => '/* testNestedShortListEmptyEntryInMiddle */',
                 'expected'   => IsShortArrayOrList::SHORT_LIST,
             ],
+            'nested-short-list-empty-entry-in-middle-with-comment' => [
+                'testMarker' => '/* testNestedShortListEmptyEntryInMiddleWithComment */',
+                'expected'   => IsShortArrayOrList::SHORT_LIST,
+            ],
             'nested-short-list-empty-entry-at-end' => [
                 'testMarker' => '/* testNestedShortListEmptyEntryAtEnd */',
                 'expected'   => IsShortArrayOrList::SHORT_LIST,