Browse Source

Fix regression in create-project

Jordi Boggiano 9 years ago
parent
commit
4b0624a93a

+ 1 - 3
src/Composer/Command/CreateProjectCommand.php

@@ -23,9 +23,7 @@ use Composer\DependencyResolver\Pool;
 use Composer\DependencyResolver\Operation\InstallOperation;
 use Composer\Package\Version\VersionSelector;
 use Composer\Repository\RepositoryFactory;
-use Composer\Repository\ComposerRepository;
 use Composer\Repository\CompositeRepository;
-use Composer\Repository\FilesystemRepository;
 use Composer\Repository\InstalledFilesystemRepository;
 use Composer\Script\ScriptEvents;
 use Composer\Util\Silencer;
@@ -127,7 +125,7 @@ EOT
             $preferSource,
             $preferDist,
             !$input->getOption('no-dev'),
-            $input->getOption('repository') || $input->getOption('repository-url'),
+            $input->getOption('repository') ?: $input->getOption('repository-url'),
             $input->getOption('no-plugins'),
             $input->getOption('no-scripts'),
             $input->getOption('keep-vcs'),

+ 1 - 1
tests/Composer/Test/Fixtures/functional/create-project-shows-full-hash-for-dev-packages.test

@@ -1,4 +1,4 @@
 --RUN--
-create-project --repository-url=packages.json -v seld/jsonlint %testDir% dev-master
+create-project --repository=packages.json -v seld/jsonlint %testDir% dev-master
 --EXPECT-ERROR-REGEX--
 {^Installing seld/jsonlint \(dev-master [a-f0-9]{40}\)}

+ 1 - 0
tests/Composer/Test/Fixtures/functional/woop

@@ -0,0 +1 @@
+Subproject commit 42ae79eba5bf87cc8b6f6194008461dc837dbce8