From 4b0624a93a098a1e7d6a2277e1897eac0ee7bc66 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 29 Feb 2016 18:09:56 +0000 Subject: [PATCH] Fix regression in create-project --- src/Composer/Command/CreateProjectCommand.php | 4 +--- .../create-project-shows-full-hash-for-dev-packages.test | 2 +- tests/Composer/Test/Fixtures/functional/woop | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) create mode 160000 tests/Composer/Test/Fixtures/functional/woop diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 01b04c8fc..e74e2e56f 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/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'), diff --git a/tests/Composer/Test/Fixtures/functional/create-project-shows-full-hash-for-dev-packages.test b/tests/Composer/Test/Fixtures/functional/create-project-shows-full-hash-for-dev-packages.test index fa7ecbe32..2de92f067 100644 --- a/tests/Composer/Test/Fixtures/functional/create-project-shows-full-hash-for-dev-packages.test +++ b/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}\)} diff --git a/tests/Composer/Test/Fixtures/functional/woop b/tests/Composer/Test/Fixtures/functional/woop new file mode 160000 index 000000000..42ae79eba --- /dev/null +++ b/tests/Composer/Test/Fixtures/functional/woop @@ -0,0 +1 @@ +Subproject commit 42ae79eba5bf87cc8b6f6194008461dc837dbce8