Merge remote-tracking branch 'upstream/master' into bitrix_bugfix

Conflicts: src/Composer/Installers/BitrixInstaller.php
marwein · Jun 13, 2015 · c3604cb · c3604cb
2 parents c02bf99 + 9e5aafc
commit c3604cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/Composer/Installers/BaseInstaller.php b/src/Composer/Installers/BaseInstaller.php
@@ -19,14 +19,11 @@ abstract class BaseInstaller
      * @param Composer         $composer
      * @param IOInterface      $io
      */
-    public function __construct(PackageInterface $package = null, Composer $composer = null, IOInterface $io)
+    public function __construct(PackageInterface $package = null, Composer $composer = null, IOInterface $io = null)
     {
         $this->composer = $composer;
         $this->package = $package;
-
-        if (!is_null($this->package)) {
-            $this->io = $io;
-        }
+        $this->io = $io;
     }
 
     /**

diff --git a/src/Composer/Installers/BitrixInstaller.php b/src/Composer/Installers/BitrixInstaller.php
@@ -57,7 +57,7 @@ protected function checkDuplicates($templatePath, array $vars = array())
             return;
         }
 
-        if ($oldLocation !== $templatePath && file_exists($oldLocation)) {
+        if ($oldLocation !== $templatePath && file_exists($oldLocation) && $this->io && $this->io->isInteractive()) {
 
             $this->io->writeError('    <error>Duplication of packages:</error>');
             $this->io->writeError('    <info>Package ' . $oldLocation . ' will be called instead package ' . $templatePath . '</info>');

diff --git a/src/Composer/Installers/Installer.php b/src/Composer/Installers/Installer.php
@@ -169,7 +169,7 @@ protected function getLocationPattern($frameworkType)
      *
      * @return IOInterface
      */
-    public function getIO()
+    private function getIO()
     {
         return $this->io;
     }