feature #247 Made all network connections proxy-compatible (javiereguiluz)

This PR was squashed before being merged into the 1.0-dev branch (closes #247).

Discussion
----------

Made all network connections proxy-compatible

This fixes #243.

Commits
-------

5ef4b77 Made all network connections proxy-compatible

Author: javiereguiluz

src/Symfony/Installer/Application.php

@@ -26,39 +26,6 @@ class Application extends ConsoleApplication
 
     public function doRun(InputInterface $input, OutputInterface $output)
     {
-        $commandName = $this->getCommandName($input);
-
-        if ($this->isInPharMode() && in_array($commandName, array('new', 'demo'), true)) {
-            if (!$this->checkIfInstallerIsUpdated()) {
-                $output->writeln(sprintf(
-                    " <comment>[WARNING]</comment> Your Symfony Installer version is outdated.\n".
-                    ' Execute the command "%s selfupdate" to get the latest version.',
-                    $_SERVER['PHP_SELF']
-                ));
-            }
-        }
-
         return parent::doRun($input, $output);
     }
-
-    public function isInPharMode()
-    {
-        return 'phar://' === substr(__DIR__, 0, 7);
-    }
-
-    private function checkIfInstallerIsUpdated()
-    {
-        $localVersion = $this->getVersion();
-
-        if (false === $remoteVersion = @file_get_contents(self::VERSIONS_URL)) {
-            // as this is simple checking - we don't care here if versions file is unavailable
-            return true;
-        }
-
-        if (version_compare($localVersion, $remoteVersion, '>=')) {
-            return true;
-        }
-
-        return false;
-    }
 }

src/Symfony/Installer/DemoCommand.php

@@ -60,6 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
             $this
+                ->checkInstallerVersion()
                 ->checkProjectName()
                 ->checkPermissions()
                 ->download()

src/Symfony/Installer/DownloadCommand.php

@@ -477,6 +477,55 @@ protected function isSymfony3()
         return '3' === $this->version[0] || 'latest' === $this->version;
     }
 
