jacobemerick / pqp

index.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 			Console::log('Ending log below with a sample error.');
 			throw new Exception('Unable to write to log!');
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			Console::logError($e, 'Sample error logging.');
 		}
 	}
@@ -84,8 +84,8 @@ 
 		$ret = '';
 		$longString = 'This is a really long string that when appended with the . symbol 
 					  will cause memory to be duplicated in order to create the new string.';
-		for($i = 0; $i < 10; $i++) {
-			$ret = $ret . $longString;
+		for ($i = 0; $i < 10; $i++) {
+			$ret = $ret.$longString;
 			Console::logMemory($ret, 'Watch memory leak -- iteration '.$i);
 		}
 	}

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 			Console::logMemory($this, 'PQP Example Class : Line '.__LINE__);
 			Console::log('Ending log below with a sample error.');
 			throw new Exception('Unable to write to log!');
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			Console::logError($e, 'Sample error logging.');
 		}
 	}

src/Console.php

Indentation +75 added lines, -75 removed lines

@@ -15,86 +15,86 @@
 class Console
 {
 
-    /** @var  array */
-    protected $store = array();
+	/** @var  array */
+	protected $store = array();
 
-    /**
-     * Logs data to the console
-     * Accepts any data type
-     *
-     * @param mixed $data
-     */
-    public function log($data)
-    {
-        array_push($this->store, array(
-          'data' => $data,
-          'type' => 'log'
-        ));
-    }
+	/**
+	 * Logs data to the console
+	 * Accepts any data type
+	 *
+	 * @param mixed $data
+	 */
+	public function log($data)
+	{
+		array_push($this->store, array(
+		  'data' => $data,
+		  'type' => 'log'
+		));
+	}
 
-    /**
-     * Logs memory usage of a variable
-     * If no parameter is passed in, logs current memory usage
-     *
-     * @param mixed $object
-     * @param string $name
-     */
-    public function logMemory($object = null, $name = '')
-    {
-        $memory = memory_get_usage();
-        if (!is_null($object)) {
-            $memory = strlen(serialize($object));
-        }
+	/**
+	 * Logs memory usage of a variable
+	 * If no parameter is passed in, logs current memory usage
+	 *
+	 * @param mixed $object
+	 * @param string $name
+	 */
+	public function logMemory($object = null, $name = '')
+	{
+		$memory = memory_get_usage();
+		if (!is_null($object)) {
+			$memory = strlen(serialize($object));
+		}
 
-        array_push($this->store, array(
-            'name'      => $name,
-            'data'      => $memory,
-            'data_type' => gettype($object),
-            'type'      => 'memory'
-        ));
-    }
+		array_push($this->store, array(
+			'name'      => $name,
+			'data'      => $memory,
+			'data_type' => gettype($object),
+			'type'      => 'memory'
+		));
+	}
 
-    /**
-     * Logs exception with optional message override
-     *
-     * @param Exception $exception
-     * @param string    $message
-     */
-    public function logError(Exception $exception, $message = '')
-    {
-        if (empty($message)) {
-            $message = $exception->getMessage();
-        }
+	/**
+	 * Logs exception with optional message override
+	 *
+	 * @param Exception $exception
+	 * @param string    $message
+	 */
+	public function logError(Exception $exception, $message = '')
+	{
+		if (empty($message)) {
+			$message = $exception->getMessage();
+		}
 
-        array_push($this->store, array(
-            'data' => $message,
-            'file' => $exception->getFile(),
-            'line' => $exception->getLine(),
-            'type' => 'error'
-        ));
-    }
+		array_push($this->store, array(
+			'data' => $message,
+			'file' => $exception->getFile(),
+			'line' => $exception->getLine(),
+			'type' => 'error'
+		));
+	}
 
-    /**
-     * Logs current time with optional message
-     *
-     * @param string $name
-     */
-    public function logSpeed($name = 'Point in Time')
-    {
-        array_push($this->store, array(
-            'data' => microtime(true),
-            'name' => $name,
-            'type' => 'speed'
-        ));
-    }
+	/**
+	 * Logs current time with optional message
+	 *
+	 * @param string $name
+	 */
+	public function logSpeed($name = 'Point in Time')
+	{
+		array_push($this->store, array(
+			'data' => microtime(true),
+			'name' => $name,
+			'type' => 'speed'
+		));
+	}
 
-    /**
-     * Returns the collected logs
-     *
-     * @returns array
-     */
-    public function getLogs()
-    {
-        return $this->store;
-    }
+	/**
+	 * Returns the collected logs
+	 *
+	 * @returns array
+	 */
+	public function getLogs()
+	{
+		return $this->store;
+	}
 }

