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

Fixed issues with PR

pull/4479/head
MakiCode 2015-10-07 12:42:19 -05:00
parent 0d00338bdb
commit 63ede6c9dd
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Command/ArchiveCommand.php
View File

@ -40,9 +40,9 @@ class ArchiveCommand extends Command
->setDefinition(array( ->setDefinition(array(
new InputArgument('package', InputArgument::OPTIONAL, 'The package to archive instead of the current project'), new InputArgument('package', InputArgument::OPTIONAL, 'The package to archive instead of the current project'),
new InputArgument('version', InputArgument::OPTIONAL, 'A version constraint to find the package to archive'), new InputArgument('version', InputArgument::OPTIONAL, 'A version constraint to find the package to archive'),
new InputOption('format', 'f', InputOption::VALUE_OPTIONAL, 'Format of the resulting archive: tar or zip'), new InputOption('format', 'f', InputOption::VALUE_REQUIRED, 'Format of the resulting archive: tar or zip'),
new InputOption('dir', false, InputOption::VALUE_OPTIONAL, 'Write the archive to this directory'), new InputOption('dir', false, InputOption::VALUE_REQUIRED, 'Write the archive to this directory'),
new InputOption('file', false, InputOption::VALUE_OPTIONAL, 'Write the archive with the given file name.' new InputOption('file', false, InputOption::VALUE_REQUIRED, 'Write the archive with the given file name.'
.' Note that the format will be appended.'), .' Note that the format will be appended.'),
)) ))
->setHelp(<<<EOT ->setHelp(<<<EOT
@ -81,7 +81,7 @@ EOT
$input->getArgument('version'), $input->getArgument('version'),
$input->getOption('format'), $input->getOption('format'),
$input->getOption('dir'), $input->getOption('dir'),
$input->getOption("file") $input->getOption('file')
); );
if (0 === $returnCode && $composer) { if (0 === $returnCode && $composer) {

4
src/Composer/Package/Archiver/ArchiveManager.php
View File

@ -108,7 +108,7 @@ class ArchiveManager
if (empty($format)) { if (empty($format)) {
throw new \InvalidArgumentException('Format must be specified'); throw new \InvalidArgumentException('Format must be specified');
} }
if(!is_null($fileName) && !is_string($fileName)) { if (null !== $fileName && !is_string($fileName)) {
throw new \InvalidArgumentException('fileName must be a string'); throw new \InvalidArgumentException('fileName must be a string');
} }
@ -127,7 +127,7 @@ class ArchiveManager
} }
$filesystem = new Filesystem(); $filesystem = new Filesystem();
if(null === $fileName) { if (null !== $fileName) {
$packageName = $this->getPackageFilename($package); $packageName = $this->getPackageFilename($package);
} else { } else {
$packageName = $fileName; $packageName = $fileName;

9
tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
View File

@ -66,11 +66,11 @@ class ArchiveManagerTest extends ArchiverTest
$package = $this->setupPackage(); $package = $this->setupPackage();
$fileName = "testArchiveName"; $fileName = 'testArchiveName';
$this->manager->archive($package, 'tar', $this->targetDir, $fileName); $this->manager->archive($package, 'tar', $this->targetDir, $fileName);
$target = $this->targetDir . "/" . $fileName . ".tar"; $target = $this->targetDir . '/' . $fileName . '.tar';
$this->assertFileExists($target); $this->assertFileExists($target);
@ -80,8 +80,9 @@ class ArchiveManagerTest extends ArchiverTest
unlink($target); unlink($target);
} }
public function testNonStringFileName() { public function testNonStringFileName()
$this->setExpectedException("InvalidArgumentException"); {
$this->setExpectedException('InvalidArgumentException');
$package = $this->setupPackage(); $package = $this->setupPackage();