jacobemerick / pqp

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/Console.php

Indentation +77 added lines, -77 removed lines

@@ -15,88 +15,88 @@
 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 = 'PHP')
-    {
-        $memory = memory_get_usage();
-        $data_type = '';
-        if (!is_null($object)) {
-            $memory = strlen(serialize($object));
-            $data_type = gettype($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 = 'PHP')
+	{
+		$memory = memory_get_usage();
+		$data_type = '';
+		if (!is_null($object)) {
+			$memory = strlen(serialize($object));
+			$data_type = gettype($object);
+		}
 
-        array_push($this->store, array(
-            'name'      => $name,
-            'data'      => $memory,
-            'data_type' => $data_type,
-            'type'      => 'memory'
-        ));
-    }
+		array_push($this->store, array(
+			'name'      => $name,
+			'data'      => $memory,
+			'data_type' => $data_type,
+			'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;
+	}
 }

src/PhpQuickProfiler.php

Braces +4 added lines, -3 removed lines

@@ -123,7 +123,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']);
@@ -176,8 +178,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;

Indentation +143 added lines, -143 removed lines

@@ -15,96 +15,96 @@ 
 class PhpQuickProfiler
 {
 
-    /** @var  Particletree\Pqp\Console */
-    protected $console;
-
-    /** @var  integer */
-    protected $startTime;
-
-    /**
-     * @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;
-    }
+	/** @var  Particletree\Pqp\Console */
+	protected $console;
+
+	/** @var  integer */
+	protected $startTime;
+
+	/**
+	 * @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;
+	}
  
   /*-------------------------------------------
       AGGREGATE DATA ON THE FILES INCLUDED
   -------------------------------------------*/
   
   public function gatherFileData() {
-    $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;
-    }
+	$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;
+	}
     
-    $fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']);
-    $fileTotals['largest'] = $this->getReadableFileSize($fileTotals['largest']);
+	$fileTotals['size'] = $this->getReadableFileSize($fileTotals['size']);
+	$fileTotals['largest'] = $this->getReadableFileSize($fileTotals['largest']);
 
-    return array(
-      'files' => $fileList,
-      'fileTotals' => $fileTotals
-    );
+	return array(
+	  'files' => $fileList,
+	  'fileTotals' => $fileTotals
+	);
   }
 
-    /**
-     * Get data about memory usage of the application
-     *
-     * @returns array
-     */
-    public function gatherMemoryData()
-    {
-        $usedMemory = memory_get_peak_usage();
-        $allowedMemory = ini_get('memory_limit');
-        return array(
-            'used'    => $usedMemory,
-            'allowed' => $allowedMemory
-        );
-    }
+	/**
+	 * Get data about memory usage of the application
+	 *
+	 * @returns array
+	 */
+	public function gatherMemoryData()
+	{
+		$usedMemory = memory_get_peak_usage();
+		$allowedMemory = ini_get('memory_limit');
+		return array(
+			'used'    => $usedMemory,
+			'allowed' => $allowedMemory
+		);
+	}
   
   /*--------------------------------------------------------
        QUERY DATA -- DATABASE OBJECT WITH LOGGING REQUIRED
   ----------------------------------------------------------*/
   
   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;
   }
   
   /*--------------------------------------------------------
@@ -112,90 +112,90 @@ 
   ----------------------------------------------------------*/
   
   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;
   }
 
-    /**
-     * Get data about speed of the application
-     *
-     * @returns array
-     */
-    public function gatherSpeedData()
-    {
-        $elapsedTime = microtime(true) - $this->startTime;
-        $allowedTime = ini_get('max_execution_time');
-        return array(
-            'elapsed' => $elapsedTime,
-            'allowed' => $allowedTime
-        );
-    }
+	/**
+	 * Get data about speed of the application
+	 *
+	 * @returns array
+	 */
+	public function gatherSpeedData()
+	{
+		$elapsedTime = microtime(true) - $this->startTime;
+		$allowedTime = ini_get('max_execution_time');
+		return array(
+			'elapsed' => $elapsedTime,
+			'allowed' => $allowedTime
+		);
+	}
   
   /*-------------------------------------------
        HELPER FUNCTIONS TO FORMAT DATA
   -------------------------------------------*/
   
   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);
   }
 
