Implement code review changes related to commit 2 (3a19186)

Author: rodrigoprimo

src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.1.inc

@@ -80,10 +80,10 @@ if ($a)
 
 <?php
 
-if ($error === ERROR_INVALID_GENDER): ?>
-    Invalid gender!
-<?php elseif ($error === ERROR_EMAIL_IN_USE): ?>
-    Invalid email!
+if ($error === ERROR_ONE): ?>
+    Error one!
+<?php elseif ($error === ERROR_TWO): ?>
+    Error two!
 <?php endif;
 
 

src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.1.inc.fixed

@@ -92,10 +92,10 @@ if ($a) {
 
 <?php
 
-if ($error === ERROR_INVALID_GENDER): ?>
-    Invalid gender!
-<?php elseif ($error === ERROR_EMAIL_IN_USE): ?>
-    Invalid email!
+if ($error === ERROR_ONE): ?>
+    Error one!
+<?php elseif ($error === ERROR_TWO): ?>
+    Error two!
 <?php endif;
 
 

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.inc

@@ -13,7 +13,7 @@ switch ($value) {
 // Test for https://github.com/squizlabs/PHP_CodeSniffer/issues/497
 /* testSwitchAlternativeSyntax */
 switch ($value):
-    /* testEnsureTestWillNotPickUpWrongColon */
+    /* testSwitchAlternativeSyntaxEnsureTestWillNotPickUpWrongColon */
     case 1:
         echo 'one';
         break;

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php

@@ -3,7 +3,7 @@
  * Tests setting the scope for T_SWITCH token (normal and alternative syntax).
  *
  * @author    Rodrigo Primo <rodrigosprimo@gmail.com>
- * @copyright 2021 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @copyright 2024 PHPCSStandards and contributors
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
@@ -27,7 +27,7 @@ final class RecurseScopeMapSwitchTokenScopeTest extends AbstractTokenizerTestCas
      *
      * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/497#ref-commit-b24b96b
      *
-     * @dataProvider dataSwitch
+     * @dataProvider dataSwitchScope
      * @covers       \PHP_CodeSniffer\Tokenizers\Tokenizer::recurseScopeMap
      *
      * @return void
@@ -94,7 +94,7 @@ public function testSwitchScope($testMarker, $expectedTokens, $testOpenerMarker=
      *
      * @return array<string, array<string, string|array<string, int|string>>>
      */
-    public static function dataSwitch()
+    public static function dataSwitchScope()
     {
         return [
             'switch normal syntax'                 => [
@@ -124,7 +124,7 @@ public static function dataSwitch()
             ],
         ];
 
-    }//end dataSwitch()
+    }//end dataSwitchScope()
 
 
 }//end class