From 83d4e3a940c8de5e9bdcef305efb0eae222e6f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draic=20Brady?= <padraic.brady@gmail.com>
Date: Mon, 24 Feb 2014 20:59:04 +0000
Subject: [PATCH] Fixes from functional testing (need to automate this stuff!)

---
 src/Composer/Command/SelfUpdateCommand.php | 6 +++---
 src/Composer/Factory.php                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php
index 8351c7d61..274ed6522 100644
--- a/src/Composer/Command/SelfUpdateCommand.php
+++ b/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 {
diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php
index 3196f24d9..7e3f3fdd5 100644
--- a/src/Composer/Factory.php
+++ b/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);