Fix ControlStructureSpacing sniff requiring blank line around "finally"

CodingStandard/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php

@@ -78,6 +78,7 @@ public function register()
                 T_ELSEIF,
                 T_TRY,
                 T_CATCH,
+                T_FINALLY,
                );
     }//end register()
 
@@ -318,6 +319,7 @@ protected function checkLeadingContent(File $phpcsFile, $stackPtr)
             || $this->insideSwitchCase($phpcsFile, $leadingContent) === true
             || ($this->elseOrElseIf($phpcsFile, $stackPtr) === true && $this->ifOrElseIf($phpcsFile, $leadingContent) === true)
             || ($this->isCatch($phpcsFile, $stackPtr) === true && $this->isTryOrCatch($phpcsFile, $leadingContent) === true)
+            || ($this->isFinally($phpcsFile, $stackPtr) === true && $this->isTryOrCatch($phpcsFile, $leadingContent) === true)
         ) {
             if ($this->isFunction($phpcsFile, $leadingContent) === true) {
                 // The previous content is the opening brace of a function
@@ -503,6 +505,7 @@ protected function checkTrailingContent(File $phpcsFile, $stackPtr)
             // Code on the next line after control structure scope closer.
             if ($this->elseOrElseIf($phpcsFile, $trailingContent) === true
                 || $this->isCatch($phpcsFile, $trailingContent) === true
+                || $this->isFinally($phpcsFile, $trailingContent) === true
             ) {
                 return;
             }
@@ -739,6 +742,21 @@ protected function isCatch(File $phpcsFile, $stackPtr)
     }//end isCatch()
 
 
+    /**
+     * Detects, that it is a closing brace of FINALLY.
+     *
+     * @param File $phpcsFile The file being scanned.
+     * @param int  $stackPtr  The position of the current token
+     *                        in the stack passed in $tokens.
+     *
+     * @return bool
+     */
+    protected function isFinally(File $phpcsFile, $stackPtr)
+    {
+        return $this->isScopeCondition($phpcsFile, $stackPtr, T_FINALLY);
+    }//end isFinally()
+
+
     /**
      * Determines that a function is located at given position.
      *

CodingStandard/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc

@@ -1691,4 +1691,44 @@ catch ( Exception1 $e ) {
     $c = 'd';
 }
 
+// TRY/FINALLY (no blank line required before/after "finally").
+try {
+    $a = 'b';
+}
+finally {
+    $c = 'd';
+}
+
+// TRY/CATCH/FINALLY (no blank line required before/after "finally").
+try {
+    $a = 'b';
+}
+catch ( Exception $e ) {
+    $c = 'd';
+}
+finally {
+    $c = 'd';
+}
+
+// TRY/FINALLY (blank line before "finally" is not allowed).
+try {
+    $a = 'b';
+}
+
+finally {
+    $c = 'd';
+}
+
+// TRY/CATCH/FINALLY (blank line before "finally" is not allowed).
+try {
+    $a = 'b';
+}
+catch ( Exception $e ) {
+    $c = 'd';
+}
+
+finally {
+    $c = 'd';
+}
+
 ?>

CodingStandard/Tests/WhiteSpace/ControlStructureSpacingUnitTest.1.inc.fixed

@@ -1665,4 +1665,42 @@ catch ( Exception1 $e ) {
     $c = 'd';
 }
 
+// TRY/FINALLY (no blank line required before/after "finally").
+try {
+    $a = 'b';
+}
+finally {
+    $c = 'd';
+}
+
+// TRY/CATCH/FINALLY (no blank line required before/after "finally").
+try {
+    $a = 'b';
+}
+catch ( Exception $e ) {
+    $c = 'd';
+}
+finally {
+    $c = 'd';
+}
+
+// TRY/FINALLY (blank line before "finally" is not allowed).
+try {
+    $a = 'b';
+}
+finally {
+    $c = 'd';
+}
+
+// TRY/CATCH/FINALLY (blank line before "finally" is not allowed).
+try {
+    $a = 'b';
+}
+catch ( Exception $e ) {
+    $c = 'd';
+}
+finally {
+    $c = 'd';
+}
+
 ?>

CodingStandard/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php

@@ -297,6 +297,10 @@ public function getErrorList($testFile)
 
                 // Sequential catch statements not indented right.
                 1690 => 1,
+
+                // Blank line before "finally" is not allowed.
+                1718 => 1,
+                1730 => 1,
                );
         } elseif ($testFile === 'ControlStructureSpacingUnitTest.2.inc') {
             return array(