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

Fix formatting and make pretty-printing optional

pull/101/merge
Jordi Boggiano 2012-01-17 01:33:02 +01:00
parent 447230d77a
commit bfe28905d0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Composer/Json/JsonFile.php
View File

@ -75,8 +75,9 @@ class JsonFile
* Writes json file. * Writes json file.
* *
* @param array $hash writes hash into json file * @param array $hash writes hash into json file
* @param Boolean $prettyPrint If true, output is pretty-printed
*/ */
public function write(array $hash) public function write(array $hash, $prettyPrint = true)
{ {
$dir = dirname($this->path); $dir = dirname($this->path);
if (!is_dir($dir)) { if (!is_dir($dir)) {
@ -91,26 +92,31 @@ class JsonFile
); );
} }
} }
file_put_contents($this->path, $this->encode($hash)); file_put_contents($this->path, $this->encode($hash, $prettyPrint));
} }
/** /**
* Indents a flat JSON string to make it more human-readable * Encodes an array into (optionally pretty-printed) JSON
* *
* Original code for this function can be found at: * Original code for this function can be found at:
* http://recursive-design.com/blog/2008/03/11/format-json-with-php/ * http://recursive-design.com/blog/2008/03/11/format-json-with-php/
* *
* @param array $hash Data to encode into a formatted JSON string * @param array $hash Data to encode into a formatted JSON string
* @param Boolean $prettyPrint If true, output is pretty-printed
* @return string Indented version of the original JSON string * @return string Indented version of the original JSON string
*/ */
public function encode(array $hash) public function encode(array $hash, $prettyPrint = true)
{ {
if (defined('JSON_PRETTY_PRINT')) { if ($prettyPrint && defined('JSON_PRETTY_PRINT')) {
return json_encode($hash, JSON_PRETTY_PRINT); return json_encode($hash, JSON_PRETTY_PRINT);
} }
$json = json_encode($hash); $json = json_encode($hash);
if (!$prettyPrint) {
return $json;
}
$result = ''; $result = '';
$pos = 0; $pos = 0;
$strLen = strlen($json); $strLen = strlen($json);
@ -126,10 +132,10 @@ class JsonFile
// Are we inside a quoted string? // Are we inside a quoted string?
if ('"' === $char && '\\' !== $prevChar) { if ('"' === $char && '\\' !== $prevChar) {
$outOfQuotes = !$outOfQuotes; $outOfQuotes = !$outOfQuotes;
} else if (':' === $char && $outOfQuotes) { } elseif (':' === $char && $outOfQuotes) {
// Add a space after the : character // Add a space after the : character
$char .= ' '; $char .= ' ';
} else if (('}' === $char || ']' === $char) && $outOfQuotes) { } elseif (('}' === $char || ']' === $char) && $outOfQuotes) {
$pos--; $pos--;
if ('{' !== $prevChar && '[' !== $prevChar) { if ('{' !== $prevChar && '[' !== $prevChar) {