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

Merge pull request #3238 from stof/patch-6 

Fixed the registration of commands with invalid JSON file
pull/3262/head
Jordi Boggiano 2014-09-05 14:48:10 +01:00
parent 1e27ff5e22 e1a3df3dbf
commit f7a84e423d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Console/Application.php
View File

@ -113,8 +113,7 @@ class Application extends BaseApplication
// add non-standard scripts as own commands
$file = Factory::getComposerFile();
$json = new JsonFile($file);
if ($json->exists() && is_readable($file) && ($composer = $json->read())) {
if (is_file($file) && is_readable($file) && is_array($composer = json_decode(file_get_contents($file), true))) {
if (isset($composer['scripts']) && is_array($composer['scripts'])) {
foreach ($composer['scripts'] as $script => $dummy) {
if (!defined('Composer\Script\ScriptEvents::'.str_replace('-', '_', strtoupper($script)))) {