Merge 6593f61 into e411e6b

PHPCSStandards · May 17, 2020 · dba24f6 · dba24f6
2 parents e411e6b + 6593f61
commit dba24f6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/PHPCSUtils/Utils/ControlStructures.php b/PHPCSUtils/Utils/ControlStructures.php
@@ -383,7 +383,7 @@ public static function getCaughtExceptions(File $phpcsFile, $stackPtr)
         $firstToken = null;
         $lastToken  = null;
 
-        for ($i = ($opener + 1); $i < $closer; $i++) {
+        for ($i = ($opener + 1); $i <= $closer; $i++) {
             if (isset(Tokens::$emptyTokens[$tokens[$i]['code']])) {
                 continue;
             }

diff --git a/Tests/Utils/ControlStructures/GetCaughtExceptionsTest.inc b/Tests/Utils/ControlStructures/GetCaughtExceptionsTest.inc
@@ -27,6 +27,9 @@ try {
 /* testMultiCatchCompoundNames */
 } catch (\NS\RuntimeException | My\ParseErrorException | namespace \ AnotherException $e) {
 
+/* testPHP8NonCapturingCatch */
+} catch (RuntimeException | AnotherException) {
+
 /* testLiveCoding */
 // Intentional parse error.
 } catch (
diff --git a/Tests/Utils/ControlStructures/GetCaughtExceptionsTest.php b/Tests/Utils/ControlStructures/GetCaughtExceptionsTest.php
@@ -197,6 +197,21 @@ public function dataGetCaughtExceptions()
                     ],
                 ],
             ],
+            'non-capturing-catch' => [
+                'target'        => '/* testPHP8NonCapturingCatch */',
+                'expected'      => [
+                    [
+                        'type'           => 'RuntimeException',
+                        'type_token'     => 3,
+                        'type_end_token' => 3,
+                    ],
+                    [
+                        'type'           => 'AnotherException',
+                        'type_token'     => 7,
+                        'type_end_token' => 7,
+                    ],
+                ],
+            ],
         ];
     }
 }