public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Changed array_merge to array_merge_recursive

pull/224/head
Jordan Alliot 2012-01-21 16:29:17 +01:00
parent 468eb0ed8d
commit b4d87af959
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Util/StreamContextFactory.php
View File

@ -49,7 +49,7 @@ final class StreamContextFactory
); );
} }
$options = array_merge($options, $defaultOptions); $options = array_merge_recursive($options, $defaultOptions);
return stream_context_create($options, $defaultParams); return stream_context_create($options, $defaultParams);
} }