Merge pull request #474 from PHPCSStandards/utils/controlstructures-getcaughtexceptions-more-defensive-coding

ControlStructures: more defensive coding against parse errors

Author: jrfnl

PHPCSUtils/Utils/ControlStructures.php

@@ -209,6 +209,7 @@ public static function isElseIf(File $phpcsFile, $stackPtr)
      *                 'type_end_token' => integer, // The stack pointer to the end of the type declaration.
      *               )
      *               ```
+     *               In case of an invalid catch structure, the array may be empty.
      *
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified `$stackPtr` is not of
      *                                                      type `T_CATCH` or doesn't exist.
@@ -243,12 +244,14 @@ public static function getCaughtExceptions(File $phpcsFile, $stackPtr)
             }
 
             if (isset(Collections::namespacedNameTokens()[$tokens[$i]['code']]) === false) {
-                // Add the current exception to the result array.
-                $exceptions[] = [
-                    'type'           => $foundName,
-                    'type_token'     => $firstToken,
-                    'type_end_token' => $lastToken,
-                ];
+                // Add the current exception to the result array if one was found.
+                if ($foundName !== '') {
+                    $exceptions[] = [
+                        'type'           => $foundName,
+                        'type_token'     => $firstToken,
+                        'type_end_token' => $lastToken,
+                    ];
+                }
 
                 if ($tokens[$i]['code'] === \T_BITWISE_OR) {
                     // Multi-catch. Reset and continue.

Tests/Utils/ControlStructures/GetCaughtExceptionsTest.inc

@@ -30,6 +30,12 @@ try {
 /* testPHP8NonCapturingCatch */
 } catch (RuntimeException | AnotherException) {
 
+/* testMissingExceptionName */
+} catch ($e) {
+
+/* testMultiMissingExceptionNames */
+} catch ( | $e) {
+
 /* testLiveCoding */
 // Intentional parse error.
 } catch (

Tests/Utils/ControlStructures/GetCaughtExceptionsTest.php

@@ -214,6 +214,14 @@ public function dataGetCaughtExceptions()
                     ],
                 ],
             ],
+            'catch-without-named-exception' => [
+                'testMarker'    => '/* testMissingExceptionName */',
+                'expected'      => [],
+            ],
+            'multi-catch-without-named-exceptions' => [
+                'testMarker'    => '/* testMultiMissingExceptionNames */',
+                'expected'      => [],
+            ],
         ];
     }
 }