Split Json::encode() into Json::encode() and Json::sanitize()

refs #2635

library/Icinga/Util/Json.php

@@ -17,12 +17,42 @@ class Json
      * @param   mixed   $value
      * @param   int     $options
      * @param   int     $depth
+     *
+     * @return  string
+     * @throws  JsonEncodeException
+     */
+    public static function encode($value, $options = 0, $depth = 512)
+    {
+        return static::encodeAndSanitize($value, $options, $depth, false);
+    }
+
+    /**
+     * {@link json_encode()} wrapper, automatically sanitizes bad UTF-8
+     *
+     * @param   mixed   $value
+     * @param   int     $options
+     * @param   int     $depth
+     *
+     * @return  string
+     * @throws  JsonEncodeException
+     */
+    public static function sanitize($value, $options = 0, $depth = 512)
+    {
+        return static::encodeAndSanitize($value, $options, $depth, true);
+    }
+
+    /**
+     * {@link json_encode()} wrapper, sanitizes bad UTF-8
+     *
+     * @param   mixed   $value
+     * @param   int     $options
+     * @param   int     $depth
      * @param   bool    $autoSanitize   Automatically sanitize invalid UTF-8 (if any)
      *
      * @return  string
      * @throws  JsonEncodeException
      */
-    public static function encode($value, $options = 0, $depth = 512, $autoSanitize = false)
+    protected static function encodeAndSanitize($value, $options, $depth, $autoSanitize)
     {
         if (version_compare(phpversion(), '5.5.0', '<')) {
             $encoded = json_encode($value, $options);

library/Icinga/Web/Response/JsonResponse.php

@@ -222,7 +222,9 @@ class JsonResponse extends Response
                 $body['data'] = $this->getSuccessData();
                 break;
         }
-        echo Json::encode($body, $this->getEncodingOptions(), 512, $this->autoSanitize);
+        echo $this->getAutoSanitize()
+            ? Json::sanitize($body, $this->getEncodingOptions())
+            : Json::encode($body, $this->getEncodingOptions());
     }
 
     /**

modules/monitoring/application/clicommands/ListCommand.php

@@ -79,7 +79,7 @@ class ListCommand extends Command
         $query = $query->getQuery();
         switch ($format) {
             case 'json':
-                echo Json::encode($query->fetchAll(), 0, 512, true);
+                echo Json::sanitize($query->fetchAll());
                 break;
             case 'csv':
                 Csv::fromQuery($query)->dump();

modules/monitoring/library/Monitoring/Controller.php

@@ -60,7 +60,7 @@ class Controller extends IcingaWebController
                         'Content-Disposition',
                         'inline; filename=' . $this->getRequest()->getActionName() . '.json'
                     )
-                    ->appendBody(Json::encode($query->fetchAll()), 0, 512, true)
+                    ->appendBody(Json::sanitize($query->fetchAll()))
                     ->sendResponse();
                 exit;
             case 'csv':