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

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

Indentation +132 added lines, -132 removed lines

@@ -15,136 +15,136 @@
 class PhpQuickProfiler
 {
 
-    /** @var  Console */
-    protected $console;
-
-    /** @var  integer */
-    protected $startTime;
-
-    /** @var  object */
-    protected $pdo;
-
-    /**
-     * @param Console $console
-     * @param object  $pdo
-     * @param integer $startTime
-     */
-    public function __construct(Console $console, $pdo = null, $startTime = null)
-    {
-        $this->console = $console;
-        $this->pdo = $pdo;
-
-        if (is_null($startTime)) {
-            $startTime = microtime(true);
-        }
-        $this->startTime = $startTime;
-    }
-
-    /**
-     * Get data about files loaded for the application to current point
-     *
-     * @returns array
-     */
-    public function gatherFileData()
-    {
-        $files = get_included_files();
-        $data = array();
-        foreach ($files as $file) {
-            array_push($data, array(
-                'name' => $file,
-                'size' => filesize($file)
-            ));
-        }
-        return $data;
-    }
-
-    /**
-     * 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 sql usage of the application
-     *
-     * @param array $profiledQueries
-     * @returns array
-     */
-    public function gatherQueryData(array $profiledQueries)
-    {
-        $data = array();
-        foreach ($profiledQueries as $query) {
-            if ($query['function'] !== 'perform') {
-                continue;
-            }
-
-            array_push($data, array(
-                'sql'     => $query['statement'],
-                'explain' => $this->explainQuery($query['statement'], $query['bind_values']),
-                'time'    => $query['duration']
-            ));
-        }
-        return $data;
-    }
-
-    /**
-     * Attempts to explain a query
-     *
-     * @param string $query
-     * @param array  $parameters
-     * @return array
-     */
-    protected function explainQuery($query, $parameters)
-    {
-        $query = "EXPLAIN {$query}";
-        try {
-            $statement = $this->pdo->prepare($query);
-            $statement->execute($parameters);
-            return $statement->fetch(\PDO::FETCH_ASSOC);
-        } catch (\Exception $e) {
-            echo $e->getMessage();
-        }
-        return '';
-    }
-
-    /**
-     * 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
-        );
-    }
-
-    /**
-     * Triggers end display of the profiling data
-     *
-     * @param Display $display
-     * @param array   $profiledQueries
-     */
-    public function display(Display $display, array $profiledQueries = array())
-    {
-        $display->setConsole($this->console);
-        $display->setFileData($this->gatherFileData());
-        $display->setMemoryData($this->gatherMemoryData());
-        $display->setQueryData($this->gatherQueryData($profiledQueries));
-        $display->setSpeedData($this->gatherSpeedData());
-
-        $display();
-    }
+	/** @var  Console */
+	protected $console;
+
+	/** @var  integer */
+	protected $startTime;
+
+	/** @var  object */
+	protected $pdo;
+
+	/**
+	 * @param Console $console
+	 * @param object  $pdo
+	 * @param integer $startTime
+	 */
+	public function __construct(Console $console, $pdo = null, $startTime = null)
+	{
+		$this->console = $console;
+		$this->pdo = $pdo;
+
+		if (is_null($startTime)) {
+			$startTime = microtime(true);
+		}
+		$this->startTime = $startTime;
+	}
+
+	/**
+	 * Get data about files loaded for the application to current point
+	 *
+	 * @returns array
+	 */
+	public function gatherFileData()
+	{
+		$files = get_included_files();
+		$data = array();
+		foreach ($files as $file) {
+			array_push($data, array(
+				'name' => $file,
+				'size' => filesize($file)
+			));
+		}
+		return $data;
+	}
+
+	/**
+	 * 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 sql usage of the application
+	 *
+	 * @param array $profiledQueries
+	 * @returns array
+	 */
+	public function gatherQueryData(array $profiledQueries)
+	{
+		$data = array();
+		foreach ($profiledQueries as $query) {
+			if ($query['function'] !== 'perform') {
+				continue;
+			}
+
+			array_push($data, array(
+				'sql'     => $query['statement'],
+				'explain' => $this->explainQuery($query['statement'], $query['bind_values']),
+				'time'    => $query['duration']
+			));
+		}
+		return $data;
+	}
+
+	/**
+	 * Attempts to explain a query
+	 *
+	 * @param string $query
+	 * @param array  $parameters
+	 * @return array
+	 */
+	protected function explainQuery($query, $parameters)
+	{
+		$query = "EXPLAIN {$query}";
+		try {
+			$statement = $this->pdo->prepare($query);
+			$statement->execute($parameters);
+			return $statement->fetch(\PDO::FETCH_ASSOC);
+		} catch (\Exception $e) {
+			echo $e->getMessage();
+		}
+		return '';
+	}
+
+	/**
+	 * 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
+		);
+	}
+
+	/**
+	 * Triggers end display of the profiling data
+	 *
+	 * @param Display $display
+	 * @param array   $profiledQueries
+	 */
+	public function display(Display $display, array $profiledQueries = array())
+	{
+		$display->setConsole($this->console);
+		$display->setFileData($this->gatherFileData());
+		$display->setMemoryData($this->gatherMemoryData());
+		$display->setQueryData($this->gatherQueryData($profiledQueries));
+		$display->setSpeedData($this->gatherSpeedData());
+
+		$display();
+	}
 }

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, null, $startTime);
+		$profiler = new PhpQuickProfiler($console, null, $startTime);
 
