From 3a68534d208f70da829ee90796ba11c9cdd5e9b8 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Sat, 14 Mar 2015 15:26:53 +0100 Subject: [PATCH 1/2] Fix parser error if composer.json existing but empty --- src/Composer/Command/RequireCommand.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index 4391f1d05..681fcbfda 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -82,6 +82,10 @@ EOT return 1; } + if (file_get_contents($file) === '') { + file_put_contents($file, "{\n}\n"); + } + $json = new JsonFile($file); $composerDefinition = $json->read(); $composerBackup = file_get_contents($json->getPath()); From d5ab072ec1ab41ebf830acf81cc04e8f221fe733 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Tue, 17 Mar 2015 15:52:44 +0100 Subject: [PATCH 2/2] Optimize check for empty file --- src/Composer/Command/RequireCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index 681fcbfda..82401ffb2 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -82,7 +82,7 @@ EOT return 1; } - if (file_get_contents($file) === '') { + if (filesize($file) === 0) { file_put_contents($file, "{\n}\n"); }