Asymmetric visibility: expand tests, check is_array

Author: DanielEScherzer

src/Tokenizers/PHP.php

@@ -1236,6 +1236,7 @@ protected function tokenize($string)
                 && in_array($token[0], [T_PUBLIC, T_PROTECTED, T_PRIVATE], true) === true
                 && ($stackPtr + 3) < $numTokens
                 && $tokens[($stackPtr + 1)] === '('
+                && is_array($tokens[($stackPtr + 2)])
                 && $tokens[($stackPtr + 2)][0] === T_STRING
                 && strtolower($tokens[($stackPtr + 2)][1]) === 'set'
                 && $tokens[($stackPtr + 3)] === ')'

tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.inc

@@ -15,6 +15,12 @@ class PropertyDemo {
     /* testPrivateSetPropertyUC */ PRIVATE(SET) mixed $priv2;
     public /* testPublicPrivateSetProperty */ private(set) mixed $priv3;
     public /* testPublicPrivateSetPropertyUC */ PRIVATE(SET) mixed $priv4;
+
+    /* testInvalidUnsetProperty */ public mixed $invalid1;
+    /* testInvalidSpaceProperty */ public (set) mixed $invalid2;
+    /* testInvalidCommentProperty */ protected/* foo */(set) mixed $invalid3;
+    /* testInvalidGetProperty */ private(get) mixed $invalid4;
+    /* testInvalidNoParenProperty */ private set mixed $invalid5;
 }
 
 class ConstructorPromotionDemo {
@@ -33,5 +39,14 @@ class ConstructorPromotionDemo {
         /* testPrivateSetCPPUC */ PRIVATE(SET) mixed $priv2,
         public /* testPublicPrivateSetCPP */ private(set) mixed $priv3,
         public /* testPublicPrivateSetCPPUC */ PRIVATE(SET) mixed $priv4,
+
+        /* testInvalidUnsetCPP */ public(unset) mixed $invalid1,
+        /* testInvalidSpaceCPP */ public (set) mixed $invalid2,
+        /* testInvalidCommentCPP */ protected/* foo */(set) mixed $invalid3,
+        /* testInvalidGetCPP */ private(get) mixed $invalid4,
+        /* testInvalidNoParenCPP */ private set mixed $invalid5,
     ) {}
 }
+
+class LiveCodingDemo {
+    /* testLiveCoding */ private(set

tests/Core/Tokenizers/PHP/BackfillAsymmetricVisibilityTest.php

@@ -35,6 +35,8 @@ public function testAsymmetricVisibility($testMarker, $testType, $testContent)
                 T_PUBLIC_SET,
                 T_PROTECTED_SET,
                 T_PRIVATE_SET,
+                // For error cases
+                constant($testType),
             ],
             $testContent
         );
@@ -125,6 +127,31 @@ public static function dataAsymmetricVisibility()
                 'testType'    => 'T_PRIVATE_SET',
                 'testContent' => 'PRIVATE(SET)',
             ],
+            'property, invalid case 1'                                 => [
+                'testMarker'  => '/* testInvalidUnsetProperty */',
+                'testType'    => 'T_PUBLIC',
+                'testContent' => 'public',
+            ],
+            'property, invalid case 2'                                 => [
+                'testMarker'  => '/* testInvalidSpaceProperty */',
+                'testType'    => 'T_PUBLIC',
+                'testContent' => 'public',
+            ],
+            'property, invalid case 3'                                 => [
+                'testMarker'  => '/* testInvalidCommentProperty */',
+                'testType'    => 'T_PROTECTED',
+                'testContent' => 'protected',
+            ],
+            'property, invalid case 4'                                 => [
+                'testMarker'  => '/* testInvalidGetProperty */',
+                'testType'    => 'T_PRIVATE',
+                'testContent' => 'private',
+            ],
+            'property, invalid case 5'                                 => [
+                'testMarker'  => '/* testInvalidNoParenProperty */',
+                'testType'    => 'T_PRIVATE',
+                'testContent' => 'private',
+            ],
 
             // Constructor property promotion.
             'promotion, public set, no read visibility, lowercase'     => [
@@ -187,6 +214,38 @@ public static function dataAsymmetricVisibility()
                 'testType'    => 'T_PRIVATE_SET',
                 'testContent' => 'PRIVATE(SET)',
             ],
+            'promotion, invalid case 1'                                => [
+                'testMarker'  => '/* testInvalidUnsetCPP */',
+                'testType'    => 'T_PUBLIC',
+                'testContent' => 'public',
+            ],
+            'promotion, invalid case 2'                                => [
+                'testMarker'  => '/* testInvalidSpaceCPP */',
+                'testType'    => 'T_PUBLIC',
+                'testContent' => 'public',
+            ],
+            'promotion, invalid case 3'                                => [
+                'testMarker'  => '/* testInvalidCommentCPP */',
+                'testType'    => 'T_PROTECTED',
+                'testContent' => 'protected',
+            ],
+            'promotion, invalid case 4'                                => [
+                'testMarker'  => '/* testInvalidGetCPP */',
+                'testType'    => 'T_PRIVATE',
+                'testContent' => 'private',
+            ],
+            'promotion, invalid case 5'                                => [
+                'testMarker'  => '/* testInvalidNoParenCPP */',
+                'testType'    => 'T_PRIVATE',
+                'testContent' => 'private',
+            ],
+
+            // Live coding.
+            'live coding'                                              => [
+                'testMarker'  => '/* testLiveCoding */',
+                'testType'    => 'T_PRIVATE',
+                'testContent' => 'private',
+            ]
         ];
 
     }//end dataAsymmetricVisibility()