-        $this->assertAttributeSame($console, 'console', $profiler);
-        $this->assertAttributeEquals($startTime, 'startTime', $profiler);
-    }
+		$this->assertAttributeSame($console, 'console', $profiler);
+		$this->assertAttributeEquals($startTime, 'startTime', $profiler);
+	}
 }

asset/display.tpl.php

Braces +5 added lines, -2 removed lines

@@ -28,7 +28,8 @@ 
     <div id="pqp-console" class="pqp-box">
     <?php if (count($output['console']) == 0): ?>
       <h3>This panel has no log items.</h3>
-    <?php else: ?>
+    <?php else {
+	: ?>
       <table class="side" cellspacing="0">
         <tr>
           <td class="alt1">
@@ -64,7 +65,9 @@ 
               <pre><?php echo $log['data'] ?></pre>
               <?php if (!empty($log['data_type'])): ?>
               <em><?php echo $log['data_type'] ?></em>
-              <?php endif; ?>
+              <?php endif;
+}
+?>
               <?php echo $log['name'] ?>
             </div>
           <?php elseif ($log['type'] == 'speed'): ?>

src/Display.php

Indentation +217 added lines, -217 removed lines

@@ -14,222 +14,222 @@
 class Display
 {
 
-    /** @var  array */
-    protected $defaults = array(
-        'script_path' => 'asset/script.js',
-        'style_path'  => 'asset/style.css'
-    );
-
-    /** @var  array */
-    protected $options;
-
-    /** @var  array */
-    protected $output;
-
-    /**
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $options = array_intersect_key($options, $this->defaults);
-        $this->options = array_replace($this->defaults, $options);
-    }
-
-    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;
-    }
-
-    /**
-     * Sets file data
-     *
-     * @param array $data
-     */
-    public function setFileData(array $data)
-    {
-        $fileData = array(
-            'fileList'   => array(),
-            'fileTotals' => array(
-                'count'   => count($data),
-                'size'    => 0,
-                'largest' => 0
-            )
-        );
-
-        foreach ($data as $file) {
-            array_push($fileData['fileList'], array(
-                'name' => $file['name'],
-                'size' => self::getReadableMemory($file['size'])
-            ));
-
-            $fileData['fileTotals']['size'] += $file['size'];
-            if ($file['size'] > $fileData['fileTotals']['largest']) {
-                $fileData['fileTotals']['largest'] = $file['size'];
-            }
-        }
-
-        $fileData['fileTotals']['size'] = self::getReadableMemory($fileData['fileTotals']['size']);
-        $fileData['fileTotals']['largest'] = self::getReadableMemory($fileData['fileTotals']['largest']);
-
-        $this->output['files'] = $fileData['fileList'];
-        $this->output['fileTotals'] = $fileData['fileTotals'];
-    }
-
-    /**
-     * 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 $data)
-    {
-        $queryData = array(
-            'queries'     => array(),
-            'queryTotals' => array(
-                'count'   => count($data),
-                'time'    => 0,
-            )
-        );
-
-        foreach ($data as $query) {
-            array_push($queryData['queries'], array(
-                'sql'     => $query['sql'],
-                'explain' => $query['explain'],
-                'time'    => self::getReadableTime($query['time'])
-            ));
-
-            $queryData['queryTotals']['time'] += $query['time'];
-        }
-
-        $queryData['queryTotals']['time'] = self::getReadableTime($queryData['queryTotals']['time']);
-
-        $this->output['queries'] = $queryData['queries'];
-        $this->output['queryTotals'] = $queryData['queryTotals'];
-    }
-
-    /**
-     * 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 memory
-     *
-     * @param double  $size
-     * @param integer $decimals
-     */
-    public static function getReadableMemory($size, $decimals = 2)
-    {
-        $unitOptions = array('b', 'k', 'M', 'G');
-
-        $base = log($size, 1024);
-
-        $memory = round(pow(1024, $base - floor($base)), $decimals);
-        $unit = $unitOptions[floor($base)];
-        return "{$memory} {$unit}";
-    }
+	/** @var  array */
+	protected $defaults = array(
+		'script_path' => 'asset/script.js',
+		'style_path'  => 'asset/style.css'
+	);
+
+	/** @var  array */
+	protected $options;
+
+	/** @var  array */
+	protected $output;
+
+	/**
+	 * @param array $options
+	 */
+	public function __construct(array $options = array())
+	{
+		$options = array_intersect_key($options, $this->defaults);
+		$this->options = array_replace($this->defaults, $options);
+	}
+
+	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;
+	}
+
+	/**
+	 * Sets file data
+	 *
+	 * @param array $data
+	 */
+	public function setFileData(array $data)
+	{
+		$fileData = array(
+			'fileList'   => array(),
+			'fileTotals' => array(
+				'count'   => count($data),
+				'size'    => 0,
+				'largest' => 0
+			)
+		);
+
+		foreach ($data as $file) {
+			array_push($fileData['fileList'], array(
+				'name' => $file['name'],
+				'size' => self::getReadableMemory($file['size'])
+			));
+
+			$fileData['fileTotals']['size'] += $file['size'];
+			if ($file['size'] > $fileData['fileTotals']['largest']) {
+				$fileData['fileTotals']['largest'] = $file['size'];
+			}
+		}
+
+		$fileData['fileTotals']['size'] = self::getReadableMemory($fileData['fileTotals']['size']);
+		$fileData['fileTotals']['largest'] = self::getReadableMemory($fileData['fileTotals']['largest']);
+
+		$this->output['files'] = $fileData['fileList'];
+		$this->output['fileTotals'] = $fileData['fileTotals'];
+	}
+
+	/**
+	 * 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 $data)
+	{
+		$queryData = array(
+			'queries'     => array(),
+			'queryTotals' => array(
+				'count'   => count($data),
+				'time'    => 0,
+			)
+		);
+
+		foreach ($data as $query) {
+			array_push($queryData['queries'], array(
+				'sql'     => $query['sql'],
+				'explain' => $query['explain'],
+				'time'    => self::getReadableTime($query['time'])
+			));
+
+			$queryData['queryTotals']['time'] += $query['time'];
+		}
+
+		$queryData['queryTotals']['time'] = self::getReadableTime($queryData['queryTotals']['time']);
+
+		$this->output['queries'] = $queryData['queries'];
+		$this->output['queryTotals'] = $queryData['queryTotals'];
+	}
+
+	/**
+	 * 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 memory
+	 *
+	 * @param double  $size
+	 * @param integer $decimals
+	 */
+	public static function getReadableMemory($size, $decimals = 2)
+	{
+		$unitOptions = array('b', 'k', 'M', 'G');
+
+		$base = log($size, 1024);
+
+		$memory = round(pow(1024, $base - floor($base)), $decimals);
+		$unit = $unitOptions[floor($base)];
+		return "{$memory} {$unit}";
+	}
  
