X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fconfig%2FConfigJson.php;h=d07fefee5c2968292eba37c240861d8eb2bf43dc;hb=5ff23f02b80ec6ddee28dee869171ee8e3656b7c;hp=94693c860c5f89a1e72fb0bc79d43d70b906cd4b;hpb=b302c77c74a09cb271b711248b8f433555524ef0;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index 94693c86..d07fefee 100644
--- a/application/config/ConfigJson.php
+++ b/application/config/ConfigJson.php
@@ -17,6 +17,7 @@ class ConfigJson implements ConfigIO
         }
         $data = file_get_contents($filepath);
         $data = str_replace(self::getPhpHeaders(), '', $data);
+        $data = str_replace(self::getPhpSuffix(), '', $data);
         $data = json_decode($data, true);
         if ($data === null) {
             $error = json_last_error();
@@ -32,7 +33,7 @@ class ConfigJson implements ConfigIO
     {
         // JSON_PRETTY_PRINT is available from PHP 5.4.
         $print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
-        $data = self::getPhpHeaders() . json_encode($conf, $print);
+        $data = self::getPhpHeaders() . json_encode($conf, $print) . self::getPhpSuffix();
         if (!file_put_contents($filepath, $data)) {
             throw new IOException(
                 $filepath,
@@ -62,4 +63,16 @@ class ConfigJson implements ConfigIO
     {
         return '<?php /*'. PHP_EOL;
     }
+
+    /**
+     * Get PHP comment closing tags.
+     *
+     * Static method for consistency with getPhpHeaders.
+     *
+     * @return string PHP comment closing.
+     */
+    public static function getPhpSuffix()
+    {
+        return PHP_EOL . '*/ ?>';
+    }
 }