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);
 		}
 	}

display.php

Spacing +24 added lines, -24 removed lines

@@ -17,7 +17,7 @@ 
 
 function displayPqp($output, $config) {
 	
-$css = file_get_contents(__DIR__ . '/css/pQp.css');
+$css = file_get_contents(__DIR__.'/css/pQp.css');
 		
 echo <<<JAVASCRIPT
 <!-- JavaScript -->
@@ -161,7 +161,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 {
@@ -179,25 +179,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 = '';
 		}
 			
@@ -208,7 +208,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 {
@@ -219,13 +219,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 = '';
 			}
 		}
@@ -237,7 +237,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 {
@@ -249,10 +249,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; 
@@ -262,7 +262,7 @@ 
 					</em>';
 			}
 			echo '</td></tr>';
-			if($class == '') $class = 'alt';
+			if ($class == '') $class = 'alt';
 			else $class = '';
 		}
 			
@@ -273,7 +273,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 {
@@ -284,12 +284,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 = '';
 			}
 		}
@@ -301,7 +301,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 {
@@ -312,10 +312,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 = '';
 		}
 			

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

Indentation +45 added lines, -45 removed lines

@@ -24,11 +24,11 @@ 
   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;
 	}
@@ -38,49 +38,49 @@ 
 	-------------------------------------------*/
 	
 	public function gatherConsoleData() {
-    $console = array(
-      'messages' => array(),
-      'totals' => array(
-        'log' => 0,
-        'memory' => 0,
-        'error' => 0,
-        'speed' => 0
-      ));
+	$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']++;
+			'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']++;
+			'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']++;
+		  $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);
+		  $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);
 	}
@@ -183,19 +183,19 @@ 
 	-------------------------------------------*/
 	
 	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);
 
 		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);
+		   	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) {

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);
 	}