make cacert.pem file available from Phar; closes #859

diff --git a/php/commands/core.php b/php/commands/core.php
index 2a11de3..e0f2d78 100644 (file)
--- a/php/commands/core.php
+++ b/php/commands/core.php
@@ -13,7 +13,7 @@ class Core_Command extends WP_CLI_Command {
         * Download core WordPress files.
         *
         * ## OPTIONS
-        * 
+        *
         * [--path=<path>]
         * : Specify the path in which to install WordPress.
         *
@@ -125,6 +125,16 @@ class Core_Command extends WP_CLI_Command {
        }
 
        private static function _request( $method, $url, $headers = array(), $options = array() ) {
+               // cURL can't read Phar archives
+               if ( 0 === strpos( WP_CLI_ROOT, 'phar://' ) ) {
+                       $options['verify'] = sys_get_temp_dir() . '/wp-cli-cacert.pem';
+
+                       copy(
+                               WP_CLI_ROOT . '/vendor/rmccue/requests/library/Requests/Transport/cacert.pem',
+                               $options['verify']
+                       );
+               }
+
                try {
                        return Requests::get( $url, $headers, $options );
                } catch( Requests_Exception $ex ) {

diff --git a/utils/make-phar.php b/utils/make-phar.php
index 0a7b16d..4563f60 100644 (file)
--- a/utils/make-phar.php
+++ b/utils/make-phar.php
@@ -62,6 +62,7 @@ foreach ( $finder as $file ) {
 }
 
 add_file( $phar, './vendor/autoload.php' );
+add_file( $phar, './vendor/rmccue/requests/library/Requests/Transport/cacert.pem' );
 
 $phar->setStub( <<<EOB
 #!/usr/bin/env php