Bläddra i källkod

Merge remote-tracking branch 'gerryvdm/feature'

Conflicts:
	src/Composer/Command/CreateProjectCommand.php
Jordi Boggiano 12 år sedan
förälder
incheckning
6e4e10620a
1 ändrade filer med 17 tillägg och 13 borttagningar
  1. 17 13
      src/Composer/Command/CreateProjectCommand.php

+ 17 - 13
src/Composer/Command/CreateProjectCommand.php

@@ -68,6 +68,7 @@ class CreateProjectCommand extends Command
                 new InputOption('no-scripts', null, InputOption::VALUE_NONE, 'Whether to prevent execution of all defined scripts in the root package.'),
                 new InputOption('no-progress', null, InputOption::VALUE_NONE, 'Do not output download progress.'),
                 new InputOption('keep-vcs', null, InputOption::VALUE_NONE, 'Whether to prevent deletion vcs folder.'),
+                new InputOption('no-install', null, InputOption::VALUE_NONE, 'Whether to skip installation of the package dependencies.'),
             ))
             ->setHelp(<<<EOT
 The <info>create-project</info> command creates a new project from a given
@@ -137,11 +138,12 @@ EOT
             $input->getOption('no-plugins'),
             $input->getOption('no-scripts'),
             $input->getOption('keep-vcs'),
-            $input->getOption('no-progress')
+            $input->getOption('no-progress'),
+            $input->getOption('no-install')
         );
     }
 
-    public function installProject(IOInterface $io, $config, $packageName, $directory = null, $packageVersion = null, $stability = 'stable', $preferSource = false, $preferDist = false, $installDevPackages = false, $repositoryUrl = null, $disablePlugins = false, $noScripts = false, $keepVcs = false, $noProgress = false)
+    public function installProject(IOInterface $io, $config, $packageName, $directory = null, $packageVersion = null, $stability = 'stable', $preferSource = false, $preferDist = false, $installDevPackages = false, $repositoryUrl = null, $disablePlugins = false, $noScripts = false, $keepVcs = false, $noProgress = false, $noInstall = false)
     {
         $oldCwd = getcwd();
 
@@ -160,18 +162,20 @@ EOT
         }
 
         // install dependencies of the created project
-        $installer = Installer::create($io, $composer);
-        $installer->setPreferSource($preferSource)
-            ->setPreferDist($preferDist)
-            ->setDevMode($installDevPackages)
-            ->setRunScripts( ! $noScripts);
-
-        if ($disablePlugins) {
-            $installer->disablePlugins();
-        }
+        if ($noInstall === false) {
+            $installer = Installer::create($io, $composer);
+            $installer->setPreferSource($preferSource)
+                ->setPreferDist($preferDist)
+                ->setDevMode($installDevPackages)
+                ->setRunScripts( ! $noScripts);
+
+            if ($disablePlugins) {
+                $installer->disablePlugins();
+            }
 
-        if (!$installer->run()) {
-            return 1;
+            if (!$installer->run()) {
+                return 1;
+            }
         }
 
         $hasVcs = $installedFromVcs;