public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix regression in create-project

pull/4980/head
Jordi Boggiano 2016-02-29 18:09:56 +00:00
parent bf1ddaa298
commit 4b0624a93a
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Command/CreateProjectCommand.php
View File

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

2
tests/Composer/Test/Fixtures/functional/create-project-shows-full-hash-for-dev-packages.test
View File

@ -1,4 +1,4 @@
--RUN-- --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-- --EXPECT-ERROR-REGEX--
{^Installing seld/jsonlint \(dev-master [a-f0-9]{40}\)} {^Installing seld/jsonlint \(dev-master [a-f0-9]{40}\)}

1
tests/Composer/Test/Fixtures/functional/woop Submodule

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