tests/unit/ConsoleTest.php

Indentation +108 added lines, -108 removed lines

@@ -5,112 +5,112 @@
 class ConsoleTest extends PHPUnit_Framework_TestCase
 {
 
-    public function __construct()
-    {
-    }
-
-    public function testLog()
-    {
-        $data = array(
-            'key' => 'value'
-        );
-
-        $console = new Console();
-        $console->log($data);
-        $store = $this->getProtectedStore($console);
-        $log = array_pop($store);
-
-        $this->assertSame($data, $log['data']);
-        $this->assertEquals('log', $log['type']);
-    }
-
-    public function testLogMemory()
-    {
-        $data = array(
-            'key' => 'value'
-        );
-        $memory = strlen(serialize($data));
-        $name = 'Test Array';
-
-        $console = new Console();
-        $console->logMemory($data, $name);
-        $store = $this->getProtectedStore($console);
-        $log = array_pop($store);
-
-        $this->assertEquals($name, $log['name']);
-        $this->assertEquals($memory, $log['data']);
-        $this->assertEquals('array', $log['data_type']);
-        $this->assertEquals('memory', $log['type']);
-    }
-
-    public function testLogError()
-    {
-        $error = new Exception('Test Exception');
-
-        $console = new Console();
-        $console->logError($error);
-        $store = $this->getProtectedStore($console);
-        $log = array_pop($store);
-
-        $this->assertEquals($error->getMessage(), $log['data']);
-        $this->assertEquals($error->getFile(), $log['file']);
-        $this->assertEquals($error->getLine(), $log['line']);
-        $this->assertEquals('error', $log['type']);
-
-        $error = new Exception('Test Exception');
-        $message = 'override message';
-
-        $console = new Console();
-        $console->logError($error, $message);
-        $store = $this->getProtectedStore($console);
-        $log = array_pop($store);
-
-        $this->assertEquals($message, $log['data']);
-    }
-
-    public function testLogSpeed()
-    {
-        $name = 'Test Speed';
-
-        $console = new Console();
-        $console->logSpeed($name);
-        $store = $this->getProtectedStore($console);
-        $log = array_pop($store);
-
-        $this->assertEquals($name, $log['name']);
-        $this->assertEquals('speed', $log['type']);
-    }
-
-    public function testGetLogs()
-    {
-        $store = array(
-            array(
-                'data' => 'a string',
-                'type' => 'log'
-            ),
-            array(
-                'name' => '',
-                'data' => 123,
-                'data_type' => 'array',
-                'type' => 'memory'
-            )
-        );
-
-        $console = new Console();
-
-        $reflectedConsole = new ReflectionClass(get_class($console));
-        $reflectedProperty = $reflectedConsole->getProperty('store');
-        $reflectedProperty->setAccessible(true);
-        $reflectedProperty->setValue($console, $store);
-
-        $this->assertSame($store, $console->getLogs());
-    }
-
-    protected function getProtectedStore(Console $console)
-    {
-        $reflectedConsole = new ReflectionClass(get_class($console));
-        $reflectedProperty = $reflectedConsole->getProperty('store');
-        $reflectedProperty->setAccessible(true);
-        return $reflectedProperty->getValue($console);
-    }
+	public function __construct()
+	{
+	}
+
+	public function testLog()
+	{
+		$data = array(
+			'key' => 'value'
+		);
+
+		$console = new Console();
+		$console->log($data);
+		$store = $this->getProtectedStore($console);
+		$log = array_pop($store);
+
+		$this->assertSame($data, $log['data']);
+		$this->assertEquals('log', $log['type']);
+	}
+
+	public function testLogMemory()
+	{
+		$data = array(
+			'key' => 'value'
+		);
+		$memory = strlen(serialize($data));
+		$name = 'Test Array';
+
+		$console = new Console();
+		$console->logMemory($data, $name);
+		$store = $this->getProtectedStore($console);
+		$log = array_pop($store);
+
+		$this->assertEquals($name, $log['name']);
+		$this->assertEquals($memory, $log['data']);
+		$this->assertEquals('array', $log['data_type']);
+		$this->assertEquals('memory', $log['type']);
+	}
+
+	public function testLogError()
+	{
+		$error = new Exception('Test Exception');
+
+		$console = new Console();
+		$console->logError($error);
+		$store = $this->getProtectedStore($console);
+		$log = array_pop($store);
+
+		$this->assertEquals($error->getMessage(), $log['data']);
+		$this->assertEquals($error->getFile(), $log['file']);
+		$this->assertEquals($error->getLine(), $log['line']);
+		$this->assertEquals('error', $log['type']);
+
+		$error = new Exception('Test Exception');
+		$message = 'override message';
+
+		$console = new Console();
+		$console->logError($error, $message);
+		$store = $this->getProtectedStore($console);
+		$log = array_pop($store);
+
+		$this->assertEquals($message, $log['data']);
+	}
+
+	public function testLogSpeed()
+	{
+		$name = 'Test Speed';
+
+		$console = new Console();
+		$console->logSpeed($name);
+		$store = $this->getProtectedStore($console);
+		$log = array_pop($store);
+
+		$this->assertEquals($name, $log['name']);
+		$this->assertEquals('speed', $log['type']);
+	}
+
+	public function testGetLogs()
+	{
+		$store = array(
+			array(
+				'data' => 'a string',
+				'type' => 'log'
+			),
+			array(
+				'name' => '',
+				'data' => 123,
+				'data_type' => 'array',
+				'type' => 'memory'
+			)
+		);
+
+		$console = new Console();
+
+		$reflectedConsole = new ReflectionClass(get_class($console));
+		$reflectedProperty = $reflectedConsole->getProperty('store');
+		$reflectedProperty->setAccessible(true);
+		$reflectedProperty->setValue($console, $store);
+
+		$this->assertSame($store, $console->getLogs());
+	}
+
+	protected function getProtectedStore(Console $console)
+	{
+		$reflectedConsole = new ReflectionClass(get_class($console));
+		$reflectedProperty = $reflectedConsole->getProperty('store');
+		$reflectedProperty->setAccessible(true);
+		return $reflectedProperty->getValue($console);
+	}
 }

