Explorar el Código

make sure passed options are merged into defaults before checking

Rob Bast hace 9 años
padre
commit
f79255df29
Se han modificado 1 ficheros con 4 adiciones y 0 borrados
  1. 4 0
      src/Composer/Util/RemoteFilesystem.php

+ 4 - 0
src/Composer/Util/RemoteFilesystem.php

@@ -623,6 +623,10 @@ class RemoteFilesystem
             )
         );
 
+        if (isset($options['ssl'])) {
+            $defaults['ssl'] = array_merge_recursive($defaults['ssl'], $options['ssl']);
+        }
+
         /**
          * Attempt to find a local cafile or throw an exception if none pre-set
          * The user may go download one if this occurs.