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

Expand {} into a new line before manipulating json, fixes #1481

pull/1486/merge
Jordi Boggiano 2013-01-13 17:06:35 +01:00
parent cea4c05021
commit dea4bdf8f0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Json/JsonManipulator.php
View File

@ -30,7 +30,7 @@ class JsonManipulator
throw new \InvalidArgumentException('The json file must be an object ({})'); throw new \InvalidArgumentException('The json file must be an object ({})');
} }
$this->newline = false !== strpos("\r\n", $contents) ? "\r\n": "\n"; $this->newline = false !== strpos("\r\n", $contents) ? "\r\n": "\n";
$this->contents = $contents; $this->contents = $contents === '{}' ? '{' . $this->newline . '}' : $contents;
$this->detectIndenting(); $this->detectIndenting();
} }

3
tests/Composer/Test/Json/JsonManipulatorTest.php
View File

@ -30,8 +30,7 @@ class JsonManipulatorTest extends \PHPUnit_Framework_TestCase
{ {
return array( return array(
array( array(
'{ '{}',
}',
'require', 'require',
'vendor/baz', 'vendor/baz',
'qux', 'qux',