src/PhpQuickProfiler.php

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;

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     protected $startTime;
 
     /**
-     * @param Particletree\Pqp\Console $console
+     * @param Console $console
      * @param integer                  $startTime
      */
     public function __construct(Console $console, $startTime = null)

Indentation +154 added lines, -154 removed lines

@@ -15,78 +15,78 @@ 
 class PhpQuickProfiler
 {
 
-    /** @var  Particletree\Pqp\Console */
-    protected $console;
+	/** @var  Particletree\Pqp\Console */
+	protected $console;
 
-    /** @var  integer */
-    protected $startTime;
+	/** @var  integer */
+	protected $startTime;
 
-    /**
-     * @param Particletree\Pqp\Console $console
-     * @param integer                  $startTime
-     */
-    public function __construct(Console $console, $startTime = null)
-    {
-        $this->console = $console;
+	/**
+	 * @param Particletree\Pqp\Console $console
+	 * @param integer                  $startTime
+	 */
+	public function __construct(Console $console, $startTime = null)
+	{
+		$this->console = $console;
 
-        if (is_null($startTime)) {
-            $startTime = microtime(true);
-        }
-        $this->startTime = $startTime;
-    }
+		if (is_null($startTime)) {
+			$startTime = microtime(true);
+		}
+		$this->startTime = $startTime;
+	}
  
-    /**
-     * Formats the logs from the console
-     *
-     * @return array
-     */
-    protected 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);
+	/**
+	 * Formats the logs from the console
+	 *
+	 * @return array
+	 */
+	protected 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);
   }
   
   /*-------------------------------------------
@@ -94,28 +94,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 $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 $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;
   }
   
   /*-------------------------------------------
@@ -123,10 +123,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;
   }
   
   /*--------------------------------------------------------
@@ -134,24 +134,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 $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 $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;
   }
   
   /*--------------------------------------------------------
@@ -159,16 +159,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;
   }
   
   /*-------------------------------------------
@@ -176,10 +176,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;
   }
   
   /*-------------------------------------------
@@ -187,35 +187,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;
   }
   
   /*---------------------------------------------------------
@@ -223,14 +223,14 @@ 
   -----------------------------------------------------------*/
   
   public function display($db = '', $master_db = '') {
-    $this->db = $db;
-    $this->master_db = $master_db;
-    $this->gatherConsoleData();
-    $this->gatherFileData();
-    $this->gatherMemoryData();
-    $this->gatherQueryData();
-    $this->gatherSpeedData();
-    $display = new displayPqp();
-    $display($this->output);
+	$this->db = $db;
+	$this->master_db = $master_db;
+	$this->gatherConsoleData();
+	$this->gatherFileData();
+	$this->gatherMemoryData();
+	$this->gatherQueryData();
+	$this->gatherSpeedData();
+	$display = new displayPqp();
+	$display($this->output);
   }
 }

