Changeset 781 for trunk

Timestamp:

Feb 26, 2023 9:21:30 PM (14 months ago)

Author:

anonymous

Message:

Improve pretty json output

File:

• trunk/lib/Utilities.inc.php (modified) (3 diffs)

trunk/lib/Utilities.inc.php

@@ -29 +29 @@
  * Print variable dump.
  *
- * @param  mixed    $var        The variable to dump.
- * @param  bool     $display    Print the dump in <pre> tags or hide it in html comments (non-CLI only).
- * @param  bool     $dump_method   Dump method. See SC_DUMP_* constants.
- * @param  string   $file       Value of __FILE__.
- * @param  string   $line       Value of __LINE__
+ * @param  mixed    $var            The variable to dump.
+ * @param  bool     $display        Print the dump in <pre> tags or hide it in html comments (non-CLI only).
+ * @param  const    $dump_method    Dump method. See SC_DUMP_* constants.
+ * @param  string   $file           Value of __FILE__.
+ * @param  string   $line           Value of __LINE__
  */
 define('SC_DUMP_PRINT_R', 0);
@@ -116 +116 @@
 *
 * @access   public
-* @param    mixed   $var        The variable to dump.
-* @param    bool    $serialize  If true, remove line-endings. Useful for logging variables.
-* @return   string              The dumped variable.
+* @param    mixed   $var            The variable to dump.
+* @param    bool    $serialize      If true, remove line-endings. Useful for logging variables.
+* @param    const   $dump_method    Dump method. See SC_DUMP_* constants.
+* @return   string                  The dumped variable.
 * @author   Quinn Comendant <quinn@strangecode.com>
 */
@@ -162 +163 @@
 
     case SC_DUMP_JSON:
-        $d = json_encode($var, JSON_PRETTY_PRINT);
-        break;
+        $json_flags = $serialize ? 0 : JSON_PRETTY_PRINT;
+        return json_encode($var, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK | $json_flags);
     }
     return $serialize ? preg_replace('/\s+/m' . $app->getParam('preg_u'), ' ', $d) : $d;