+    /**
+     * Checks if the installed version is the latest one and displays some
+     * warning messages if not.
+     *
+     * @return $this
+     */
+    protected function checkInstallerVersion()
+    {
+        // check update only if installer is running via a PHAR file
+        if ('phar://' !== substr(__DIR__, 0, 7)) {
+            return $this;
+        }
+
+        if (!$this->isInstallerUpdated()) {
+            $this->output->writeln(sprintf(
+                "\n <bg=red> WARNING </> Your Symfony Installer version (%s) is outdated.\n".
+                ' Execute the command "%s selfupdate" to get the latest version (%s).',
+                $installedVersion, $_SERVER['PHP_SELF'], $latestVersion
+            ));
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return boolean Whether the installed version is the latest one
+     */
+    protected function isInstallerUpdated()
+    {
+        $installedVersion = $this->getApplication()->getVersion();
+        $latestVersion = $this->getUrlContents(Application::VERSIONS_URL);
+
+        return version_compare($installedVersion, $latestVersion, '>=');
+    }
+
+    /**
+     * Returns the contents obtained by making a GET request to the given URL.
+     *
+     * @param string $url
+     *
+     * @return string
+     */
+    protected function getUrlContents($url)
+    {
+        $client = $this->getGuzzleClient();
+
+        return $client->get($url)->getBody()->getContents();
+    }
+
     private function enableSignalHandler()
     {
         if (!function_exists('pcntl_signal')) {

src/Symfony/Installer/NewCommand.php

@@ -48,6 +48,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
             $this
+                ->checkInstallerVersion()
                 ->checkProjectName()
                 ->checkSymfonyVersionIsInstallable()
                 ->checkPermissions()

src/Symfony/Installer/SelfUpdateCommand.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Installer;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
@@ -27,16 +26,13 @@
  * @author Stephane PY <py.stephane1@gmail.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
-class SelfUpdateCommand extends Command
+class SelfUpdateCommand extends DownloadCommand
 {
-    /** @var Filesystem */
-    private $fs;
-
-    /** @var OutputInterface */
-    private $output;
-
     private $tempDir;
 
+    /** @var string */
+    private $latestInstallerVersion;
+
     /** @var string  the URL where the latest installer version can be downloaded */
     private $remoteInstallerFile;
 
@@ -75,6 +71,7 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         $this->fs = new Filesystem();
         $this->output = $output;
 
+        $this->latestInstallerVersion = $this->getUrlContents(Application::VERSIONS_URL);
         $this->remoteInstallerFile = 'http://symfony.com/installer';
         $this->currentInstallerFile = realpath($_SERVER['argv'][0]) ?: $_SERVER['argv'][0];
         $this->tempDir = sys_get_temp_dir();
@@ -85,8 +82,12 @@ protected function initialize(InputInterface $input, OutputInterface $output)
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if ($this->installerIsUpdated()) {
+        if ($this->isInstallerUpdated()) {
+            $this->output->writeln(sprintf('// Symfony Installer is <info>already updated</info> to the latest version (%s).', $this->latestInstallerVersion));
+
             return;
+        } else {
+            $this->output->writeln(sprintf('// <info>updating</info> Symfony Installer to <info>%s</info> version', $this->latestInstallerVersion));
         }
 
         try {
@@ -98,44 +99,25 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 ->cleanUp()
             ;
         } catch (IOException $e) {
+            if ($this->output->isVeryVerbose()) {
+                $this->output->writeln($e->getMessage());
+            }
+
             throw new \RuntimeException(sprintf(
                 "The installer couldn't be updated, probably because of a permissions issue.\n".
                 "Try to execute the command again with super user privileges:\n".
                 "  sudo %s\n",
                 $this->getExecutedCommand()
             ));
-
-            if ($output->isVeryVerbose()) {
-                echo $e->getMessage();
-            }
         } catch (\Exception $e) {
             $this->rollback();
 
-            if ($output->isVeryVerbose()) {
-                echo $e->getMessage();
+            if ($this->output->isVeryVerbose()) {
+                $this->output->writeln($e->getMessage());
             }
         }
     }
 
-    private function installerIsUpdated()
-    {
-        $isUpdated = false;
-        $localVersion = $this->getApplication()->getVersion();
-
-        if (false === $remoteVersion = @file_get_contents(Application::VERSIONS_URL)) {
-            throw new \RuntimeException('The new version of the Symfony Installer couldn\'t be downloaded from the server.');
-        }
-
-        if (version_compare($localVersion, $remoteVersion, '>=')) {
-            $this->output->writeln('<info>Symfony Installer is already up to date.</info>');
-            $isUpdated = true;
-        } else {
-            $this->output->writeln(sprintf('// <info>updating</info> Symfony Installer to <comment>%s</comment> version', $remoteVersion));
-        }
-
-        return $isUpdated;
-    }
-
     private function downloadNewVersion()
     {
         // check for permissions in local filesystem before start downloading files
@@ -147,7 +129,7 @@ private function downloadNewVersion()
             throw new \RuntimeException('Symfony Installer update failed: the "'.$this->tempDir.'" directory used to download files temporarily could not be written');
         }
 
-        if (false === $newInstaller = @file_get_contents($this->remoteInstallerFile)) {
+        if (false === $newInstaller = $this->getUrlContents($this->remoteInstallerFile)) {
             throw new \RuntimeException('The new version of the Symfony Installer couldn\'t be downloaded from the server.');
         }
 
@@ -207,4 +189,14 @@ private function rollback()
             $this->fs->copy($this->currentInstallerBackupFile, $this->currentInstallerFile, true);
         }
     }
+
+    protected function getDownloadedApplicationType()
+    {
+        return 'Symfony Installer';
+    }
+
+    protected function getRemoteFileUrl()
+    {
+        return 'http://symfony.com/installer';
+    }
 }