Spacing +14 added lines, -14 removed lines

@@ -51,15 +51,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'],
@@ -68,7 +68,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),
@@ -102,14 +102,14 @@ 
       "largest" => 0,
     );
 
-    foreach($files as $file) {
+    foreach ($files as $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']);
@@ -139,9 +139,9 @@ 
     $queryTotals['time'] = 0;
     $queries = array();
     
-    if($this->db != '') {
+    if ($this->db != '') {
       $queryTotals['count'] += $this->db->queryCount;
-      foreach($this->db->queries as $query) {
+      foreach ($this->db->queries as $query) {
         $query = $this->attemptToExplainQuery($query);
         $queryTotals['time'] += $query['time'];
         $query['time'] = $this->getReadableTime($query['time']);
@@ -163,8 +163,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;
     }
@@ -177,7 +177,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;
   }
@@ -206,15 +206,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;
   }
   

tests/unit/PhpQuickProfilerTest.php

Indentation +11 added lines, -11 removed lines

@@ -6,18 +6,18 @@
 class PhpQuickProfilerTest extends PHPUnit_Framework_TestCase
 {
 
-    public function __construct()
-    {
-    }
+	public function __construct()
+	{
+	}
 
-    public function testConstruct()
-    {
-        $console = new Console();
-        $startTime = microtime(true);
+	public function testConstruct()
+	{
+		$console = new Console();
+		$startTime = microtime(true);
 
-        $profiler = new PhpQuickProfiler($console, $startTime);
+		$profiler = new PhpQuickProfiler($console, $startTime);
 
-        $this->assertAttributeSame($console, 'console', $profiler);
-        $this->assertAttributeEquals($startTime, 'startTime', $profiler);
-    }
+		$this->assertAttributeSame($console, 'console', $profiler);
+		$this->assertAttributeEquals($startTime, 'startTime', $profiler);
+	}
 }

src/displayPqp.php

Indentation +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
 class displayPqp
 {
 
-    public function __invoke($output)
-    {
+	public function __invoke($output)
+	{
 	
 $css = file_get_contents(__DIR__ . '/../css/pQp.css');
 		

Spacing +24 added lines, -24 removed lines

@@ -23,7 +23,7 @@ 
     public function __invoke($output)
     {
 	
-$css = file_get_contents(__DIR__ . '/../css/pQp.css');
+$css = file_get_contents(__DIR__.'/../css/pQp.css');
 		
 echo <<<JAVASCRIPT
 <!-- JavaScript -->
@@ -167,7 +167,7 @@ 
 
 echo '<div id="pqp-console" class="pqp-box">';
 
-if($logCount ==  0) {
+if ($logCount == 0) {
 	echo '<h3>This panel has no log items.</h3>';
 }
 else {
@@ -185,25 +185,25 @@ 
 		<table class="main" cellspacing="0">';
 		
 		$class = '';
-		foreach($output['logs']['console']['messages'] as $log) {
+		foreach ($output['logs']['console']['messages'] as $log) {
 			echo '<tr class="log-'.$log['type'].'">
 				<td class="type">'.$log['type'].'</td>
 				<td class="'.$class.'">';
-			if($log['type'] == 'log') {
+			if ($log['type'] == 'log') {
 				echo '<div><pre>'.$log['data'].'</pre></div>';
 			}
-			elseif($log['type'] == 'memory') {
+			elseif ($log['type'] == 'memory') {
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['data_type'].'</em>: '.$log['name'].' </div>';
 			}
-			elseif($log['type'] == 'speed') {
+			elseif ($log['type'] == 'speed') {
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
 			}
-			elseif($log['type'] == 'error') {
+			elseif ($log['type'] == 'error') {
 				echo '<div><em>Line '.$log['line'].'</em> : '.$log['data'].' <pre>'.$log['file'].'</pre></div>';
 			}
 		
 			echo '</td></tr>';
-			if($class == '') $class = 'alt';
+			if ($class == '') $class = 'alt';
 			else $class = '';
 		}
 			
@@ -214,7 +214,7 @@ 
 
 echo '<div id="pqp-speed" class="pqp-box">';
 
-if($output['logs']['speedCount'] ==  0) {
+if ($output['logs']['speedCount'] == 0) {
 	echo '<h3>This panel has no log items.</h3>';
 }
 else {
@@ -225,13 +225,13 @@ 
 		<table class="main" cellspacing="0">';
 		
 		$class = '';
-		foreach($output['logs']['console'] as $log) {
-			if($log['type'] == 'speed') {
+		foreach ($output['logs']['console'] as $log) {
+			if ($log['type'] == 'speed') {
 				echo '<tr class="log-'.$log['type'].'">
 				<td class="'.$class.'">';
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
 				echo '</td></tr>';
-				if($class == '') $class = 'alt';
+				if ($class == '') $class = 'alt';
 				else $class = '';
 			}
 		}
@@ -243,7 +243,7 @@ 
 
 echo '<div id="pqp-queries" class="pqp-box">';
 
-if($output['queryTotals']['count'] ==  0) {
+if ($output['queryTotals']['count'] == 0) {
 	echo '<h3>This panel has no log items.</h3>';
 }
 else {
@@ -255,10 +255,10 @@ 
 		<table class="main" cellspacing="0">';
 		
 		$class = '';
-		foreach($output['queries'] as $query) {
+		foreach ($output['queries'] as $query) {
 			echo '<tr>
 				<td class="'.$class.'">'.$query['sql'];
-			if($query['explain']) {
+			if ($query['explain']) {
 					echo '<em>
 						Possible keys: <b>'.$query['explain']['possible_keys'].'</b> &middot; 
 						Key Used: <b>'.$query['explain']['key'].'</b> &middot; 
@@ -268,7 +268,7 @@ 
 					</em>';
 			}
 			echo '</td></tr>';
-			if($class == '') $class = 'alt';
+			if ($class == '') $class = 'alt';
 			else $class = '';
 		}
 			
@@ -279,7 +279,7 @@ 
 
 echo '<div id="pqp-memory" class="pqp-box">';
 
-if($output['logs']['memoryCount'] ==  0) {
+if ($output['logs']['memoryCount'] == 0) {
 	echo '<h3>This panel has no log items.</h3>';
 }
 else {
@@ -290,12 +290,12 @@ 
 		<table class="main" cellspacing="0">';
 		
 		$class = '';
-		foreach($output['logs']['console'] as $log) {
-			if($log['type'] == 'memory') {
+		foreach ($output['logs']['console'] as $log) {
+			if ($log['type'] == 'memory') {
 				echo '<tr class="log-'.$log['type'].'">';
 				echo '<td class="'.$class.'"><b>'.$log['data'].'</b> <em>'.$log['dataType'].'</em>: '.$log['name'].'</td>';
 				echo '</tr>';
-				if($class == '') $class = 'alt';
+				if ($class == '') $class = 'alt';
 				else $class = '';
 			}
 		}
@@ -307,7 +307,7 @@ 
 
 echo '<div id="pqp-files" class="pqp-box">';
 
-if($output['fileTotals']['count'] ==  0) {
+if ($output['fileTotals']['count'] == 0) {
 	echo '<h3>This panel has no log items.</h3>';
 }
 else {
@@ -318,10 +318,10 @@ 
 		 </table>
 		<table class="main" cellspacing="0">';
 		
-		$class ='';
-		foreach($output['files'] as $file) {
+		$class = '';
+		foreach ($output['files'] as $file) {
 			echo '<tr><td class="'.$class.'"><b>'.$file['size'].'</b> '.$file['name'].'</td></tr>';
-			if($class == '') $class = 'alt';
+			if ($class == '') $class = 'alt';
 			else $class = '';
 		}
 			

Braces +33 added lines, -26 removed lines

@@ -167,8 +167,7 @@ 
 
 if($logCount ==  0) {
 	echo '<h3>This panel has no log items.</h3>';
-}
-else {
+} else {
 	echo '<table class="side" cellspacing="0">
 		<tr>
 			<td class="alt1"><var>'.$output['logs']['logCount'].'</var><h4>Logs</h4></td>
@@ -188,20 +187,20 @@ 
 				<td class="'.$class.'">';
 			if($log['type'] == 'log') {
 				echo '<div><pre>'.$log['data'].'</pre></div>';
-			}
-			elseif($log['type'] == 'memory') {
+			} elseif($log['type'] == 'memory') {
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['dataType'].'</em>: '.$log['name'].' </div>';
-			}
-			elseif($log['type'] == 'speed') {
+			} elseif($log['type'] == 'speed') {
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
-			}
-			elseif($log['type'] == 'error') {
+			} elseif($log['type'] == 'error') {
 				echo '<div><em>Line '.$log['line'].'</em> : '.$log['data'].' <pre>'.$log['file'].'</pre></div>';
 			}
 		
 			echo '</td></tr>';
-			if($class == '') $class = 'alt';
-			else $class = '';
+			if($class == '') {
+				$class = 'alt';
+			} else {
+				$class = '';
+			}
 		}
 			
 		echo '</table>';
@@ -213,8 +212,7 @@ 
 
 if($output['logs']['speedCount'] ==  0) {
 	echo '<h3>This panel has no log items.</h3>';
-}
-else {
+} else {
 	echo '<table class="side" cellspacing="0">
 		  <tr><td><var>'.$output['speedTotals']['total'].'</var><h4>Load Time</h4></td></tr>
 		  <tr><td class="alt"><var>'.$output['speedTotals']['allowed'].'</var> <h4>Max Execution Time</h4></td></tr>
@@ -228,8 +226,11 @@ 
 				<td class="'.$class.'">';
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
 				echo '</td></tr>';
-				if($class == '') $class = 'alt';
-				else $class = '';
+				if($class == '') {
+					$class = 'alt';
+				} else {
+					$class = '';
+				}
 			}
 		}
 			
@@ -242,8 +243,7 @@ 
 
 if($output['queryTotals']['count'] ==  0) {
 	echo '<h3>This panel has no log items.</h3>';
-}
-else {
+} else {
 	echo '<table class="side" cellspacing="0">
 		  <tr><td><var>'.$output['queryTotals']['count'].'</var><h4>Total Queries</h4></td></tr>
 		  <tr><td class="alt"><var>'.$output['queryTotals']['time'].'</var> <h4>Total Time</h4></td></tr>
@@ -265,8 +265,11 @@ 
 					</em>';
 			}
 			echo '</td></tr>';
-			if($class == '') $class = 'alt';
-			else $class = '';
+			if($class == '') {
+				$class = 'alt';
+			} else {
+				$class = '';
+			}
 		}
 			
 		echo '</table>';
@@ -278,8 +281,7 @@ 
 
 if($output['logs']['memoryCount'] ==  0) {
 	echo '<h3>This panel has no log items.</h3>';
-}
-else {
+} else {
 	echo '<table class="side" cellspacing="0">
 		  <tr><td><var>'.$output['memoryTotals']['used'].'</var><h4>Used Memory</h4></td></tr>
 		  <tr><td class="alt"><var>'.$output['memoryTotals']['total'].'</var> <h4>Total Available</h4></td></tr>
@@ -292,8 +294,11 @@ 
 				echo '<tr class="log-'.$log['type'].'">';
 				echo '<td class="'.$class.'"><b>'.$log['data'].'</b> <em>'.$log['dataType'].'</em>: '.$log['name'].'</td>';
 				echo '</tr>';
-				if($class == '') $class = 'alt';
-				else $class = '';
+				if($class == '') {
+					$class = 'alt';
+				} else {
+					$class = '';
+				}
 			}
 		}
 			
@@ -306,8 +311,7 @@ 
 
 if($output['fileTotals']['count'] ==  0) {
 	echo '<h3>This panel has no log items.</h3>';
-}
-else {
+} else {
 	echo '<table class="side" cellspacing="0">
 		  	<tr><td><var>'.$output['fileTotals']['count'].'</var><h4>Total Files</h4></td></tr>
 			<tr><td class="alt"><var>'.$output['fileTotals']['size'].'</var> <h4>Total Size</h4></td></tr>
@@ -318,8 +322,11 @@ 
 		$class ='';
 		foreach($output['files'] as $file) {
 			echo '<tr><td class="'.$class.'"><b>'.$file['size'].'</b> '.$file['name'].'</td></tr>';
-			if($class == '') $class = 'alt';
-			else $class = '';
+			if($class == '') {
+				$class = 'alt';
+			} else {
+				$class = '';
+			}
 		}
 			
 		echo '</table>';