-    public function __invoke()
-    {
-        $output = $this->output;
-        // todo is this really the best way to load these?
-        $styles = file_get_contents(__DIR__ . "./../{$this->options['style_path']}");
-        $script = file_get_contents(__DIR__ . "./../{$this->options['script_path']}");
-
-        require_once __DIR__ .'/../asset/display.tpl.php';
-    }
+	public function __invoke()
+	{
+		$output = $this->output;
+		// todo is this really the best way to load these?
+		$styles = file_get_contents(__DIR__ . "./../{$this->options['style_path']}");
+		$script = file_get_contents(__DIR__ . "./../{$this->options['script_path']}");
+
+		require_once __DIR__ .'/../asset/display.tpl.php';
+	}
 }	

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
             )
         );
         foreach ($console->getLogs() as $log) {
-            switch($log['type']) {
+            switch ($log['type']) {
                 case 'log':
                     $message = array(
                         'data' => print_r($log['data'], true),
@@ -227,9 +227,9 @@ 
     {
         $output = $this->output;
         // todo is this really the best way to load these?
-        $styles = file_get_contents(__DIR__ . "./../{$this->options['style_path']}");
-        $script = file_get_contents(__DIR__ . "./../{$this->options['script_path']}");
+        $styles = file_get_contents(__DIR__."./../{$this->options['style_path']}");
+        $script = file_get_contents(__DIR__."./../{$this->options['script_path']}");
 
-        require_once __DIR__ .'/../asset/display.tpl.php';
+        require_once __DIR__.'/../asset/display.tpl.php';
     }
 }