Changeset 613

Timestamp:

Oct 3, 2017 7:16:47 AM (7 years ago)

Author:

anonymous

Message:

Add dump_method to function dump()

File:

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

trunk/lib/Utilities.inc.php

@@ -31 +31 @@
  * @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     $var_dump   Use var_dump instead of print_r.
+ * @param  bool     $dump_method   Dump method. See SC_DUMP_* constants.
  * @param  string   $file       Value of __FILE__.
  * @param  string   $line       Value of __LINE__
  */
-function dump($var, $display=false, $var_dump=false, $file='', $line='')
+define('SC_DUMP_PRINT_R', 0);
+define('SC_DUMP_VAR_DUMP', 1);
+define('SC_DUMP_VAR_EXPORT', 2);
+function dump($var, $display=false, $dump_method=SC_DUMP_PRINT_R, $file='', $line='')
 {
     $app =& App::getInstance();
@@ -44 +47 @@
         echo $display ? "\n<br />DUMP <strong>$file $line</strong><br /><pre>\n" : "\n<!-- DUMP $file $line\n";
     }
-    if ($var_dump) {
-        var_dump($var);
-    } else {
+
+    switch ($dump_method) {
+    case SC_DUMP_PRINT_R:
+    default:
         // Print human-readable descriptions of invisible types.
         if (null === $var) {
@@ -61 +65 @@
             print_r($var);
         }
-    }
+        break;
+
+    case SC_DUMP_VAR_DUMP:
+        var_dump($var);
+        break;
+
+    case SC_DUMP_VAR_EXPORT:
+        var_export($var);
+        break;
+    }
+
     if ($app->cli) {
         echo "\n";