@@ -24,11 +24,11 @@ discard block |
||
| 24 | 24 | protected $console; |
| 25 | 25 | |
| 26 | 26 | public function __construct($console, $startTime = null) { |
| 27 | - $this->console = $console; |
|
| 27 | + $this->console = $console; |
|
| 28 | 28 | |
| 29 | - if (is_null($startTime)) { |
|
| 30 | - $startTime = microtime(true); |
|
| 31 | - } |
|
| 29 | + if (is_null($startTime)) { |
|
| 30 | + $startTime = microtime(true); |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | 33 | $this->startTime = $startTime; |
| 34 | 34 | } |
@@ -38,49 +38,49 @@ discard block |
||
| 38 | 38 | -------------------------------------------*/ |
| 39 | 39 | |
| 40 | 40 | public function gatherConsoleData() { |
| 41 | - $console = array( |
|
| 42 | - 'messages' => array(), |
|
| 43 | - 'totals' => array( |
|
| 44 | - 'log' => 0, |
|
| 45 | - 'memory' => 0, |
|
| 46 | - 'error' => 0, |
|
| 47 | - 'speed' => 0 |
|
| 48 | - )); |
|
| 41 | + $console = array( |
|
| 42 | + 'messages' => array(), |
|
| 43 | + 'totals' => array( |
|
| 44 | + 'log' => 0, |
|
| 45 | + 'memory' => 0, |
|
| 46 | + 'error' => 0, |
|
| 47 | + 'speed' => 0 |
|
| 48 | + )); |
|
| 49 | 49 | $logs = $this->console->getLogs(); |
| 50 | 50 | foreach($logs as $log) { |
| 51 | 51 | if($log['type'] == 'log') { |
| 52 | 52 | $message = array( |
| 53 | - 'data' => print_r($log['data'], true), |
|
| 54 | - 'type' => 'log' |
|
| 55 | - ); |
|
| 56 | - $console['totals']['log']++; |
|
| 53 | + 'data' => print_r($log['data'], true), |
|
| 54 | + 'type' => 'log' |
|
| 55 | + ); |
|
| 56 | + $console['totals']['log']++; |
|
| 57 | 57 | } |
| 58 | 58 | elseif($log['type'] == 'memory') { |
| 59 | 59 | $message = array( |
| 60 | - 'name' => $log['name'], |
|
| 61 | - 'data_type' => $log['data_type'], |
|
| 62 | - 'data' => $this->getReadableFileSize($log['data']), |
|
| 63 | - 'type' => 'memory' |
|
| 64 | - ); |
|
| 65 | - $console['totals']['memory']++; |
|
| 60 | + 'name' => $log['name'], |
|
| 61 | + 'data_type' => $log['data_type'], |
|
| 62 | + 'data' => $this->getReadableFileSize($log['data']), |
|
| 63 | + 'type' => 'memory' |
|
| 64 | + ); |
|
| 65 | + $console['totals']['memory']++; |
|
| 66 | 66 | } |
| 67 | 67 | elseif($log['type'] == 'speed') { |
| 68 | - $message = array( |
|
| 69 | - 'name' => $log['name'], |
|
| 70 | - 'data' => $this->getReadableTime(($log['data'] - $this->startTime) * 1000), |
|
| 71 | - 'type' => 'speed' |
|
| 72 | - ); |
|
| 73 | - $console['totals']['speed']++; |
|
| 68 | + $message = array( |
|
| 69 | + 'name' => $log['name'], |
|
| 70 | + 'data' => $this->getReadableTime(($log['data'] - $this->startTime) * 1000), |
|
| 71 | + 'type' => 'speed' |
|
| 72 | + ); |
|
| 73 | + $console['totals']['speed']++; |
|
| 74 | 74 | } else { |
| 75 | - $message = array( |
|
| 76 | - 'data' => $log['data'], |
|
| 77 | - 'type' => 'error', |
|
| 78 | - 'file' => $log['file'], |
|
| 79 | - 'line' => $log['line'] |
|
| 80 | - ); |
|
| 81 | - $console['totals']['error']++; |
|
| 82 | - } |
|
| 83 | - array_push($console['messages'], $message); |
|
| 75 | + $message = array( |
|
| 76 | + 'data' => $log['data'], |
|
| 77 | + 'type' => 'error', |
|
| 78 | + 'file' => $log['file'], |
|
| 79 | + 'line' => $log['line'] |
|
| 80 | + ); |
|
| 81 | + $console['totals']['error']++; |
|
| 82 | + } |
|
| 83 | + array_push($console['messages'], $message); |
|
| 84 | 84 | } |
| 85 | 85 | $this->output['logs'] = array('console' => $console); |
| 86 | 86 | } |
@@ -183,19 +183,19 @@ discard block |
||
| 183 | 183 | -------------------------------------------*/ |
| 184 | 184 | |
| 185 | 185 | public function getReadableFileSize($size, $retstring = null) { |
| 186 | - // adapted from code at http://aidanlister.com/repos/v/function.size_readable.php |
|
| 187 | - $sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
| 186 | + // adapted from code at http://aidanlister.com/repos/v/function.size_readable.php |
|
| 187 | + $sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
| 188 | 188 | |
| 189 | - if ($retstring === null) { $retstring = '%01.2f %s'; } |
|
| 189 | + if ($retstring === null) { $retstring = '%01.2f %s'; } |
|
| 190 | 190 | |
| 191 | 191 | $lastsizestring = end($sizes); |
| 192 | 192 | |
| 193 | 193 | foreach ($sizes as $sizestring) { |
| 194 | - if ($size < 1024) { break; } |
|
| 195 | - if ($sizestring != $lastsizestring) { $size /= 1024; } |
|
| 196 | - } |
|
| 197 | - if ($sizestring == $sizes[0]) { $retstring = '%01d %s'; } // Bytes aren't normally fractional |
|
| 198 | - return sprintf($retstring, $size, $sizestring); |
|
| 194 | + if ($size < 1024) { break; } |
|
| 195 | + if ($sizestring != $lastsizestring) { $size /= 1024; } |
|
| 196 | + } |
|
| 197 | + if ($sizestring == $sizes[0]) { $retstring = '%01d %s'; } // Bytes aren't normally fractional |
|
| 198 | + return sprintf($retstring, $size, $sizestring); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | public function getReadableTime($time) { |
@@ -47,15 +47,15 @@ discard block |
||
| 47 | 47 | 'speed' => 0 |
| 48 | 48 | )); |
| 49 | 49 | $logs = $this->console->getLogs(); |
| 50 | - foreach($logs as $log) { |
|
| 51 | - if($log['type'] == 'log') { |
|
| 50 | + foreach ($logs as $log) { |
|
| 51 | + if ($log['type'] == 'log') { |
|
| 52 | 52 | $message = array( |
| 53 | 53 | 'data' => print_r($log['data'], true), |
| 54 | 54 | 'type' => 'log' |
| 55 | 55 | ); |
| 56 | 56 | $console['totals']['log']++; |
| 57 | 57 | } |
| 58 | - elseif($log['type'] == 'memory') { |
|
| 58 | + elseif ($log['type'] == 'memory') { |
|
| 59 | 59 | $message = array( |
| 60 | 60 | 'name' => $log['name'], |
| 61 | 61 | 'data_type' => $log['data_type'], |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | ); |
| 65 | 65 | $console['totals']['memory']++; |
| 66 | 66 | } |
| 67 | - elseif($log['type'] == 'speed') { |
|
| 67 | + elseif ($log['type'] == 'speed') { |
|
| 68 | 68 | $message = array( |
| 69 | 69 | 'name' => $log['name'], |
| 70 | 70 | 'data' => $this->getReadableTime(($log['data'] - $this->startTime) * 1000), |
@@ -98,14 +98,14 @@ discard block |
||
| 98 | 98 | "largest" => 0, |
| 99 | 99 | ); |
| 100 | 100 | |
| 101 | - foreach($files as $key => $file) { |
|
| 101 | + foreach ($files as $key => $file) { |
|
| 102 | 102 | $size = filesize($file); |
| 103 | 103 | $fileList[] = array( |
| 104 | 104 | 'name' => $file, |
| 105 | 105 | 'size' => $this->getReadableFileSize($size) |
| 106 | 106 | ); |
| 107 | 107 | $fileTotals['size'] += $size; |
| 108 | - if($size > $fileTotals['largest']) $fileTotals['largest'] = $size; |
|
| 108 | + if ($size > $fileTotals['largest']) $fileTotals['largest'] = $size; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | $fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']); |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | $queryTotals['time'] = 0; |
| 136 | 136 | $queries = array(); |
| 137 | 137 | |
| 138 | - if($this->db != '') { |
|
| 138 | + if ($this->db != '') { |
|
| 139 | 139 | $queryTotals['count'] += $this->db->queryCount; |
| 140 | - foreach($this->db->queries as $key => $query) { |
|
| 140 | + foreach ($this->db->queries as $key => $query) { |
|
| 141 | 141 | $query = $this->attemptToExplainQuery($query); |
| 142 | 142 | $queryTotals['time'] += $query['time']; |
| 143 | 143 | $query['time'] = $this->getReadableTime($query['time']); |
@@ -159,8 +159,8 @@ discard block |
||
| 159 | 159 | $sql = 'EXPLAIN '.$query['sql']; |
| 160 | 160 | $rs = $this->db->query($sql); |
| 161 | 161 | } |
| 162 | - catch(Exception $e) {} |
|
| 163 | - if($rs) { |
|
| 162 | + catch (Exception $e) {} |
|
| 163 | + if ($rs) { |
|
| 164 | 164 | $row = mysql_fetch_array($rs, MYSQL_ASSOC); |
| 165 | 165 | $query['explain'] = $row; |
| 166 | 166 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | public function gatherSpeedData() { |
| 175 | 175 | $speedTotals = array(); |
| 176 | - $speedTotals['total'] = $this->getReadableTime((microtime(true) - $this->startTime)*1000); |
|
| 176 | + $speedTotals['total'] = $this->getReadableTime((microtime(true) - $this->startTime) * 1000); |
|
| 177 | 177 | $speedTotals['allowed'] = ini_get("max_execution_time"); |
| 178 | 178 | $this->output['speedTotals'] = $speedTotals; |
| 179 | 179 | } |
@@ -202,15 +202,15 @@ discard block |
||
| 202 | 202 | $ret = $time; |
| 203 | 203 | $formatter = 0; |
| 204 | 204 | $formats = array('ms', 's', 'm'); |
| 205 | - if($time >= 1000 && $time < 60000) { |
|
| 205 | + if ($time >= 1000 && $time < 60000) { |
|
| 206 | 206 | $formatter = 1; |
| 207 | 207 | $ret = ($time / 1000); |
| 208 | 208 | } |
| 209 | - if($time >= 60000) { |
|
| 209 | + if ($time >= 60000) { |
|
| 210 | 210 | $formatter = 2; |
| 211 | 211 | $ret = ($time / 1000) / 60; |
| 212 | 212 | } |
| 213 | - $ret = number_format($ret,3,'.','') . ' ' . $formats[$formatter]; |
|
| 213 | + $ret = number_format($ret, 3, '.', '').' '.$formats[$formatter]; |
|
| 214 | 214 | return $ret; |
| 215 | 215 | } |
| 216 | 216 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | $this->gatherMemoryData(); |
| 227 | 227 | $this->gatherQueryData(); |
| 228 | 228 | $this->gatherSpeedData(); |
| 229 | - require_once __DIR__ . '/../display.php'; |
|
| 229 | + require_once __DIR__.'/../display.php'; |
|
| 230 | 230 | displayPqp($this->output); |
| 231 | 231 | } |
| 232 | 232 | |