Cant act on the same token in the same run, so add newline and padding in one step. Don't skip arrays when checking either, because they need to be indented as well.

Author: gsherwood

CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php

@@ -190,24 +190,26 @@ public function processMultiLineCall(PHP_CodeSniffer_File $phpcsFile, $stackPtr,
         if ($tokens[($openBracket + 1)]['content'] !== $phpcsFile->eolChar) {
             $error = 'Opening parenthesis of a multi-line function call must be the last content on the line';
             $phpcsFile->addError($error, $stackPtr, 'ContentAfterOpenBracket');
-            $phpcsFile->fixer->addNewline($openBracket);
-            $phpcsFile->fixer->addContent($openBracket, str_repeat(' ', ($functionIndent + $this->indent)));
+            $phpcsFile->fixer->addContent($openBracket, $phpcsFile->eolChar.str_repeat(' ', ($functionIndent + $this->indent)));
         }
 
         $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
         $prev         = $phpcsFile->findPrevious(T_WHITESPACE, ($closeBracket - 1), null, true);
         if ($tokens[$prev]['line'] === $tokens[$closeBracket]['line']) {
             $error = 'Closing parenthesis of a multi-line function call must be on a line by itself';
             $phpcsFile->addError($error, $closeBracket, 'CloseBracketLine');
-            $phpcsFile->fixer->addNewlineBefore($closeBracket);
-            $phpcsFile->fixer->addContentBefore($closeBracket, str_repeat(' ', ($functionIndent + $this->indent)));
+            $phpcsFile->fixer->addContentBefore($closeBracket, $phpcsFile->eolChar.str_repeat(' ', ($functionIndent + $this->indent)));
         }
 
         // Each line between the parenthesis should be indented n spaces.
         $lastLine = $tokens[$openBracket]['line'];
         for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
             // Skip nested function calls.
-            if ($tokens[$i]['code'] === T_OPEN_PARENTHESIS) {
+            if ($tokens[$i]['code'] === T_OPEN_PARENTHESIS
+                && (isset($tokens[$i]['parenthesis_owner']) === false
+                || $tokens[$tokens[$i]['parenthesis_owner']]['code'] !== T_ARRAY)
+            ) {
+
                 $i        = $tokens[$i]['parenthesis_closer'];
                 $lastLine = $tokens[$i]['line'];
                 continue;