Changeset 793 for branches/1.1dev/lib

Timestamp:

Apr 10, 2023 10:48:12 PM (13 months ago)

Author:

anonymous

Message:

Backport dump() function from trunk

File:

• branches/1.1dev/lib/Utilities.inc.php (modified) (2 diffs)

branches/1.1dev/lib/Utilities.inc.php

@@ -55 +55 @@
 
     case SC_DUMP_JSON:
-        echo json_encode($var, JSON_PRETTY_PRINT);
+        echo json_encode($var, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK | JSON_PRETTY_PRINT);
         break;
     }
@@ -73 +73 @@
  * @return string Dump of var.
  */
-function getDump($var)
-{
-    ob_start();
-    print_r($var);
-    $d = ob_get_contents();
-    ob_end_clean();
-    return $d;
+function getDump($var, $serialize=false, $dump_method=SC_DUMP_PRINT_R)
+{
+    $app =& App::getInstance();
+
+    switch ($dump_method) {
+    case SC_DUMP_PRINT_R:
+        // Print human-readable descriptions of invisible types.
+        if (null === $var) {
+            $d = '(null)';
+        } else if (true === $var) {
+            $d = '(bool: true)';
+        } else if (false === $var) {
+            $d = '(bool: false)';
+        } else if (is_scalar($var) && '' === $var) {
+            $d = '(empty string)';
+        } else if (is_scalar($var) && preg_match('/^\s+$/', $var)) {
+            $d = '(only white space)';
+        } else {
+            ob_start();
+            print_r($var);
+            $d = ob_get_contents();
+            ob_end_clean();
+        }
+        break;
+
+    case SC_DUMP_VAR_DUMP:
+        ob_start();
+        print_r($var);
+        var_dump($var);
+        ob_end_clean();
+        break;
+
+    case SC_DUMP_VAR_EXPORT:
+        ob_start();
+        print_r($var);
+        var_export($var);
+        ob_end_clean();
+        break;
+
+    case SC_DUMP_JSON:
+    default:
+        $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;
 }