Merge pull request #76 from VincentLanglet/fixTryCatch

🐛 Fix return in try catch

Author: VincentLanglet

SymfonyCustom/Sniffs/Formatting/ConditionalReturnOrThrowSniff.php

@@ -59,11 +59,15 @@ public function process(File $phpcsFile, $stackPtr)
             && isset($tokens[$opener]['scope_closer'])
             && $stackPtr <= $tokens[$opener]['scope_closer']) {
             $isClosure = $phpcsFile->findPrevious(T_CLOSURE, $stackPtr, $opener);
-
             if (false !== $isClosure) {
                 return;
             }
 
+            $isTryCatch = $phpcsFile->findPrevious([T_TRY, T_CATCH], $stackPtr, $opener);
+            if (false !== $isTryCatch) {
+                return;
+            }
+
             $condition = $phpcsFile->findNext($this->conditions, $stackPtr + 1);
 
             if (false !== $condition) {

SymfonyCustom/Tests/Formatting/ConditionalReturnOrThrowUnitTest.inc

@@ -79,5 +79,20 @@ class Test
             $b = 2;
         }
     }
+
+    public function ok()
+    {
+        if (false) {
+            try {
+                $a = 1;
+            } catch (NumberParseException $e) {
+                $a = 1;
+
+                return;
+            }
+        } else {
+            $a = 1;
+        }
+    }
 }