From 0d9e08f9afc3288ea37944b23d106a901c399d4d Mon Sep 17 00:00:00 2001 From: Sander Marechal Date: Wed, 3 Oct 2012 18:54:27 +0200 Subject: [PATCH] Use array_replace_recursive() instead of array_merge_recursive() --- src/Composer/Util/RemoteFilesystem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php index f2dfaf842..3ccb127ac 100644 --- a/src/Composer/Util/RemoteFilesystem.php +++ b/src/Composer/Util/RemoteFilesystem.php @@ -243,7 +243,7 @@ class RemoteFilesystem $options['http']['header'] .= "Authorization: Basic $authStr\r\n"; } - $options = array_merge_recursive($options, $this->options); + $options = array_replace_recursive($options, $this->options); return $options; }