-    /**
-     * Static formatter for human-readable time
-     * Only handles time up to 60 minutes gracefully
-     *
-     * @param integer $time time in seconds
-     * @return string
-     */
-    public static function getReadableTime($time)
-    {
-        $unit = 's';
-
-        if ($time < 1) {
-            $time *= 1000;
-            $unit = 'ms';
-        } else if ($time > 60) {
-            $time /= 60;
-            $unit = 'm';
-        }
-
-        $time = number_format($time, 3);
-        return "{$time} {$unit}";
-    }
+	/**
+	 * Static formatter for human-readable time
+	 * Only handles time up to 60 minutes gracefully
+	 *
+	 * @param integer $time time in seconds
+	 * @return string
+	 */
+	public static function getReadableTime($time)
+	{
+		$unit = 's';
+
+		if ($time < 1) {
+			$time *= 1000;
+			$unit = 'ms';
+		} else if ($time > 60) {
+			$time /= 60;
+			$unit = 'm';
+		}
+
+		$time = number_format($time, 3);
+		return "{$time} {$unit}";
+	}
   
 
-    /**
-     * Triggers end display of the profiling data
-     *
-     * @param Display $display
-     */
-    public function display(Display $display)
-    {
-        $display->setConsole($this->console);
-        $display->setFileData($this->gatherFileData());
-        $display->setMemoryData($this->gatherMemoryData());
-        $display->setQueryData($this->gatherQueryData());
-        $display->setSpeedData($this->gatherSpeedData());
-
-        $display();
-    }
+	/**
+	 * Triggers end display of the profiling data
+	 *
+	 * @param Display $display
+	 */
+	public function display(Display $display)
+	{
+		$display->setConsole($this->console);
+		$display->setFileData($this->gatherFileData());
+		$display->setMemoryData($this->gatherMemoryData());
+		$display->setQueryData($this->gatherQueryData());
+		$display->setSpeedData($this->gatherSpeedData());
+
+		$display();
+	}
 }

tests/unit/PhpQuickProfilerTest.php

Indentation +27 added lines, -27 removed lines

@@ -6,31 +6,31 @@
 class PhpQuickProfilerTest extends PHPUnit_Framework_TestCase
 {
 
-    public function __construct()
-    {
-    }
-
-    public function testConstruct()
-    {
-        $console = new Console();
-        $startTime = microtime(true);
-
-        $profiler = new PhpQuickProfiler($console, $startTime);
-
-        $this->assertAttributeSame($console, 'console', $profiler);
-        $this->assertAttributeEquals($startTime, 'startTime', $profiler);
-    }
-
-    public function testGetReadableTime()
-    {
-        $test_input = array(
-            '.032432' => '32.432 ms',
-            '24.3781' => '24.378 s',
-            '145.123' => '2.419 m'
-        );
-
-        foreach ($test_input as $input => $expected_return) {
-            $this->assertEquals($expected_return, PhpQuickProfiler::getReadableTime($input));
-        }
-    }
+	public function __construct()
+	{
+	}
+
+	public function testConstruct()
+	{
+		$console = new Console();
+		$startTime = microtime(true);
+
+		$profiler = new PhpQuickProfiler($console, $startTime);
+
+		$this->assertAttributeSame($console, 'console', $profiler);
+		$this->assertAttributeEquals($startTime, 'startTime', $profiler);
+	}
+
+	public function testGetReadableTime()
+	{
+		$test_input = array(
+			'.032432' => '32.432 ms',
+			'24.3781' => '24.378 s',
+			'145.123' => '2.419 m'
+		);
+
+		foreach ($test_input as $input => $expected_return) {
+			$this->assertEquals($expected_return, PhpQuickProfiler::getReadableTime($input));
+		}
+	}
 }

asset/display.tpl.php

Indentation +8 added lines, -8 removed lines

