소스 검색

reverted command interfaces for installer refactoring

digitalkaoz 13 년 전
부모
커밋
a4f6314daa
3개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 2 2
      src/Composer/Command/InstallCommand.php
  2. 2 2
      src/Composer/Command/UpdateCommand.php
  3. 8 8
      src/Composer/Installer.php

+ 2 - 2
src/Composer/Command/InstallCommand.php

@@ -32,7 +32,7 @@ class InstallCommand extends Command
             ->setDefinition(array(
                 new InputOption('prefer-source', null, InputOption::VALUE_NONE, 'Forces installation from package sources when possible, including VCS information.'),
                 new InputOption('dry-run', null, InputOption::VALUE_NONE, 'Outputs the operations but will not execute anything (implicitly enables --verbose).'),
-                new InputOption('install-recommends', null, InputOption::VALUE_NONE, 'Also install recommended packages (ignored when installing from an existing lock file).'),
+                new InputOption('no-install-recommends', null, InputOption::VALUE_NONE, 'Do not install recommended packages (ignored when installing from an existing lock file).'),
                 new InputOption('install-suggests', null, InputOption::VALUE_NONE, 'Also install suggested packages (ignored when installing from an existing lock file).'),
             ))
             ->setHelp(<<<EOT
@@ -57,7 +57,7 @@ EOT
             ->setDryRun($input->getOption('dry-run'))
             ->setVerbose($input->getOption('verbose'))
             ->setPreferSource($input->getOption('prefer-source'))
-            ->setInstallRecommends($input->getOption('install-recommends'))
+            ->setInstallRecommends(!$input->getOption('no-install-recommends'))
             ->setInstallSuggests($input->getOption('install-suggests'))
         ;
 

+ 2 - 2
src/Composer/Command/UpdateCommand.php

@@ -31,7 +31,7 @@ class UpdateCommand extends Command
             ->setDefinition(array(
                 new InputOption('prefer-source', null, InputOption::VALUE_NONE, 'Forces installation from package sources when possible, including VCS information.'),
                 new InputOption('dry-run', null, InputOption::VALUE_NONE, 'Outputs the operations but will not execute anything (implicitly enables --verbose).'),
-                new InputOption('install-recommends', null, InputOption::VALUE_NONE, 'Also install recommended packages.'),
+                new InputOption('no-install-recommends', null, InputOption::VALUE_NONE, 'Do not install recommended packages.'),
                 new InputOption('install-suggests', null, InputOption::VALUE_NONE, 'Also install suggested packages.'),
             ))
             ->setHelp(<<<EOT
@@ -57,7 +57,7 @@ EOT
             ->setDryRun($input->getOption('dry-run'))
             ->setVerbose($input->getOption('verbose'))
             ->setPreferSource($input->getOption('prefer-source'))
-            ->setInstallRecommends($input->getOption('install-recommends'))
+            ->setInstallRecommends(!$input->getOption('no-install-recommends'))
             ->setInstallSuggests($input->getOption('install-suggests'))
             ->setUpdate(true)
         ;

+ 8 - 8
src/Composer/Installer.php

@@ -75,12 +75,12 @@ class Installer
      */
     protected $eventDispatcher;
 
-    protected $preferSource;
-    protected $dryRun;
-    protected $verbose;
-    protected $installRecommends;
-    protected $installSuggests;
-    protected $update;
+    protected $preferSource = false;
+    protected $dryRun = false;
+    protected $verbose = false;
+    protected $installRecommends = true;
+    protected $installSuggests = false;
+    protected $update = false;
 
     /**
      * @var RepositoryInterface
@@ -358,9 +358,9 @@ class Installer
     }
 
     /**
-     * also install recommend packages
+     * install recommend packages
      *
-     * @param boolean $installRecommends
+     * @param boolean $noInstallRecommends
      * @return Installer
      */
     public function setInstallRecommends($installRecommends=true)