Explorar o código

Fix plugin bootstrapping to ignore SSL Exceptions, fixes #5388

Jordi Boggiano %!s(int64=9) %!d(string=hai) anos
pai
achega
43273c4366

+ 11 - 5
src/Composer/Console/Application.php

@@ -27,6 +27,7 @@ use Composer\IO\IOInterface;
 use Composer\IO\ConsoleIO;
 use Composer\Json\JsonValidationException;
 use Composer\Util\ErrorHandler;
+use Composer\Exception\NoSslException;
 
 /**
  * The console application that handles the commands
@@ -126,13 +127,18 @@ class Application extends BaseApplication
         }
 
         if (!$input->hasParameterOption('--no-plugins') && !$this->hasPluginCommands && 'global' !== $commandName) {
-            foreach ($this->getPluginCommands() as $command) {
-                if ($this->has($command->getName())) {
-                    $io->writeError('<warning>Plugin command '.$command->getName().' ('.get_class($command).') would override a Composer command and has been skipped</warning>');
-                } else {
-                    $this->add($command);
+            try {
+                foreach ($this->getPluginCommands() as $command) {
+                    if ($this->has($command->getName())) {
+                        $io->writeError('<warning>Plugin command '.$command->getName().' ('.get_class($command).') would override a Composer command and has been skipped</warning>');
+                    } else {
+                        $this->add($command);
+                    }
                 }
+            } catch (NoSslException $e) {
+                // suppress these as they are not relevant at this point
             }
+
             $this->hasPluginCommands = true;
         }
 

+ 20 - 0
src/Composer/Exception/NoSslException.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Exception;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class NoSslException extends \RuntimeException
+{
+}

+ 1 - 1
src/Composer/Factory.php

@@ -569,7 +569,7 @@ class Factory
             $warned = true;
             $disableTls = true;
         } elseif (!extension_loaded('openssl')) {
-            throw new \RuntimeException('The openssl extension is required for SSL/TLS protection but is not available. '
+            throw new Exception\NoSslException('The openssl extension is required for SSL/TLS protection but is not available. '
                 . 'If you can not enable the openssl extension, you can disable this error, at your own risk, by setting the \'disable-tls\' option to true.');
         }
         $remoteFilesystemOptions = array();