Tests/Tokenizer: improve stability of the switch keyword tests

This commits improves the stability of the switch keyword tests by
ensuring that specific markers are used to get the scope closer and
scope opener tokens.

Author: rodrigoprimo

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.inc

@@ -1,26 +1,26 @@
 <?php
 
 /* testSwitchNormalSyntax */
-switch ($value) {
+switch ($value) /* testSwitchNormalSyntaxScopeOpener */ {
     case 1:
         echo 'one';
         break;
     default :
         echo 'other';
         break;
+/* testSwitchNormalSyntaxScopeCloser */
 }
 
 // Test for https://github.com/squizlabs/PHP_CodeSniffer/issues/497
 /* testSwitchAlternativeSyntax */
-switch ($value):
-    /* testSwitchAlternativeSyntaxEnsureTestWillNotPickUpWrongColon */
+switch ($value) /* testSwitchAlternativeSyntaxScopeOpener */ :
     case 1:
         echo 'one';
         break;
     default:
         echo 'other';
         break;
-/* testSwitchAlternativeSyntaxEnd */
+/* testSwitchAlternativeSyntaxScopeCloser */
 endswitch;
 
 // Test for https://github.com/squizlabs/PHP_CodeSniffer/issues/543
@@ -30,4 +30,5 @@ switch((function () {
 })()) /* testSwitchClosureWithinConditionScopeOpener */ {
     case 1:
         return 'test';
+/* testSwitchClosureWithinConditionScopeCloser */
 }

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php

@@ -98,20 +98,22 @@ public static function dataSwitchScope()
     {
         return [
             'switch normal syntax'                 => [
-                'testMarker'     => '/* testSwitchNormalSyntax */',
-                'expectedTokens' => [
+                'testMarker'       => '/* testSwitchNormalSyntax */',
+                'expectedTokens'   => [
                     'scope_opener' => T_OPEN_CURLY_BRACKET,
                     'scope_closer' => T_CLOSE_CURLY_BRACKET,
                 ],
+                'testOpenerMarker' => '/* testSwitchNormalSyntaxScopeOpener */',
+                'testCloserMarker' => '/* testSwitchNormalSyntaxScopeCloser */',
             ],
             'switch alternative syntax'            => [
                 'testMarker'       => '/* testSwitchAlternativeSyntax */',
                 'expectedTokens'   => [
                     'scope_opener' => T_COLON,
                     'scope_closer' => T_ENDSWITCH,
                 ],
-                'testOpenerMarker' => null,
-                'testCloserMarker' => '/* testSwitchAlternativeSyntaxEnd */',
+                'testOpenerMarker' => '/* testSwitchAlternativeSyntaxScopeOpener */',
+                'testCloserMarker' => '/* testSwitchAlternativeSyntaxScopeCloser */',
             ],
             'switch with closure in the condition' => [
                 'testMarker'       => '/* testSwitchClosureWithinCondition */',
@@ -120,7 +122,7 @@ public static function dataSwitchScope()
                     'scope_closer' => T_CLOSE_CURLY_BRACKET,
                 ],
                 'testOpenerMarker' => '/* testSwitchClosureWithinConditionScopeOpener */',
-                'testCloserMarker' => '/* testSwitchClosureWithinConditionScopeOpener */',
+                'testCloserMarker' => '/* testSwitchClosureWithinConditionScopeCloser */',
             ],
         ];