@@ -157,10 +157,10 @@ 
 			}
 			elseif($log['type'] == 'memory') {
 				echo '<div><pre>'.$log['data'].'</pre>';
-          if (!empty($log['data_type'])) {
-            echo '<em>'.$log['data_type'].'</em>: ';
-          }
-        echo $log['name'].' </div>';
+		  if (!empty($log['data_type'])) {
+			echo '<em>'.$log['data_type'].'</em>: ';
+		  }
+		echo $log['name'].' </div>';
 			}
 			elseif($log['type'] == 'speed') {
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
@@ -261,10 +261,10 @@ 
 			if($log['type'] == 'memory') {
 				echo '<tr class="log-'.$log['type'].'">';
 				echo '<td class="'.$class.'"><b>'.$log['data'].'</b>';
-          if ($log['data_type']) {
-            echo '<em>'.$log['data_type'].'</em>: ';
-          }
-        echo $log['name'].'</td>';
+		  if ($log['data_type']) {
+			echo '<em>'.$log['data_type'].'</em>: ';
+		  }
+		echo $log['name'].'</td>';
 				echo '</tr>';
 				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>';

tests/unit/DisplayTest.php

Indentation +22 added lines, -22 removed lines

@@ -5,29 +5,29 @@
 class DisplayTest extends PHPUnit_Framework_TestCase
 {
 
-    public function testGetReadableTime()
-    {
-        $test_input = array(
-            '.032432' => '32.432 ms',
-            '24.3781' => '24.378 s',
-            '145.123' => '2.419 m'
-        );
+	public function testGetReadableTime()
+	{
+		$test_input = array(
+			'.032432' => '32.432 ms',
+			'24.3781' => '24.378 s',
+			'145.123' => '2.419 m'
+		);
 
-        foreach ($test_input as $input => $expected_return) {
-            $this->assertEquals($expected_return, Display::getReadableTime($input));
-        }
-    }
+		foreach ($test_input as $input => $expected_return) {
+			$this->assertEquals($expected_return, Display::getReadableTime($input));
+		}
+	}
 
-    public function testGetReadableMemory()
-    {
-        $test_input = array(
-            '314'     => '314 b',
-            '7403'    => '7.23 k',
-            '2589983' => '2.47 M'
-        );
+	public function testGetReadableMemory()
+	{
+		$test_input = array(
+			'314'     => '314 b',
+			'7403'    => '7.23 k',
+			'2589983' => '2.47 M'
+		);
 
-        foreach ($test_input as $input => $expected_return) {
-            $this->assertEquals($expected_return, Display::getReadableMemory($input));
-        }
-    }
+		foreach ($test_input as $input => $expected_return) {
+			$this->assertEquals($expected_return, Display::getReadableMemory($input));
+		}
+	}
 }

src/Display.php

Indentation +139 added lines, -139 removed lines

@@ -14,154 +14,154 @@
 class Display
 {
 
-    /** @var  array */
-    protected $output;
+	/** @var  array */
+	protected $output;
 
-    public function __construct()
-    {
-    }
+	public function __construct()
+	{
+	}
 
-    public function setConsole(Console $console)
-    {
-        $console_data = array(
-            'messages' => array(),
-            'count'    => array(
-                'log'    => 0,
-                'memory' => 0,
-                'error'  => 0,
-                'speed'  => 0
-            )
-        );
-        foreach ($console->getLogs() as $log) {
-            switch($log['type']) {
-                case 'log':
-                    $message = array(
-                        'data' => print_r($log['data'], true),
-                        'type' => 'log'
-                    );
-                    $console_data['count']['log']++;
-                    break;
-                case 'memory':
-                    $message = array(
-                        'name' => $log['name'],
-                        'data' => self::getReadableMemory($log['data']),
-                        'type' => 'memory'
-                    );
-                    if (!empty($log['data_type'])) {
-                        $message['data_type'] = $log['data_type'];
-                    }
-                    $console_data['count']['memory']++;
-                    break;
-                case 'error':
-                    $message = array(
-                        'data' => $log['data'],
-                        'file' => $log['file'],
-                        'line' => $log['line'],
-                        'type' => 'error'
-                    );
-                    $console_data['count']['error']++;
-                    break;
-                case 'speed':
-                    $elapsedTime = $log['data'] - $this->startTime;
-                    $message = array(
-                        'name' => $log['name'],
-                        'data' => self::getReadableTime($elapsedTime),
-                        'type' => 'speed'
-                    );
-                    $console_data['count']['speed']++;
-                    break;
-                default:
-                    $message = array(
-                        'data' => "Unrecognized console log type: {$log['type']}",
-                        'type' => 'error'
-                    );
-                    $console_data['count']['error']++;
-                    break;
-            }
-            array_push($console_data['messages'], $message);
-        }
-        $this->output['console'] = $console_data;
-    }
+	public function setConsole(Console $console)
+	{
+		$console_data = array(
+			'messages' => array(),
+			'count'    => array(
+				'log'    => 0,
+				'memory' => 0,
+				'error'  => 0,
+				'speed'  => 0
+			)
+		);
+		foreach ($console->getLogs() as $log) {
+			switch($log['type']) {
+				case 'log':
+					$message = array(
+						'data' => print_r($log['data'], true),
+						'type' => 'log'
+					);
+					$console_data['count']['log']++;
+					break;
+				case 'memory':
+					$message = array(
+						'name' => $log['name'],
+						'data' => self::getReadableMemory($log['data']),
+						'type' => 'memory'
+					);
+					if (!empty($log['data_type'])) {
+						$message['data_type'] = $log['data_type'];
+					}
+					$console_data['count']['memory']++;
+					break;
+				case 'error':
+					$message = array(
+						'data' => $log['data'],
+						'file' => $log['file'],
+						'line' => $log['line'],
+						'type' => 'error'
+					);
+					$console_data['count']['error']++;
+					break;
+				case 'speed':
+					$elapsedTime = $log['data'] - $this->startTime;
+					$message = array(
+						'name' => $log['name'],
+						'data' => self::getReadableTime($elapsedTime),
+						'type' => 'speed'
+					);
+					$console_data['count']['speed']++;
+					break;
+				default:
+					$message = array(
+						'data' => "Unrecognized console log type: {$log['type']}",
+						'type' => 'error'
+					);
+					$console_data['count']['error']++;
+					break;
+			}
+			array_push($console_data['messages'], $message);
+		}
+		$this->output['console'] = $console_data;
+	}
 
-    public function setFileData(array $file_data)
-    {
-        $this->output['files'] = $file_data['files'];
-        $this->output['fileTotals'] = $file_data['fileTotals'];
-    }
+	public function setFileData(array $file_data)
+	{
+		$this->output['files'] = $file_data['files'];
+		$this->output['fileTotals'] = $file_data['fileTotals'];
+	}
 
-    /**
-     * Sets memory data
-     *
-     * @param array $data
-     */
-    public function setMemoryData(array $data)
-    {
-        $this->output['memory'] = array(
-            'used'    => self::getReadableMemory($data['used']),
-            'allowed' => $data['allowed']
-        );
-    }
+	/**
+	 * Sets memory data
+	 *
+	 * @param array $data
+	 */
+	public function setMemoryData(array $data)
+	{
+		$this->output['memory'] = array(
+			'used'    => self::getReadableMemory($data['used']),
+			'allowed' => $data['allowed']
+		);
+	}
 
-    public function setQueryData(array $query_data)
-    {
-        // the void
-    }
+	public function setQueryData(array $query_data)
+	{
+		// the void
+	}
 
-    /**
-     * Sets speed data
-     *
-     * @param array $data
-     */
-    public function setSpeedData(array $data)
-    {
-        $this->output['speed'] = array(
-            'elapsed' => self::getReadableTime($data['elapsed']),
-            'allowed' => self::getReadableTime($data['allowed'], 0)
-        );
-    }
+	/**
+	 * Sets speed data
+	 *
+	 * @param array $data
+	 */
+	public function setSpeedData(array $data)
+	{
+		$this->output['speed'] = array(
+			'elapsed' => self::getReadableTime($data['elapsed']),
+			'allowed' => self::getReadableTime($data['allowed'], 0)
+		);
+	}
 
-    /**
-     * Static formatter for human-readable time
-     * Only handles time up to 60 minutes gracefully
-     *
-     * @param double  $time
-     * @param integer $decimals
-     * @return string
-     */
-    public static function getReadableTime($time, $decimals = 3)
-    {
-        $unit = 's';
-        if ($time < 1) {
-            $time *= 1000;
-            $unit = 'ms';
-        } else if ($time > 60) {
-            $time /= 60;
-            $unit = 'm';
-        }
-        $time = number_format($time, $decimals);
-        return "{$time} {$unit}";
-    }
+	/**
+	 * Static formatter for human-readable time
+	 * Only handles time up to 60 minutes gracefully
+	 *
+	 * @param double  $time
+	 * @param integer $decimals
+	 * @return string
+	 */
+	public static function getReadableTime($time, $decimals = 3)
+	{
+		$unit = 's';
+		if ($time < 1) {
+			$time *= 1000;
+			$unit = 'ms';
+		} else if ($time > 60) {
+			$time /= 60;
+			$unit = 'm';
+		}
+		$time = number_format($time, $decimals);
+		return "{$time} {$unit}";
+	}
 
-    /**
-     * Static formatter for human-readable memory
-     *
-     * @param double  $size
-     * @param integer $decimals
-     */
-    public static function getReadableMemory($size, $decimals = 2)
-    {
-        $unitOptions = array('b', 'k', 'M', 'G');
+	/**
+	 * Static formatter for human-readable memory
+	 *
+	 * @param double  $size
+	 * @param integer $decimals
+	 */
+	public static function getReadableMemory($size, $decimals = 2)
+	{
+		$unitOptions = array('b', 'k', 'M', 'G');
 
-        $base = log($size, 1024);
+		$base = log($size, 1024);
 
-        $memory = round(pow(1024, $base - floor($base)), $decimals);
-        $unit = $unitOptions[floor($base)];
-        return "{$memory} {$unit}";
-    }
+		$memory = round(pow(1024, $base - floor($base)), $decimals);
+		$unit = $unitOptions[floor($base)];
+		return "{$memory} {$unit}";
+	}
  
-    public function __invoke()
-    {
-        $output = $this->output;
-        require_once __DIR__ .'/../asset/display.tpl.php';
-    }
+	public function __invoke()
+	{
+		$output = $this->output;
+		require_once __DIR__ .'/../asset/display.tpl.php';
+	}
 }