switch to array-replace-recursive

2016-01-22 14:27:08 +01:00 · 2016-01-22 14:27:08 +01:00 · d6be2a693b
parent 2393222826
commit d6be2a693b
1 changed files with 1 additions and 1 deletions
--- a/src/Composer/Util/RemoteFilesystem.php
+++ b/src/Composer/Util/RemoteFilesystem.php
@ -629,7 +629,7 @@ class RemoteFilesystem
        );

        if (isset($options['ssl'])) {
-            $defaults['ssl'] = array_merge_recursive($defaults['ssl'], $options['ssl']);
+            $defaults['ssl'] = array_replace_recursive($defaults['ssl'], $options['ssl']);
        }

        /**