jacobemerick / pqp

src/PhpQuickProfiler.php

Indentation +136 added lines, -136 removed lines

@@ -24,13 +24,13 @@ 
   protected $console;
   
   public function __construct($console, $startTime = null) {
-    $this->console = $console;
+	$this->console = $console;
 
-    if (is_null($startTime)) {
-        $startTime = microtime(true);
-    }
+	if (is_null($startTime)) {
+		$startTime = microtime(true);
+	}
 
-    $this->startTime = $startTime;
+	$this->startTime = $startTime;
   }
   
   /*-------------------------------------------
@@ -38,51 +38,51 @@ 
   -------------------------------------------*/
   
   public function gatherConsoleData() {
-    $console = array(
-      'messages' => array(),
-      'totals' => array(
-        'log' => 0,
-        'memory' => 0,
-        'error' => 0,
-        'speed' => 0
-      ));
-    $logs = $this->console->getLogs();
-      foreach($logs as $log) {
-        if($log['type'] == 'log') {
-          $message = array(
-            'data' => print_r($log['data'], true),
-            'type' => 'log'
-          );
-          $console['totals']['log']++;
-        }
-        elseif($log['type'] == 'memory') {
-          $message = array(
-            'name'    => $log['name'],
-            'data_type'    => $log['data_type'],
-            'data'   => $this->getReadableFileSize($log['data']),
-            'type' => 'memory'
-          );
-          $console['totals']['memory']++;
-        }
-        elseif($log['type'] == 'speed') {
-          $message = array(
-            'name' => $log['name'],
-            'data'    => $this->getReadableTime(($log['data'] - $this->startTime) * 1000),
-            'type' => 'speed'
-          );
-          $console['totals']['speed']++;
-        } else {
-          $message = array(
-            'data' => $log['data'],
-            'type' => 'error',
-            'file' => $log['file'],
-            'line' => $log['line']
-          );
-          $console['totals']['error']++;
-        }
-        array_push($console['messages'], $message);
-      }
-    $this->output['logs'] = array('console' => $console);
+	$console = array(
+	  'messages' => array(),
+	  'totals' => array(
+		'log' => 0,
+		'memory' => 0,
+		'error' => 0,
+		'speed' => 0
+	  ));
+	$logs = $this->console->getLogs();
+	  foreach($logs as $log) {
+		if($log['type'] == 'log') {
+		  $message = array(
+			'data' => print_r($log['data'], true),
+			'type' => 'log'
+		  );
+		  $console['totals']['log']++;
+		}
+		elseif($log['type'] == 'memory') {
+		  $message = array(
+			'name'    => $log['name'],
+			'data_type'    => $log['data_type'],
+			'data'   => $this->getReadableFileSize($log['data']),
+			'type' => 'memory'
+		  );
+		  $console['totals']['memory']++;
+		}
+		elseif($log['type'] == 'speed') {
+		  $message = array(
+			'name' => $log['name'],
+			'data'    => $this->getReadableTime(($log['data'] - $this->startTime) * 1000),
+			'type' => 'speed'
+		  );
+		  $console['totals']['speed']++;
+		} else {
+		  $message = array(
+			'data' => $log['data'],
+			'type' => 'error',
+			'file' => $log['file'],
+			'line' => $log['line']
+		  );
+		  $console['totals']['error']++;
+		}
+		array_push($console['messages'], $message);
+	  }
+	$this->output['logs'] = array('console' => $console);
   }
   
   /*-------------------------------------------
@@ -90,28 +90,28 @@ 
   -------------------------------------------*/
   
   public function gatherFileData() {
-    $files = get_included_files();
-    $fileList = array();
-    $fileTotals = array(
-      "count" => count($files),
-      "size" => 0,
-      "largest" => 0,
-    );
+	$files = get_included_files();
+	$fileList = array();
+	$fileTotals = array(
+	  "count" => count($files),
+	  "size" => 0,
+	  "largest" => 0,
+	);
 
-    foreach($files as $key => $file) {
-      $size = filesize($file);
-      $fileList[] = array(
-          'name' => $file,
-          'size' => $this->getReadableFileSize($size)
-        );
-      $fileTotals['size'] += $size;
-      if($size > $fileTotals['largest']) $fileTotals['largest'] = $size;
-    }
+	foreach($files as $key => $file) {
+	  $size = filesize($file);
+	  $fileList[] = array(
+		  'name' => $file,
+		  'size' => $this->getReadableFileSize($size)
+		);
+	  $fileTotals['size'] += $size;
+	  if($size > $fileTotals['largest']) $fileTotals['largest'] = $size;
+	}
     
-    $fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']);
-    $fileTotals['largest'] = $this->getReadableFileSize($fileTotals['largest']);
-    $this->output['files'] = $fileList;
-    $this->output['fileTotals'] = $fileTotals;
+	$fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']);
+	$fileTotals['largest'] = $this->getReadableFileSize($fileTotals['largest']);
+	$this->output['files'] = $fileList;
+	$this->output['fileTotals'] = $fileTotals;
   }
   
   /*-------------------------------------------
@@ -119,10 +119,10 @@ 
   -------------------------------------------*/
   
   public function gatherMemoryData() {
-    $memoryTotals = array();
-    $memoryTotals['used'] = $this->getReadableFileSize(memory_get_peak_usage());
-    $memoryTotals['total'] = ini_get("memory_limit");
-    $this->output['memoryTotals'] = $memoryTotals;
+	$memoryTotals = array();
+	$memoryTotals['used'] = $this->getReadableFileSize(memory_get_peak_usage());
+	$memoryTotals['total'] = ini_get("memory_limit");
+	$this->output['memoryTotals'] = $memoryTotals;
   }
   
   /*--------------------------------------------------------
@@ -130,24 +130,24 @@ 
   ----------------------------------------------------------*/
   
   public function gatherQueryData() {
-    $queryTotals = array();
-    $queryTotals['count'] = 0;
-    $queryTotals['time'] = 0;
-    $queries = array();
+	$queryTotals = array();
+	$queryTotals['count'] = 0;
+	$queryTotals['time'] = 0;
+	$queries = array();
     
-    if($this->db != '') {
-      $queryTotals['count'] += $this->db->queryCount;
-      foreach($this->db->queries as $key => $query) {
-        $query = $this->attemptToExplainQuery($query);
-        $queryTotals['time'] += $query['time'];
-        $query['time'] = $this->getReadableTime($query['time']);
-        $queries[] = $query;
-      }
-    }
+	if($this->db != '') {
+	  $queryTotals['count'] += $this->db->queryCount;
+	  foreach($this->db->queries as $key => $query) {
+		$query = $this->attemptToExplainQuery($query);
+		$queryTotals['time'] += $query['time'];
+		$query['time'] = $this->getReadableTime($query['time']);
+		$queries[] = $query;
+	  }
+	}
     
-    $queryTotals['time'] = $this->getReadableTime($queryTotals['time']);
-    $this->output['queries'] = $queries;
-    $this->output['queryTotals'] = $queryTotals;
+	$queryTotals['time'] = $this->getReadableTime($queryTotals['time']);
+	$this->output['queries'] = $queries;
+	$this->output['queryTotals'] = $queryTotals;
   }
   
   /*--------------------------------------------------------
@@ -155,16 +155,16 @@ 
   ----------------------------------------------------------*/
   
   function attemptToExplainQuery($query) {
-    try {
-      $sql = 'EXPLAIN '.$query['sql'];
-      $rs = $this->db->query($sql);
-    }
-    catch(Exception $e) {}
-    if($rs) {
-      $row = mysql_fetch_array($rs, MYSQL_ASSOC);
-      $query['explain'] = $row;
-    }
-    return $query;
+	try {
+	  $sql = 'EXPLAIN '.$query['sql'];
+	  $rs = $this->db->query($sql);
+	}
+	catch(Exception $e) {}
+	if($rs) {
+	  $row = mysql_fetch_array($rs, MYSQL_ASSOC);
+	  $query['explain'] = $row;
+	}
+	return $query;
   }
   
   /*-------------------------------------------
@@ -172,10 +172,10 @@ 
   -------------------------------------------*/
   
   public function gatherSpeedData() {
-    $speedTotals = array();
-    $speedTotals['total'] = $this->getReadableTime((microtime(true) - $this->startTime)*1000);
-    $speedTotals['allowed'] = ini_get("max_execution_time");
-    $this->output['speedTotals'] = $speedTotals;
+	$speedTotals = array();
+	$speedTotals['total'] = $this->getReadableTime((microtime(true) - $this->startTime)*1000);
+	$speedTotals['allowed'] = ini_get("max_execution_time");
+	$this->output['speedTotals'] = $speedTotals;
   }
   
   /*-------------------------------------------
@@ -183,35 +183,35 @@ 
   -------------------------------------------*/
   
   public function getReadableFileSize($size, $retstring = null) {
-          // adapted from code at http://aidanlister.com/repos/v/function.size_readable.php
-         $sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+		  // adapted from code at http://aidanlister.com/repos/v/function.size_readable.php
+		 $sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
 
-         if ($retstring === null) { $retstring = '%01.2f %s'; }
+		 if ($retstring === null) { $retstring = '%01.2f %s'; }
 
-    $lastsizestring = end($sizes);
+	$lastsizestring = end($sizes);
 
-    foreach ($sizes as $sizestring) {
-          if ($size < 1024) { break; }
-             if ($sizestring != $lastsizestring) { $size /= 1024; }
-         }
-         if ($sizestring == $sizes[0]) { $retstring = '%01d %s'; } // Bytes aren't normally fractional
-         return sprintf($retstring, $size, $sizestring);
+	foreach ($sizes as $sizestring) {
+		  if ($size < 1024) { break; }
+			 if ($sizestring != $lastsizestring) { $size /= 1024; }
+		 }
+		 if ($sizestring == $sizes[0]) { $retstring = '%01d %s'; } // Bytes aren't normally fractional
+		 return sprintf($retstring, $size, $sizestring);
   }
   
   public function getReadableTime($time) {
-    $ret = $time;
-    $formatter = 0;
-    $formats = array('ms', 's', 'm');
-    if($time >= 1000 && $time < 60000) {
-      $formatter = 1;
-      $ret = ($time / 1000);
-    }
-    if($time >= 60000) {
-      $formatter = 2;
-      $ret = ($time / 1000) / 60;
-    }
-    $ret = number_format($ret,3,'.','') . ' ' . $formats[$formatter];
-    return $ret;
+	$ret = $time;
+	$formatter = 0;
+	$formats = array('ms', 's', 'm');
+	if($time >= 1000 && $time < 60000) {
+	  $formatter = 1;
+	  $ret = ($time / 1000);
+	}
+	if($time >= 60000) {
+	  $formatter = 2;
+	  $ret = ($time / 1000) / 60;
+	}
+	$ret = number_format($ret,3,'.','') . ' ' . $formats[$formatter];
+	return $ret;
   }
   
   /*---------------------------------------------------------
@@ -219,15 +219,15 @@ 
   -----------------------------------------------------------*/
   
   public function display($db = '', $master_db = '') {
-    $this->db = $db;
-    $this->master_db = $master_db;
-    $this->gatherConsoleData();
-    $this->gatherFileData();
-    $this->gatherMemoryData();
-    $this->gatherQueryData();
-    $this->gatherSpeedData();
-    require_once __DIR__ . '/../display.php';
-    displayPqp($this->output);
+	$this->db = $db;
+	$this->master_db = $master_db;
+	$this->gatherConsoleData();
+	$this->gatherFileData();
+	$this->gatherMemoryData();
+	$this->gatherQueryData();
+	$this->gatherSpeedData();
+	require_once __DIR__ . '/../display.php';
+	displayPqp($this->output);
   }
   
 }

