Selaa lähdekoodia

Fixes from functional testing (need to automate this stuff!)

Pádraic Brady 11 vuotta sitten
vanhempi
commit
83d4e3a940
2 muutettua tiedostoa jossa 5 lisäystä ja 5 poistoa
  1. 3 3
      src/Composer/Command/SelfUpdateCommand.php
  2. 2 2
      src/Composer/Factory.php

+ 3 - 3
src/Composer/Command/SelfUpdateCommand.php

@@ -67,7 +67,7 @@ EOT
             $baseUrl = 'http://' . self::HOMEPAGE;
             $disableTls = true;
         } elseif (!extension_loaded('openssl')) {
-            $output->writeln('<error>The openssl extension is required for SSL/TLS protection.</error>');
+            $output->writeln('<error>The openssl extension is required for SSL/TLS protection but is not available.</error>');
             $output->writeln('<error>You can disable this error, at your own risk, by enabling the \'disable-tls\' option.</error>');
             return 1;
         } else {
@@ -79,8 +79,8 @@ EOT
             if (!is_null($config->get('cafile'))) {
             $remoteFilesystemOptions = array('ssl'=>array('cafile'=>$config->get('cafile')));
             }
-            if (!is_null($input->get('cafile'))) {
-                $remoteFilesystemOptions = array('ssl'=>array('cafile'=>$input->get('cafile')));
+            if (!is_null($input->getOption('cafile'))) {
+                $remoteFilesystemOptions = array('ssl'=>array('cafile'=>$input->getOption('cafile')));
             }
         }
         try {

+ 2 - 2
src/Composer/Factory.php

@@ -208,8 +208,8 @@ class Factory
 
                 $rfsOptions = array();
                 if ($disableTls === false) {
-                    if (!is_null($input->get('cafile'))) {
-                        $rfsOptions = array('ssl'=>array('cafile'=>$input->get('cafile')));
+                    if (!is_null($input->getOption('cafile'))) {
+                        $rfsOptions = array('ssl'=>array('cafile'=>$input->getOption('cafile')));
                     }
                 }
                 $rfs = new RemoteFilesystem($io, $rfsOptions, $disableTls);