Fixed bug #523 : Generic ScopeIndent errors for IF in FINALLY

Author: gsherwood

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc

@@ -835,6 +835,16 @@ array(
  },
 );
 
+try {
+    echo 'foo';
+} catch (\Exception $e) {
+    echo 'catch';
+} finally {
+    if (false) {
+        echo 'finally false';
+    }
+}
+
     function foo()
     {
         $foo = array(

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed

@@ -835,6 +835,16 @@ array(
  },
 );
 
+try {
+    echo 'foo';
+} catch (\Exception $e) {
+    echo 'catch';
+} finally {
+    if (false) {
+        echo 'finally false';
+    }
+}
+
 function foo()
 {
     $foo = array(

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

@@ -835,6 +835,16 @@ array(
  },
 );
 
+try {
+	echo 'foo';
+} catch (\Exception $e) {
+	echo 'catch';
+} finally {
+	if (false) {
+		echo 'finally false';
+	}
+}
+
 	function foo()
 	{
 		$foo = array(

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed

@@ -835,6 +835,16 @@ array(
  },
 );
 
+try {
+	echo 'foo';
+} catch (\Exception $e) {
+	echo 'catch';
+} finally {
+	if (false) {
+		echo 'finally false';
+	}
+}
+
 function foo()
 {
 	$foo = array(

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -139,8 +139,8 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                 802 => 1,
                 803 => 1,
                 823 => 1,
-                838 => 1,
-                850 => 1,
+                848 => 1,
+                860 => 1,
                );
 
     }//end getErrorList()

CodeSniffer/Tokens.php

@@ -177,6 +177,7 @@ final class PHP_CodeSniffer_Tokens
                                  T_DO                  => 50,
                                  T_TRY                 => 50,
                                  T_CATCH               => 50,
+                                 T_FINALLY             => 50,
                                  T_SWITCH              => 50,
 
                                  T_SELF                => 25,
@@ -494,6 +495,7 @@ final class PHP_CodeSniffer_Tokens
                                    T_DO        => T_DO,
                                    T_TRY       => T_TRY,
                                    T_CATCH     => T_CATCH,
+                                   T_FINALLY   => T_FINALLY,
                                    T_PROPERTY  => T_PROPERTY,
                                    T_OBJECT    => T_OBJECT,
                                    T_USE       => T_USE,

package.xml

@@ -43,6 +43,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #479 : Yielded values are not recognised as returned values in Squiz FunctionComment sniff
   - Fixed bug #512 : Endless loop whilst parsing mixture of control structure styles
   - Fixed bug #515 : Spaces in JS block incorrectly flagged as indentation error
+  - Fixed bug #523 : Generic ScopeIndent errors for IF in FINALLY
   - Fixed bug #527 : Closure inside IF statement is not tokenized correctly
  </notes>
  <contents>