Merge pull request #1014 from PHPCSStandards/phpcs-4.0/feature/23-tokenizer-isset-unset-empty-eval-exit-parentheses-owner

Tokenizer: isset/unset/empty/eval/exit/die now contain parenthesis information

Author: jrfnl

src/Util/Tokens.php

@@ -369,6 +369,11 @@ final class Tokens
         T_CATCH      => T_CATCH,
         T_DECLARE    => T_DECLARE,
         T_MATCH      => T_MATCH,
+        T_ISSET      => T_ISSET,
+        T_EMPTY      => T_EMPTY,
+        T_UNSET      => T_UNSET,
+        T_EVAL       => T_EVAL,
+        T_EXIT       => T_EXIT,
     ];
 
     /**

tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.inc

@@ -84,24 +84,29 @@ $a = ($b + $c/* testArbitraryParenthesesCloser */);
 /* testFunctionCallParenthesesOpener */
 do_something($b + $c, $d, false /* testFunctionCallParenthesesCloser */);
 
-/* testIssetParenthesesOpener */
+/* testIssetParenthesesOwner */
 $set = isset($b, $c/* testIssetParenthesesCloser */);
 
-/* testEmptyParenthesesOpener */
+/* testEmptyParenthesesOwner */
 $empty = empty($b /* testEmptyParenthesesCloser */);
 
-/* testUnsetParenthesesOpener */
+/* testUnsetParenthesesOwner */
 unset ($b, $c /* testUnsetParenthesesCloser */);
 
-/* testEvalParenthesesOpener */
+/* testEvalParenthesesOwner */
 $eval = eval("\$str = \"$str\";"/* testEvalParenthesesCloser */);
 
-/* testExitParenthesesOpener */
+/* testExitParenthesesOwner */
 exit ( 101 /* testExitParenthesesCloser */);
 
-/* testDieParenthesesOpener */
+/* testDieParenthesesOwner */
 die ('oopsie' /* testDieParenthesesCloser */);
 
+/* testExitNoParentheses */
+exit;
+
+/* testDieNoParentheses */
+die;
 
 /*
  * All together now, let's make things a little more interesting....

tests/Core/Tokenizers/Tokenizer/CreateTokenMapParenthesesTest.php

@@ -151,6 +151,30 @@ public static function dataParenthesesWithOwner()
                 'testMarker' => '/* testAnonClassParenthesesOwner */',
                 'tokenCode'  => T_ANON_CLASS,
             ],
+            'isset'                                          => [
+                'testMarker' => '/* testIssetParenthesesOwner */',
+                'tokenCode'  => T_ISSET,
+            ],
+            'empty'                                          => [
+                'testMarker' => '/* testEmptyParenthesesOwner */',
+                'tokenCode'  => T_EMPTY,
+            ],
+            'unset'                                          => [
+                'testMarker' => '/* testUnsetParenthesesOwner */',
+                'tokenCode'  => T_UNSET,
+            ],
+            'eval'                                           => [
+                'testMarker' => '/* testEvalParenthesesOwner */',
+                'tokenCode'  => T_EVAL,
+            ],
+            'exit'                                           => [
+                'testMarker' => '/* testExitParenthesesOwner */',
+                'tokenCode'  => T_EXIT,
+            ],
+            'die'                                            => [
+                'testMarker' => '/* testDieParenthesesOwner */',
+                'tokenCode'  => T_EXIT,
+            ],
 
             'if - nested outer'                              => [
                 'testMarker' => '/* testNestedOuterIfParenthesesOwner */',
@@ -237,24 +261,6 @@ public static function dataParenthesesWithoutOwner()
             'function call'                     => [
                 'testMarker' => '/* testFunctionCallParenthesesOpener */',
             ],
-            'isset'                             => [
-                'testMarker' => '/* testIssetParenthesesOpener */',
-            ],
-            'empty'                             => [
-                'testMarker' => '/* testEmptyParenthesesOpener */',
-            ],
-            'unset'                             => [
-                'testMarker' => '/* testUnsetParenthesesOpener */',
-            ],
-            'eval'                              => [
-                'testMarker' => '/* testEvalParenthesesOpener */',
-            ],
-            'exit'                              => [
-                'testMarker' => '/* testExitParenthesesOpener */',
-            ],
-            'die'                               => [
-                'testMarker' => '/* testDieParenthesesOpener */',
-            ],
             'function call - nested 1'          => [
                 'testMarker' => '/* testNestedFunctionCallAParenthesesOpener */',
             ],
@@ -306,6 +312,14 @@ public static function dataParenthesesOwnerWithoutParentheses()
                 'testMarker' => '/* testAnonClassNoParentheses */',
                 'tokenCode'  => T_ANON_CLASS,
             ],
+            'exit without parentheses'            => [
+                'testMarker' => '/* testExitNoParentheses */',
+                'tokenCode'  => T_EXIT,
+            ],
+            'die without parentheses'             => [
+                'testMarker' => '/* testDieNoParentheses */',
+                'tokenCode'  => T_EXIT,
+            ],
         ];
 
     }//end dataParenthesesOwnerWithoutParentheses()