Skip to content

Commit a6ff8b2

Browse files
Merge branch '2.7' into 2.8
* 2.7: [appveyor] Workaround GitHub disabling of low versions of TLS [Routing] Don't throw 405 when scheme requirement doesn't match [Routing] Revert throwing 405 on missed slash/scheme redirections Fix ArrayInput::toString() for InputArgument::IS_ARRAY args [Routing] fix CS
2 parents f67a180 + d98c210 commit a6ff8b2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Input/ArrayInput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function __toString()
106106
$params[] = $param.('' != $val ? '='.$this->escapeToken($val) : '');
107107
}
108108
} else {
109-
$params[] = is_array($val) ? array_map(array($this, 'escapeToken'), $val) : $this->escapeToken($val);
109+
$params[] = is_array($val) ? implode(' ', array_map(array($this, 'escapeToken'), $val)) : $this->escapeToken($val);
110110
}
111111
}
112112

Tests/Input/ArrayInputTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,8 @@ public function testToString()
143143

144144
$input = new ArrayInput(array('-b' => array('bval_1', 'bval_2'), '--f' => array('fval_1', 'fval_2')));
145145
$this->assertSame('-b=bval_1 -b=bval_2 --f=fval_1 --f=fval_2', (string) $input);
146+
147+
$input = new ArrayInput(array('array_arg' => array('val_1', 'val_2')));
148+
$this->assertSame('val_1 val_2', (string) $input);
146149
}
147150
}

0 commit comments

Comments
 (0)