Improve last three tests adding suggestions from code review

Author: rodrigoprimo

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.inc

@@ -37,22 +37,24 @@ switch((function () {
 /* testSwitchClosureWithReturnTypeWithinCondition */
 switch((function (): string {
     return 'bar';
-})()) /* testSwitchClosureWithReturnTypeWithinConditionScopeOpener */ {
+})()) /* testSwitchClosureWithReturnTypeWithinConditionScopeOpener */ :
+    /* testSwitchClosureWithReturnTypeWithinConditionEnsureTestWillNotPickUpWrongColon */
     case 1:
         return 'test';
 /* testSwitchClosureWithReturnTypeWithinConditionScopeCloser */
-}
+endswitch;
 
 /* testSwitchArrowFunctionWithinCondition */
-switch((fn() => 'bar')()) /* testSwitchArrowFunctionWithinConditionScopeOpener */ {
+switch((fn() => $obj->{$foo . $bar})()) /* testSwitchArrowFunctionWithinConditionScopeOpener */ {
     case 1:
         return 'test';
 /* testSwitchArrowFunctionWithinConditionScopeCloser */
 }
 
 /* testSwitchArrowFunctionWithReturnTypeWithinCondition */
-switch((fn(): string => 'bar')()) /* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeOpener */ {
+switch((fn(): string => $condition ? 'foo' : 'bar')()) /* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeOpener */ :
+    /* testSwitchArrowFunctionWithReturnTypeWithinConditionEnsureTestWillNotPickUpWrongColon */
     case 1:
         return 'test';
 /* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeCloser */
-}
+endswitch;

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php

@@ -97,7 +97,7 @@ public function testSwitchScope($testMarker, $expectedTokens, $testOpenerMarker=
     public static function dataSwitchScope()
     {
         return [
-            'switch normal syntax'                                               => [
+            'switch normal syntax'                                                                  => [
                 'testMarker'       => '/* testSwitchNormalSyntax */',
                 'expectedTokens'   => [
                     'scope_opener' => T_OPEN_CURLY_BRACKET,
@@ -106,7 +106,7 @@ public static function dataSwitchScope()
                 'testOpenerMarker' => null,
                 'testCloserMarker' => '/* testSwitchNormalSyntaxScopeCloser */',
             ],
-            'switch alternative syntax'                                          => [
+            'switch alternative syntax'                                                             => [
                 'testMarker'       => '/* testSwitchAlternativeSyntax */',
                 'expectedTokens'   => [
                     'scope_opener' => T_COLON,
@@ -115,7 +115,7 @@ public static function dataSwitchScope()
                 'testOpenerMarker' => null,
                 'testCloserMarker' => '/* testSwitchAlternativeSyntaxScopeCloser */',
             ],
-            'switch with closure in the condition'                               => [
+            'switch with closure in the condition'                                                  => [
                 'testMarker'       => '/* testSwitchClosureWithinCondition */',
                 'expectedTokens'   => [
                     'scope_opener' => T_OPEN_CURLY_BRACKET,
@@ -124,16 +124,16 @@ public static function dataSwitchScope()
                 'testOpenerMarker' => '/* testSwitchClosureWithinConditionScopeOpener */',
                 'testCloserMarker' => '/* testSwitchClosureWithinConditionScopeCloser */',
             ],
-            'switch with closure containing return type in the condition'        => [
+            'switch alternative syntax with closure containing return type in the condition'        => [
                 'testMarker'       => '/* testSwitchClosureWithReturnTypeWithinCondition */',
                 'expectedTokens'   => [
-                    'scope_opener' => T_OPEN_CURLY_BRACKET,
-                    'scope_closer' => T_CLOSE_CURLY_BRACKET,
+                    'scope_opener' => T_COLON,
+                    'scope_closer' => T_ENDSWITCH,
                 ],
                 'testOpenerMarker' => '/* testSwitchClosureWithReturnTypeWithinConditionScopeOpener */',
                 'testCloserMarker' => '/* testSwitchClosureWithReturnTypeWithinConditionScopeCloser */',
             ],
-            'switch with arrow function in the condition'                        => [
+            'switch with arrow function in the condition'                                           => [
                 'testMarker'       => '/* testSwitchArrowFunctionWithinCondition */',
                 'expectedTokens'   => [
                     'scope_opener' => T_OPEN_CURLY_BRACKET,
@@ -142,11 +142,11 @@ public static function dataSwitchScope()
                 'testOpenerMarker' => '/* testSwitchArrowFunctionWithinConditionScopeOpener */',
                 'testCloserMarker' => '/* testSwitchArrowFunctionWithinConditionScopeCloser */',
             ],
-            'switch with arrow function containing return type in the condition' => [
+            'switch alternative syntax with arrow function containing return type in the condition' => [
                 'testMarker'       => '/* testSwitchArrowFunctionWithReturnTypeWithinCondition */',
                 'expectedTokens'   => [
-                    'scope_opener' => T_OPEN_CURLY_BRACKET,
-                    'scope_closer' => T_CLOSE_CURLY_BRACKET,
+                    'scope_opener' => T_COLON,
+                    'scope_closer' => T_ENDSWITCH,
                 ],
                 'testOpenerMarker' => '/* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeOpener */',
                 'testCloserMarker' => '/* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeCloser */',