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

delete last coma if deleting last element before end of file

pull/6675/merge
Deamon 2017-08-29 15:29:11 +02:00 committed by Jordi Boggiano
parent 1682d7d454
commit 5b29b7c8e3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,6 +430,11 @@ class JsonManipulator
return false; return false;
} }
//check if we do not left a coma alone on previous line if it was the last line
if(preg_match('#,\s*$#', $matches['start']) && preg_match('#^\}$#', $matches['end'])) {
$matches['start'] = rtrim(preg_replace('#,(\s*)$#', '$1', $matches['start']), $this->indent);
}
$this->contents = $matches['start'] . $matches['end']; $this->contents = $matches['start'] . $matches['end'];
if (preg_match('#^\{\s*\}\s*$#', $this->contents)) { if (preg_match('#^\{\s*\}\s*$#', $this->contents)) {
$this->contents = "{\n}"; $this->contents = "{\n}";