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

Allow JsonLoader to load by file name

pull/90/merge
Jordi Boggiano 2011-11-05 23:53:40 +01:00
parent 293c45fabe
commit f572bbb0bf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Loader/JsonLoader.php
View File

@ -23,6 +23,8 @@ class JsonLoader extends ArrayLoader
{ {
if ($json instanceof JsonFile) { if ($json instanceof JsonFile) {
$config = $json->read(); $config = $json->read();
} elseif (file_exists($json)) {
$config = JsonFile::parseJson(file_get_contents($json));
} elseif (is_string($json)) { } elseif (is_string($json)) {
$config = JsonFile::parseJson($json); $config = JsonFile::parseJson($json);
} }