Changeset 793
- Timestamp:
- Apr 10, 2023 10:48:12 PM (13 months ago)
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.1dev/lib/Utilities.inc.php
r792 r793 55 55 56 56 case SC_DUMP_JSON: 57 echo json_encode($var, JSON_ PRETTY_PRINT);57 echo json_encode($var, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK | JSON_PRETTY_PRINT); 58 58 break; 59 59 } … … 73 73 * @return string Dump of var. 74 74 */ 75 function getDump($var) 76 { 77 ob_start(); 78 print_r($var); 79 $d = ob_get_contents(); 80 ob_end_clean(); 81 return $d; 75 function getDump($var, $serialize=false, $dump_method=SC_DUMP_PRINT_R) 76 { 77 $app =& App::getInstance(); 78 79 switch ($dump_method) { 80 case SC_DUMP_PRINT_R: 81 // Print human-readable descriptions of invisible types. 82 if (null === $var) { 83 $d = '(null)'; 84 } else if (true === $var) { 85 $d = '(bool: true)'; 86 } else if (false === $var) { 87 $d = '(bool: false)'; 88 } else if (is_scalar($var) && '' === $var) { 89 $d = '(empty string)'; 90 } else if (is_scalar($var) && preg_match('/^\s+$/', $var)) { 91 $d = '(only white space)'; 92 } else { 93 ob_start(); 94 print_r($var); 95 $d = ob_get_contents(); 96 ob_end_clean(); 97 } 98 break; 99 100 case SC_DUMP_VAR_DUMP: 101 ob_start(); 102 print_r($var); 103 var_dump($var); 104 ob_end_clean(); 105 break; 106 107 case SC_DUMP_VAR_EXPORT: 108 ob_start(); 109 print_r($var); 110 var_export($var); 111 ob_end_clean(); 112 break; 113 114 case SC_DUMP_JSON: 115 default: 116 $json_flags = $serialize ? 0 : JSON_PRETTY_PRINT; 117 return json_encode($var, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK | $json_flags); 118 } 119 return $serialize ? preg_replace('/\s+/m' . $app->getParam('preg_u'), ' ', $d) : $d; 82 120 } 83 121 -
trunk/lib/Utilities.inc.php
r789 r793 39 39 define('SC_DUMP_VAR_EXPORT', 2); 40 40 define('SC_DUMP_JSON', 3); 41 function dump($var, $display=false, $dump_method=SC_DUMP_ PRINT_R, $file='', $line='')41 function dump($var, $display=false, $dump_method=SC_DUMP_JSON, $file='', $line='') 42 42 { 43 43 $app =& App::getInstance(); … … 77 77 78 78 case SC_DUMP_JSON: 79 echo json_encode($var, JSON_ PRETTY_PRINT);79 echo json_encode($var, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK | JSON_PRETTY_PRINT); 80 80 break; 81 81 }
Note: See TracChangeset
for help on using the changeset viewer.