Permalink
Browse files

Fixed bug #20225 : array_merge() that takes more than one line genera…

…tes error
  • Loading branch information...
1 parent ec38580 commit 20be9de6417630c14f469197785024fe785851fd @gsherwood gsherwood committed Mar 24, 2014
@@ -242,7 +242,7 @@ public function processMultiLineCall(PHP_CodeSniffer_File $phpcsFile, $stackPtr,
}
}
- if ($tokens[$i]['code'] === T_WHITESPACE) {
+ if ($i > 0 && $tokens[$i]['code'] === T_WHITESPACE) {
$functionIndent = strlen($tokens[$i]['content']);
}
@@ -1,5 +1,5 @@
-<?php
-
+<?php test(
+);
test();
test($arg, $arg2);
test ();
View
@@ -39,6 +39,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
- Fixed bug #20200 : Invalid JSON produced with specific error message
- Fixed bug #20204 : Ruleset exclude checks are case sensitive
- Fixed bug #20213 : Invalid error, Inline IF must be declared on single line
+ - Fixed bug #20225 : array_merge() that takes more than one line generates error
</notes>
<contents>
<dir name="/">

0 comments on commit 20be9de

Please sign in to comment.