1
0
Fork 0
pull/743/head
Jordi Boggiano 2012-05-28 16:38:52 +02:00
parent 2b2a5d0a92
commit 31330a739f
3 changed files with 6 additions and 5 deletions

View File

@ -20,8 +20,6 @@ use Composer\Factory;
use Composer\Installer;
use Composer\Json\JsonFile;
use Composer\Json\JsonManipulator;
use Composer\Json\JsonValidationException;
use Composer\Util\RemoteFilesystem;
/**
* @author Jérémy Romey <jeremy@free-agent.fr>
@ -54,10 +52,12 @@ EOT
if (!file_exists($file)) {
$output->writeln('<error>'.$file.' not found.</error>');
return 1;
}
if (!is_readable($file)) {
$output->writeln('<error>'.$file.' is not readable.</error>');
return 1;
}

View File

@ -473,9 +473,9 @@ class Installer
* update whitelist themselves.
*
* @param RepositoryInterface $localRepo
* @param boolean $devMode
* @param array $rootRequires An array of links to packages in require of the root package
* @param array $rootDevRequires An array of links to packages in require-dev of the root package
* @param boolean $devMode
* @param array $rootRequires An array of links to packages in require of the root package
* @param array $rootDevRequires An array of links to packages in require-dev of the root package
*/
private function whitelistUpdateDependencies($localRepo, $devMode, array $rootRequires, array $rootDevRequires)
{

View File

@ -104,6 +104,7 @@ class JsonManipulator
foreach ($data as $key => $val) {
$elems[] = $this->indent . $this->indent . JsonFile::encode($key). ': '.$this->format($val);
}
return $out . implode(','.$this->newline, $elems) . $this->newline . $this->indent . '}';
}