Allow "return" directly after PHP open tag.

cakephp · Jul 13, 2016 · 62247b6 · 62247b6
1 parent 77d8483
commit 62247b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CakePHP/Sniffs/Formatting/BlankLineBeforeReturnSniff.php b/CakePHP/Sniffs/Formatting/BlankLineBeforeReturnSniff.php
@@ -58,7 +58,8 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         if (isset($prevLineTokens[0])
             && ($prevLineTokens[0] === 'T_OPEN_CURLY_BRACKET'
-            || $prevLineTokens[0] === 'T_COLON')
+            || $prevLineTokens[0] === 'T_COLON'
+            || $prevLineTokens[0] === 'T_OPEN_TAG')
         ) {
             return;
         } elseif (count($prevLineTokens) > 0) {

diff --git a/CakePHP/tests/files/blank_line_before_return_1_pass.php b/CakePHP/tests/files/blank_line_before_return_1_pass.php
@@ -0,0 +1,4 @@
+<?php
+return [
+    'foo' => 'bar'
+];