Spacing +15 added lines, -15 removed lines

@@ -47,15 +47,15 @@ 
         'speed' => 0
       ));
     $logs = $this->console->getLogs();
-      foreach($logs as $log) {
-        if($log['type'] == 'log') {
+      foreach ($logs as $log) {
+        if ($log['type'] == 'log') {
           $message = array(
             'data' => print_r($log['data'], true),
             'type' => 'log'
           );
           $console['totals']['log']++;
         }
-        elseif($log['type'] == 'memory') {
+        elseif ($log['type'] == 'memory') {
           $message = array(
             'name'    => $log['name'],
             'data_type'    => $log['data_type'],
@@ -64,7 +64,7 @@ 
           );
           $console['totals']['memory']++;
         }
-        elseif($log['type'] == 'speed') {
+        elseif ($log['type'] == 'speed') {
           $message = array(
             'name' => $log['name'],
             'data'    => $this->getReadableTime(($log['data'] - $this->startTime) * 1000),
@@ -98,14 +98,14 @@ 
       "largest" => 0,
     );
 
-    foreach($files as $key => $file) {
+    foreach ($files as $key => $file) {
       $size = filesize($file);
       $fileList[] = array(
           'name' => $file,
           'size' => $this->getReadableFileSize($size)
         );
       $fileTotals['size'] += $size;
-      if($size > $fileTotals['largest']) $fileTotals['largest'] = $size;
+      if ($size > $fileTotals['largest']) $fileTotals['largest'] = $size;
     }
     
     $fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']);
@@ -135,9 +135,9 @@ 
     $queryTotals['time'] = 0;
     $queries = array();
     
-    if($this->db != '') {
+    if ($this->db != '') {
       $queryTotals['count'] += $this->db->queryCount;
-      foreach($this->db->queries as $key => $query) {
+      foreach ($this->db->queries as $key => $query) {
         $query = $this->attemptToExplainQuery($query);
         $queryTotals['time'] += $query['time'];
         $query['time'] = $this->getReadableTime($query['time']);
@@ -159,8 +159,8 @@ 
       $sql = 'EXPLAIN '.$query['sql'];
       $rs = $this->db->query($sql);
     }
-    catch(Exception $e) {}
-    if($rs) {
+    catch (Exception $e) {}
+    if ($rs) {
       $row = mysql_fetch_array($rs, MYSQL_ASSOC);
       $query['explain'] = $row;
     }
@@ -173,7 +173,7 @@ 
   
   public function gatherSpeedData() {
     $speedTotals = array();
-    $speedTotals['total'] = $this->getReadableTime((microtime(true) - $this->startTime)*1000);
+    $speedTotals['total'] = $this->getReadableTime((microtime(true) - $this->startTime) * 1000);
     $speedTotals['allowed'] = ini_get("max_execution_time");
     $this->output['speedTotals'] = $speedTotals;
   }
@@ -202,15 +202,15 @@ 
     $ret = $time;
     $formatter = 0;
     $formats = array('ms', 's', 'm');
-    if($time >= 1000 && $time < 60000) {
+    if ($time >= 1000 && $time < 60000) {
       $formatter = 1;
       $ret = ($time / 1000);
     }
-    if($time >= 60000) {
+    if ($time >= 60000) {
       $formatter = 2;
       $ret = ($time / 1000) / 60;
     }
-    $ret = number_format($ret,3,'.','') . ' ' . $formats[$formatter];
+    $ret = number_format($ret, 3, '.', '').' '.$formats[$formatter];
     return $ret;
   }
   
@@ -226,7 +226,7 @@ 
     $this->gatherMemoryData();
     $this->gatherQueryData();
     $this->gatherSpeedData();
-    require_once __DIR__ . '/../display.php';
+    require_once __DIR__.'/../display.php';
     displayPqp($this->output);
   }
   

Braces +6 added lines, -7 removed lines

@@ -54,8 +54,7 @@ 
             'type' => 'log'
           );
           $console['totals']['log']++;
-        }
-        elseif($log['type'] == 'memory') {
+        } elseif($log['type'] == 'memory') {
           $message = array(
             'name'    => $log['name'],
             'data_type'    => $log['data_type'],
@@ -63,8 +62,7 @@ 
             'type' => 'memory'
           );
           $console['totals']['memory']++;
-        }
-        elseif($log['type'] == 'speed') {
+        } elseif($log['type'] == 'speed') {
           $message = array(
             'name' => $log['name'],
             'data'    => $this->getReadableTime(($log['data'] - $this->startTime) * 1000),
@@ -105,7 +103,9 @@ 
           'size' => $this->getReadableFileSize($size)
         );
       $fileTotals['size'] += $size;
-      if($size > $fileTotals['largest']) $fileTotals['largest'] = $size;
+      if($size > $fileTotals['largest']) {
+      	$fileTotals['largest'] = $size;
+      }
     }
     
     $fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']);
@@ -158,8 +158,7 @@ 
     try {
       $sql = 'EXPLAIN '.$query['sql'];
       $rs = $this->db->query($sql);
-    }
-    catch(Exception $e) {}
+    } catch(Exception $e) {}
     if($rs) {
       $row = mysql_fetch_array($rs, MYSQL_ASSOC);
       $query['explain'] = $row;