jacobemerick / pqp

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();
-        $dataType = '';
-        if (!is_null($object)) {
-            $memory = strlen(serialize($object));
-            $dataType = 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();
+		$dataType = '';
+		if (!is_null($object)) {
+			$memory = strlen(serialize($object));
+			$dataType = gettype($object);
+		}
 
-        array_push($this->store, array(
-            'name'      => $name,
-            'data'      => $memory,
-            'data_type' => $dataType,
-            'type'      => 'memory'
-        ));
-    }
+		array_push($this->store, array(
+			'name'      => $name,
+			'data'      => $memory,
+			'data_type' => $dataType,
+			'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 +104 added lines, -104 removed lines

@@ -9,108 +9,108 @@
 class ConsoleTest extends PHPUnit_Framework_TestCase
 {
 
-    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 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);
+	}
 }

tests/helpers/function-overrides.php

Indentation +13 added lines, -13 removed lines

@@ -5,37 +5,37 @@
 // namespace hack on microtime functionality
 function microtime()
 {
-    return 1450355136.5706;
+	return 1450355136.5706;
 }
 
 // namespace hack on included files functionality
 function get_included_files()
 {
-    return array(
-        'index.php',
-        'src/Class.php'
-    );
+	return array(
+		'index.php',
+		'src/Class.php'
+	);
 }
 
 // namespace hack on filesize
 function filesize($filename)
 {
-    return strlen($filename) * 100;
+	return strlen($filename) * 100;
 }
 
 // namespace hack on memory usage
 function memory_get_peak_usage()
 {
-    return 123456789;
+	return 123456789;
 }
 
 // namespace hack on ini settings
 function ini_get($setting)
 {
-    if ($setting == 'memory_limit') {
-        return '128M';
-    } elseif ($setting == 'max_execution_time') {
-        return '30';
-    }
-    return \ini_get($setting);
+	if ($setting == 'memory_limit') {
+		return '128M';
+	} elseif ($setting == 'max_execution_time') {
+		return '30';
+	}
+	return \ini_get($setting);
 }

tests/helpers/LoggingPdo.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 class LoggingPdo extends PDO
 {
-    public $queries = array();
+	public $queries = array();
 }

tests/unit/PhpQuickProfilerTest.php

Indentation +315 added lines, -315 removed lines

@@ -9,19 +9,19 @@ 
 class PhpQuickProfilerTest extends PHPUnit_Framework_TestCase
 {
 
-    protected static $dbConnection;
+	protected static $dbConnection;
 
-    public static function setUpBeforeClass()
-    {
-        self::$dbConnection = new LoggingPdo('sqlite::memory:');
-        $createTable = "
+	public static function setUpBeforeClass()
+	{
+		self::$dbConnection = new LoggingPdo('sqlite::memory:');
+		$createTable = "
             CREATE TABLE IF NOT EXISTS `testing` (
                 `id` integer PRIMARY KEY AUTOINCREMENT,
                 `title` varchar(60) NOT NULL
             );";
-        self::$dbConnection->exec($createTable);
+		self::$dbConnection->exec($createTable);
 
-        $hydrateTable = "
+		$hydrateTable = "
             INSERT INTO `testing`
                 (`title`)
             VALUES
@@ -29,312 +29,312 @@ 
                 ('beta'),
                 ('charlie'),
                 ('delta');";
-        self::$dbConnection->exec($hydrateTable);
-    }
-
-    public function testConstruct()
-    {
-        $startTime = microtime(true);
-
-        $profiler = new PhpQuickProfiler();
-        $this->assertAttributeEquals($startTime, 'startTime', $profiler);
-
-        $profiler = new PhpQuickProfiler($startTime);
-        $this->assertAttributeEquals($startTime, 'startTime', $profiler);
-    }
-
-    public function testSetConsole()
-    {
-        $console = new Console();
-        $profiler = new PhpQuickProfiler();
-        $profiler->setConsole($console);
-
-        $this->assertAttributeSame($console, 'console', $profiler);
-    }
-
-    public function testSetDisplay()
-    {
-        $display = new Display();
-        $profiler = new PhpQuickProfiler();
-        $profiler->setDisplay($display);
-
-        $this->assertAttributeSame($display, 'display', $profiler);
-    }
-
-    public function testGatherFileData()
-    {
-        $files = get_included_files();
-        $profiler = new PhpQuickProfiler();
-        $gatheredFileData = $profiler->gatherFileData();
-
-        $this->assertInternalType('array', $gatheredFileData);
-        $this->assertEquals(count($files), count($gatheredFileData));
-        foreach ($gatheredFileData as $fileData) {
-            $this->assertInternalType('array', $fileData);
-            $this->assertArrayHasKey('name', $fileData);
-            $this->assertContains($fileData['name'], $files);
-            $this->assertArrayHasKey('size', $fileData);
-            $this->assertEquals($fileData['size'], filesize($fileData['name']));
-        }
-    }
-
-    public function testGatherMemoryData()
-    {
-        $memoryUsage = memory_get_peak_usage();
-        $allowedLimit = ini_get('memory_limit');
-        $profiler = new PhpQuickProfiler();
-        $gatheredMemoryData = $profiler->gatherMemoryData();
-
-        $this->assertInternalType('array', $gatheredMemoryData);
-        $this->assertEquals(2, count($gatheredMemoryData));
-        $this->assertArrayHasKey('used', $gatheredMemoryData);
-        $this->assertEquals($memoryUsage, $gatheredMemoryData['used']);
-        $this->assertArrayHasKey('allowed', $gatheredMemoryData);
-        $this->assertEquals($allowedLimit, $gatheredMemoryData['allowed']);
-    }
-
-    public function testSetProfiledQueries()
-    {
-        $profiledQueries = $this->dataProfiledQueries();
-        $profiler = new PhpQuickProfiler();
-        $profiler->setProfiledQueries($profiledQueries);
-
-        $this->assertAttributeEquals($profiledQueries, 'profiledQueries', $profiler);
-    }
-
-    public function testGatherQueryData()
-    {
-        $profiledQueries = $this->dataProfiledQueries();
-        $profiledQueriesSql = array();
-        $profiledQueriesTime = array();
-        foreach ($profiledQueries as $queryData) {
-            array_push($profiledQueriesSql, $queryData['sql']);
-            array_push($profiledQueriesTime, $queryData['time']);
-        }
-
-        $profiler = new PhpQuickProfiler();
-        $profiler->setProfiledQueries($profiledQueries);
-        $gatheredQueryData = $profiler->gatherQueryData(self::$dbConnection);
-
-        $this->assertInternalType('array', $gatheredQueryData);
-        $this->assertEquals(count($profiledQueries), count($gatheredQueryData));
-        foreach ($gatheredQueryData as $queryData) {
-            $this->assertInternalType('array', $queryData);
-            $this->assertArrayHasKey('sql', $queryData);
-            $this->assertContains($queryData['sql'], $profiledQueriesSql);
-            $this->assertArrayHasKey('explain', $queryData);
-            $this->assertInternaltype('array', $queryData['explain']);
-            $this->assertGreaterThan(0, count($queryData['explain']));
-            $this->assertArrayHasKey('time', $queryData);
-            $this->assertContains($queryData['time'], $profiledQueriesTime);
-        }
-    }
-
-    public function testGatherQueryDataInternalProfiler()
-    {
-        $profiledQueries = $this->dataProfiledQueries();
-        $dbConnection = self::$dbConnection;
-        $dbConnection->queries = $profiledQueries;
-        $profiler = new PhpQuickProfiler();
-        $profiler->gatherQueryData($dbConnection);
-
-        $this->assertAttributeSame($profiledQueries, 'profiledQueries', $profiler);
-    }
-
-    /**
-     * @dataProvider dataProfiledQueries
-     */
-    public function testExplainQuery($sql, $parameters)
-    {
-        $profiler = new PhpQuickProfiler();
-        $reflectedMethod = $this->getAccessibleMethod($profiler, 'explainQuery');
-
-        $explainedQuery = $reflectedMethod->invokeArgs(
-            $profiler,
-            array(self::$dbConnection, $sql, $parameters)
-        );
-        $this->assertInternalType('array', $explainedQuery);
-        $this->assertGreaterThan(0, count($explainedQuery));
-    }
-
-    /**
-     * @expectedException Exception
-     */
-    public function testExplainQueryBadQueryException()
-    {
-        $invalidQuery = 'SELECT * FROM `fake_table`';
-        $profiler = new PhpQuickProfiler();
-        $reflectedMethod = $this->getAccessibleMethod($profiler, 'explainQuery');
-
-        $reflectedMethod->invokeArgs(
-            $profiler,
-            array(self::$dbConnection, $invalidQuery)
-        );
-    }
-
-    /**
-     * @expectedException Exception
-     */
-    public function testExplainQueryBadParametersException()
-    {
-        $query = 'SELECT * FROM `testing` WHERE `title` = :title';
-        $invalidParams = array('id' => 1);
-        $profiler = new PhpQuickProfiler();
-        $reflectedMethod = $this->getAccessibleMethod($profiler, 'explainQuery');
-
-        $reflectedMethod->invokeArgs(
-            $profiler,
-            array(self::$dbConnection, $query, $invalidParams)
-        );
-    }
-
-    /**
-     * @dataProvider dataConnectionDrivers
-     */
-    public function testGetExplainQuery($driver, $prefix)
-    {
-        $query = 'SELECT * FROM `testing`';
-        $profiler = new PhpQuickProfiler();
-        $reflectedMethod = $this->getAccessibleMethod($profiler, 'getExplainQuery');
-
-        $explainQuery = $reflectedMethod->invokeArgs(
-            $profiler,
-            array($query, $driver)
-        );
-
-        $explainPrefix = str_replace($query, '', $explainQuery);
-        $explainPrefix = trim($explainPrefix);
-        $this->assertEquals($prefix, $explainPrefix);
-    }
-
-    /**
-     * @expectedException Exception
-     */
-    public function testGetExplainQueryUnsupportedDriver()
-    {
-        $query = 'SELECT * FROM `testing`';
-        $unsupportedDriver = 'zz';
-        $profiler = new PhpQuickProfiler();
-        $reflectedMethod = $this->getAccessibleMethod($profiler, 'getExplainQuery');
-
-        $reflectedMethod->invokeArgs(
-            $profiler,
-            array($query, $unsupportedDriver)
-        );
-    }
-
-    public function testGatherSpeedData()
-    {
-        $elapsedTime = 1.234;
-        $startTime = microtime(true) - $elapsedTime;
-        $allowedTime = ini_get('max_execution_time');
-        $profiler = new PhpQuickProfiler($startTime);
-        $gatheredSpeedData = $profiler->gatherSpeedData();
-
-        $this->assertInternalType('array', $gatheredSpeedData);
-        $this->assertEquals(2, count($gatheredSpeedData));
-        $this->assertArrayHasKey('elapsed', $gatheredSpeedData);
-        $this->assertEquals($elapsedTime, $gatheredSpeedData['elapsed']);
-        $this->assertArrayHasKey('allowed', $gatheredSpeedData);
-        $this->assertEquals($allowedTime, $gatheredSpeedData['allowed']);
-    }
-
-    public function testDisplay()
-    {
-        $console = new Console();
-        $profiler = new PhpQuickProfiler();
-
-        $expectedDisplay = new Display();
-        $expectedDisplay->setConsole($console);
-        $expectedDisplay->setFileData($profiler->gatherFileData());
-        $expectedDisplay->setMemoryData($profiler->gatherMemoryData());
-        $expectedDisplay->setQueryData($profiler->gatherQueryData());
-        $expectedDisplay->setSpeedData($profiler->gatherSpeedData());
-        ob_start();
-        $expectedDisplay->__invoke();
-        ob_end_clean();
-
-        $display = new Display();
-        $profiler->setConsole($console);
-        $profiler->setDisplay($display);
-        ob_start();
-        $profiler->display();
-        ob_end_clean();
-
-        $this->assertAttributeEquals($expectedDisplay, 'display', $profiler);
-    }
-
-    /**
-     * @expectedException Exception
-     */
-    public function testDisplayNothingSetException()
-    {
-        $profiler = new PhpQuickProfiler();
-        $profiler->display();
-    }
-
-    /**
-     * @expectedException Exception
-     */
-    public function testDisplayNoConsoleException()
-    {
-        $display = new Display();
-        $profiler = new PhpQuickProfiler();
-        $profiler->setDisplay($display);
-        $profiler->display();
-    }
-
-    /**
-     * @expectedException Exception
-     */
-    public function testDisplayNoDisplayException()
-    {
-        $console = new Console();
-        $profiler = new PhpQuickProfiler();
-        $profiler->setConsole($console);
-        $profiler->display();
-    }
-
-    public function dataProfiledQueries()
-    {
-        return array(
-            array(
-              'sql' => "SELECT * FROM testing",
-              'parameters' => array(),
-              'time' => 25
-            ),
-            array(
-              'sql' => "SELECT id FROM testing WHERE title = :title",
-              'parameters' => array('title' => 'beta'),
-              'time' => 5
-            )
-        );
-    }
-
-    public function dataConnectionDrivers()
-    {
-        return array(
-            array(
-                'driver' => 'mysql',
-                'prefix' => 'EXPLAIN'
-            ),
-            array(
-                'driver' => 'sqlite',
-                'prefix' => 'EXPLAIN QUERY PLAN'
-            )
-        );
-    }
-
-    protected function getAccessibleMethod(PhpQuickProfiler $profiler, $methodName)
-    {
-        $reflectedConsole = new ReflectionClass(get_class($profiler));
-        $reflectedMethod = $reflectedConsole->getMethod($methodName);
-        $reflectedMethod->setAccessible(true);
-        return $reflectedMethod;
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::$dbConnection = null;
-    }
+		self::$dbConnection->exec($hydrateTable);
+	}
+
+	public function testConstruct()
+	{
+		$startTime = microtime(true);
+
+		$profiler = new PhpQuickProfiler();
+		$this->assertAttributeEquals($startTime, 'startTime', $profiler);
+
+		$profiler = new PhpQuickProfiler($startTime);
+		$this->assertAttributeEquals($startTime, 'startTime', $profiler);
+	}
+
+	public function testSetConsole()
+	{
+		$console = new Console();
+		$profiler = new PhpQuickProfiler();
+		$profiler->setConsole($console);
+
+		$this->assertAttributeSame($console, 'console', $profiler);
+	}
+
+	public function testSetDisplay()
+	{
+		$display = new Display();
+		$profiler = new PhpQuickProfiler();
+		$profiler->setDisplay($display);
+
+		$this->assertAttributeSame($display, 'display', $profiler);
+	}
+
+	public function testGatherFileData()
+	{
+		$files = get_included_files();
+		$profiler = new PhpQuickProfiler();
+		$gatheredFileData = $profiler->gatherFileData();
+
+		$this->assertInternalType('array', $gatheredFileData);
+		$this->assertEquals(count($files), count($gatheredFileData));
+		foreach ($gatheredFileData as $fileData) {
+			$this->assertInternalType('array', $fileData);
+			$this->assertArrayHasKey('name', $fileData);
+			$this->assertContains($fileData['name'], $files);
+			$this->assertArrayHasKey('size', $fileData);
+			$this->assertEquals($fileData['size'], filesize($fileData['name']));
+		}
+	}
+
+	public function testGatherMemoryData()
+	{
+		$memoryUsage = memory_get_peak_usage();
+		$allowedLimit = ini_get('memory_limit');
+		$profiler = new PhpQuickProfiler();
+		$gatheredMemoryData = $profiler->gatherMemoryData();
+
+		$this->assertInternalType('array', $gatheredMemoryData);
+		$this->assertEquals(2, count($gatheredMemoryData));
+		$this->assertArrayHasKey('used', $gatheredMemoryData);
+		$this->assertEquals($memoryUsage, $gatheredMemoryData['used']);
+		$this->assertArrayHasKey('allowed', $gatheredMemoryData);
+		$this->assertEquals($allowedLimit, $gatheredMemoryData['allowed']);
+	}
+
+	public function testSetProfiledQueries()
+	{
+		$profiledQueries = $this->dataProfiledQueries();
+		$profiler = new PhpQuickProfiler();
+		$profiler->setProfiledQueries($profiledQueries);
+
+		$this->assertAttributeEquals($profiledQueries, 'profiledQueries', $profiler);
+	}
+
+	public function testGatherQueryData()
+	{
+		$profiledQueries = $this->dataProfiledQueries();
+		$profiledQueriesSql = array();
+		$profiledQueriesTime = array();
+		foreach ($profiledQueries as $queryData) {
+			array_push($profiledQueriesSql, $queryData['sql']);
+			array_push($profiledQueriesTime, $queryData['time']);
+		}
+
+		$profiler = new PhpQuickProfiler();
+		$profiler->setProfiledQueries($profiledQueries);
+		$gatheredQueryData = $profiler->gatherQueryData(self::$dbConnection);
+
+		$this->assertInternalType('array', $gatheredQueryData);
+		$this->assertEquals(count($profiledQueries), count($gatheredQueryData));
+		foreach ($gatheredQueryData as $queryData) {
+			$this->assertInternalType('array', $queryData);
+			$this->assertArrayHasKey('sql', $queryData);
+			$this->assertContains($queryData['sql'], $profiledQueriesSql);
+			$this->assertArrayHasKey('explain', $queryData);
+			$this->assertInternaltype('array', $queryData['explain']);
+			$this->assertGreaterThan(0, count($queryData['explain']));
+			$this->assertArrayHasKey('time', $queryData);
+			$this->assertContains($queryData['time'], $profiledQueriesTime);
+		}
+	}
+
+	public function testGatherQueryDataInternalProfiler()
+	{
+		$profiledQueries = $this->dataProfiledQueries();
+		$dbConnection = self::$dbConnection;
+		$dbConnection->queries = $profiledQueries;
+		$profiler = new PhpQuickProfiler();
+		$profiler->gatherQueryData($dbConnection);
+
+		$this->assertAttributeSame($profiledQueries, 'profiledQueries', $profiler);
+	}
+
+	/**
+	 * @dataProvider dataProfiledQueries
+	 */
+	public function testExplainQuery($sql, $parameters)
+	{
+		$profiler = new PhpQuickProfiler();
+		$reflectedMethod = $this->getAccessibleMethod($profiler, 'explainQuery');
+
+		$explainedQuery = $reflectedMethod->invokeArgs(
+			$profiler,
+			array(self::$dbConnection, $sql, $parameters)
+		);
+		$this->assertInternalType('array', $explainedQuery);
+		$this->assertGreaterThan(0, count($explainedQuery));
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testExplainQueryBadQueryException()
+	{
+		$invalidQuery = 'SELECT * FROM `fake_table`';
+		$profiler = new PhpQuickProfiler();
+		$reflectedMethod = $this->getAccessibleMethod($profiler, 'explainQuery');
+
+		$reflectedMethod->invokeArgs(
+			$profiler,
+			array(self::$dbConnection, $invalidQuery)
+		);
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testExplainQueryBadParametersException()
+	{
+		$query = 'SELECT * FROM `testing` WHERE `title` = :title';
+		$invalidParams = array('id' => 1);
+		$profiler = new PhpQuickProfiler();
+		$reflectedMethod = $this->getAccessibleMethod($profiler, 'explainQuery');
+
+		$reflectedMethod->invokeArgs(
+			$profiler,
+			array(self::$dbConnection, $query, $invalidParams)
+		);
+	}
+
+	/**
+	 * @dataProvider dataConnectionDrivers
+	 */
+	public function testGetExplainQuery($driver, $prefix)
+	{
+		$query = 'SELECT * FROM `testing`';
+		$profiler = new PhpQuickProfiler();
+		$reflectedMethod = $this->getAccessibleMethod($profiler, 'getExplainQuery');
+
+		$explainQuery = $reflectedMethod->invokeArgs(
+			$profiler,
+			array($query, $driver)
+		);
+
+		$explainPrefix = str_replace($query, '', $explainQuery);
+		$explainPrefix = trim($explainPrefix);
+		$this->assertEquals($prefix, $explainPrefix);
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testGetExplainQueryUnsupportedDriver()
+	{
+		$query = 'SELECT * FROM `testing`';
+		$unsupportedDriver = 'zz';
+		$profiler = new PhpQuickProfiler();
+		$reflectedMethod = $this->getAccessibleMethod($profiler, 'getExplainQuery');
+
+		$reflectedMethod->invokeArgs(
+			$profiler,
+			array($query, $unsupportedDriver)
+		);
+	}
+
+	public function testGatherSpeedData()
+	{
+		$elapsedTime = 1.234;
+		$startTime = microtime(true) - $elapsedTime;
+		$allowedTime = ini_get('max_execution_time');
+		$profiler = new PhpQuickProfiler($startTime);
+		$gatheredSpeedData = $profiler->gatherSpeedData();
+
+		$this->assertInternalType('array', $gatheredSpeedData);
+		$this->assertEquals(2, count($gatheredSpeedData));
+		$this->assertArrayHasKey('elapsed', $gatheredSpeedData);
+		$this->assertEquals($elapsedTime, $gatheredSpeedData['elapsed']);
+		$this->assertArrayHasKey('allowed', $gatheredSpeedData);
+		$this->assertEquals($allowedTime, $gatheredSpeedData['allowed']);
+	}
+
+	public function testDisplay()
+	{
+		$console = new Console();
+		$profiler = new PhpQuickProfiler();
+
+		$expectedDisplay = new Display();
+		$expectedDisplay->setConsole($console);
+		$expectedDisplay->setFileData($profiler->gatherFileData());
+		$expectedDisplay->setMemoryData($profiler->gatherMemoryData());
+		$expectedDisplay->setQueryData($profiler->gatherQueryData());
+		$expectedDisplay->setSpeedData($profiler->gatherSpeedData());
+		ob_start();
+		$expectedDisplay->__invoke();
+		ob_end_clean();
+
+		$display = new Display();
+		$profiler->setConsole($console);
+		$profiler->setDisplay($display);
+		ob_start();
+		$profiler->display();
+		ob_end_clean();
+
+		$this->assertAttributeEquals($expectedDisplay, 'display', $profiler);
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testDisplayNothingSetException()
+	{
+		$profiler = new PhpQuickProfiler();
+		$profiler->display();
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testDisplayNoConsoleException()
+	{
+		$display = new Display();
+		$profiler = new PhpQuickProfiler();
+		$profiler->setDisplay($display);
+		$profiler->display();
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testDisplayNoDisplayException()
+	{
+		$console = new Console();
+		$profiler = new PhpQuickProfiler();
+		$profiler->setConsole($console);
+		$profiler->display();
+	}
+
+	public function dataProfiledQueries()
+	{
+		return array(
+			array(
+			  'sql' => "SELECT * FROM testing",
+			  'parameters' => array(),
+			  'time' => 25
+			),
+			array(
+			  'sql' => "SELECT id FROM testing WHERE title = :title",
+			  'parameters' => array('title' => 'beta'),
+			  'time' => 5
+			)
+		);
+	}
+
+	public function dataConnectionDrivers()
+	{
+		return array(
+			array(
+				'driver' => 'mysql',
+				'prefix' => 'EXPLAIN'
+			),
+			array(
+				'driver' => 'sqlite',
+				'prefix' => 'EXPLAIN QUERY PLAN'
+			)
+		);
+	}
+
+	protected function getAccessibleMethod(PhpQuickProfiler $profiler, $methodName)
+	{
+		$reflectedConsole = new ReflectionClass(get_class($profiler));
+		$reflectedMethod = $reflectedConsole->getMethod($methodName);
+		$reflectedMethod->setAccessible(true);
+		return $reflectedMethod;
+	}
+
+	public static function tearDownAfterClass()
+	{
+		self::$dbConnection = null;
+	}
 }

src/PhpQuickProfiler.php

Indentation +189 added lines, -189 removed lines

@@ -17,193 +17,193 @@
 class PhpQuickProfiler
 {
 
-    /** @var  double */
-    protected $startTime;
-
-    /** @var  Console */
-    protected $console;
-
-    /** @var  Display */
-    protected $display;
-
-    /** @var  array */
-    protected $profiledQueries = array();
-
-    /**
-     * @param double $startTime
-     */
-    public function __construct($startTime = null)
-    {
-        if (is_null($startTime)) {
-            $startTime = microtime(true);
-        }
-        $this->startTime = $startTime;
-    }
-
-    /**
-     * @param Console $console
-     */
-    public function setConsole(Console $console)
-    {
-        $this->console = $console;
-    }
-
-    /**
-     * @param Display $display
-     */
-    public function setDisplay(Display $display)
-    {
-        $this->display = $display;
-    }
-
-    /**
-     * 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
-        );
-    }
-
-    /**
-     * @param array $profiledQueries
-     */
-    public function setProfiledQueries(array $profiledQueries)
-    {
-        $this->profiledQueries = $profiledQueries;
-    }
-
-    /**
-     * Get data about sql usage of the application
-     *
-     * @param object $dbConnection
-     * @returns array
-     */
-    public function gatherQueryData($dbConnection = null)
-    {
-        if (is_null($dbConnection)) {
-            return array();
-        }
-
-        if (empty($this->profiledQueries) && property_exists($dbConnection, 'queries')) {
-            $this->setProfiledQueries($dbConnection->queries);
-        }
-
-        $data = array();
-        foreach ($this->profiledQueries as $query) {
-            array_push($data, array(
-                'sql'     => $query['sql'],
-                'explain' => $this->explainQuery($dbConnection, $query['sql'], $query['parameters']),
-                'time'    => $query['time']
-            ));
-        }
-        return $data;
-    }
-
-    /**
-     * Attempts to explain a query
-     *
-     * @param object $dbConnection
-     * @param string $query
-     * @param array  $parameters
-     * @throws Exception
-     * @return array
-     */
-    protected function explainQuery($dbConnection, $query, $parameters = array())
-    {
-        $driver = $dbConnection->getAttribute(\PDO::ATTR_DRIVER_NAME);
-        $query = $this->getExplainQuery($query, $driver);
-        $statement = $dbConnection->prepare($query);
-        if ($statement === false) {
-            throw new Exception('Invalid query passed to explainQuery method');
-        }
-        $statement->execute($parameters);
-        $result = $statement->fetch(\PDO::FETCH_ASSOC);
-        if ($result === false) {
-            throw new Exception('Query could not be explained with given parameters');
-        }
-        return $result;
-    }
-
-    /**
-     * Attempts to figure out what kind of explain query format the db wants
-     *
-     * @param string $query
-     * @param string $driver
-     * @throws Exception
-     * @return string
-     */
-    protected function getExplainQuery($query, $driver)
-    {
-        if ($driver == 'mysql') {
-            return "EXPLAIN {$query}";
-        } elseif ($driver == 'sqlite') {
-            return "EXPLAIN QUERY PLAN {$query}";
-        }
-        throw new Exception('Could not process db driver');
-    }
-
-    /**
-     * Get data about speed of the application
-     *
-     * @returns array
-     */
-    public function gatherSpeedData()
-    {
-        $elapsedTime = microtime(true) - $this->startTime;
-        $elapsedTime = round($elapsedTime, 3);
-        $allowedTime = ini_get('max_execution_time');
-        return array(
-            'elapsed' => $elapsedTime,
-            'allowed' => $allowedTime
-        );
-    }
-
-    /**
-     * Triggers end display of the profiling data
-     *
-     * @param object $dbConnection
-     * @throws Exception
-     */
-    public function display($dbConnection = null)
-    {
-        if (!isset($this->display)) {
-            throw new Exception('Display object has not been injected into Profiler');
-        }
-        if (!isset($this->console)) {
-            throw new Exception('Console object has not been injected into Profiler');
-        }
-
-        $this->display->setConsole($this->console);
-        $this->display->setFileData($this->gatherFileData());
-        $this->display->setMemoryData($this->gatherMemoryData());
-        $this->display->setQueryData($this->gatherQueryData($dbConnection));
-        $this->display->setSpeedData($this->gatherSpeedData());
-
-        $this->display->__invoke();
-    }
+	/** @var  double */
+	protected $startTime;
+
+	/** @var  Console */
+	protected $console;
+
+	/** @var  Display */
+	protected $display;
+
+	/** @var  array */
+	protected $profiledQueries = array();
+
+	/**
+	 * @param double $startTime
+	 */
+	public function __construct($startTime = null)
+	{
+		if (is_null($startTime)) {
+			$startTime = microtime(true);
+		}
+		$this->startTime = $startTime;
+	}
+
+	/**
+	 * @param Console $console
+	 */
+	public function setConsole(Console $console)
+	{
+		$this->console = $console;
+	}
+
+	/**
+	 * @param Display $display
+	 */
+	public function setDisplay(Display $display)
+	{
+		$this->display = $display;
+	}
+
+	/**
+	 * 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
+		);
+	}
+
+	/**
+	 * @param array $profiledQueries
+	 */
+	public function setProfiledQueries(array $profiledQueries)
+	{
+		$this->profiledQueries = $profiledQueries;
+	}
+
+	/**
+	 * Get data about sql usage of the application
+	 *
+	 * @param object $dbConnection
+	 * @returns array
+	 */
+	public function gatherQueryData($dbConnection = null)
+	{
+		if (is_null($dbConnection)) {
+			return array();
+		}
+
+		if (empty($this->profiledQueries) && property_exists($dbConnection, 'queries')) {
+			$this->setProfiledQueries($dbConnection->queries);
+		}
+
+		$data = array();
+		foreach ($this->profiledQueries as $query) {
+			array_push($data, array(
+				'sql'     => $query['sql'],
+				'explain' => $this->explainQuery($dbConnection, $query['sql'], $query['parameters']),
+				'time'    => $query['time']
+			));
+		}
+		return $data;
+	}
+
+	/**
+	 * Attempts to explain a query
+	 *
+	 * @param object $dbConnection
+	 * @param string $query
+	 * @param array  $parameters
+	 * @throws Exception
+	 * @return array
+	 */
+	protected function explainQuery($dbConnection, $query, $parameters = array())
+	{
+		$driver = $dbConnection->getAttribute(\PDO::ATTR_DRIVER_NAME);
+		$query = $this->getExplainQuery($query, $driver);
+		$statement = $dbConnection->prepare($query);
+		if ($statement === false) {
+			throw new Exception('Invalid query passed to explainQuery method');
+		}
+		$statement->execute($parameters);
+		$result = $statement->fetch(\PDO::FETCH_ASSOC);
+		if ($result === false) {
+			throw new Exception('Query could not be explained with given parameters');
+		}
+		return $result;
+	}
+
+	/**
+	 * Attempts to figure out what kind of explain query format the db wants
+	 *
+	 * @param string $query
+	 * @param string $driver
+	 * @throws Exception
+	 * @return string
+	 */
+	protected function getExplainQuery($query, $driver)
+	{
+		if ($driver == 'mysql') {
+			return "EXPLAIN {$query}";
+		} elseif ($driver == 'sqlite') {
+			return "EXPLAIN QUERY PLAN {$query}";
+		}
+		throw new Exception('Could not process db driver');
+	}
+
+	/**
+	 * Get data about speed of the application
+	 *
+	 * @returns array
+	 */
+	public function gatherSpeedData()
+	{
+		$elapsedTime = microtime(true) - $this->startTime;
+		$elapsedTime = round($elapsedTime, 3);
+		$allowedTime = ini_get('max_execution_time');
+		return array(
+			'elapsed' => $elapsedTime,
+			'allowed' => $allowedTime
+		);
+	}
+
+	/**
+	 * Triggers end display of the profiling data
+	 *
+	 * @param object $dbConnection
+	 * @throws Exception
+	 */
+	public function display($dbConnection = null)
+	{
+		if (!isset($this->display)) {
+			throw new Exception('Display object has not been injected into Profiler');
+		}
+		if (!isset($this->console)) {
+			throw new Exception('Console object has not been injected into Profiler');
+		}
+
+		$this->display->setConsole($this->console);
+		$this->display->setFileData($this->gatherFileData());
+		$this->display->setMemoryData($this->gatherMemoryData());
+		$this->display->setQueryData($this->gatherQueryData($dbConnection));
+		$this->display->setSpeedData($this->gatherSpeedData());
+
+		$this->display->__invoke();
+	}
 }

tests/unit/DisplayTest.php

Indentation +53 added lines, -53 removed lines

@@ -8,64 +8,64 @@
 class DisplayTest extends PHPUnit_Framework_TestCase
 {
 
-    public function testConstruct()
-    {
-        $display = new Display();
-        $reflectedDisplay = new ReflectionClass(get_class($display));
-        $reflectedProperty = $reflectedDisplay->getProperty('defaults');
-        $reflectedProperty->setAccessible(true);
-        $defaults = $reflectedProperty->getValue($display);
+	public function testConstruct()
+	{
+		$display = new Display();
+		$reflectedDisplay = new ReflectionClass(get_class($display));
+		$reflectedProperty = $reflectedDisplay->getProperty('defaults');
+		$reflectedProperty->setAccessible(true);
+		$defaults = $reflectedProperty->getValue($display);
 
-        $display = new Display();
-        $this->assertAttributeEquals($defaults, 'options', $display);
+		$display = new Display();
+		$this->assertAttributeEquals($defaults, 'options', $display);
 
-        $options = array(
-            'script_path' => 'testing/testing.js',
-            'fake_key' => 'foo bar'
-        );
-        $expectedOptions = array_intersect_key($options, $defaults);
-        $expectedOptions = array_replace($defaults, $expectedOptions);
-        $display = new Display($options);
-        $this->assertAttributeEquals($expectedOptions, 'options', $display);
-    }
+		$options = array(
+			'script_path' => 'testing/testing.js',
+			'fake_key' => 'foo bar'
+		);
+		$expectedOptions = array_intersect_key($options, $defaults);
+		$expectedOptions = array_replace($defaults, $expectedOptions);
+		$display = new Display($options);
+		$this->assertAttributeEquals($expectedOptions, 'options', $display);
+	}
 
-    public function testGetReadableTime()
-    {
-        $timeTest = array(
-            '.032432' => '32.432 ms',
-            '24.3781' => '24.378 s',
-            '145.123' => '2.419 m'
-        );
-        $display = new Display();
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getReadableTime');
+	public function testGetReadableTime()
+	{
+		$timeTest = array(
+			'.032432' => '32.432 ms',
+			'24.3781' => '24.378 s',
+			'145.123' => '2.419 m'
+		);
+		$display = new Display();
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getReadableTime');
 
-        foreach ($timeTest as $rawTime => $expectedTime) {
-            $readableTime = $reflectedMethod->invokeArgs($display, array($rawTime));
-            $this->assertEquals($expectedTime, $readableTime);
-        }
-    }
+		foreach ($timeTest as $rawTime => $expectedTime) {
+			$readableTime = $reflectedMethod->invokeArgs($display, array($rawTime));
+			$this->assertEquals($expectedTime, $readableTime);
+		}
+	}
 
-    public function testGetReadableMemory()
-    {
-        $memoryTest = array(
-            '314'     => '314 b',
-            '7403'    => '7.23 k',
-            '2589983' => '2.47 M'
-        );
-        $display = new Display();
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getReadableMemory');
+	public function testGetReadableMemory()
+	{
+		$memoryTest = array(
+			'314'     => '314 b',
+			'7403'    => '7.23 k',
+			'2589983' => '2.47 M'
+		);
+		$display = new Display();
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getReadableMemory');
 
-        foreach ($memoryTest as $rawMemory => $expectedMemory) {
-            $readableMemory = $reflectedMethod->invokeArgs($display, array($rawMemory));
-            $this->assertEquals($expectedMemory, $readableMemory);
-        }
-    }
+		foreach ($memoryTest as $rawMemory => $expectedMemory) {
+			$readableMemory = $reflectedMethod->invokeArgs($display, array($rawMemory));
+			$this->assertEquals($expectedMemory, $readableMemory);
+		}
+	}
 
-    protected function getAccessibleMethod(Display $display, $methodName)
-    {
-        $reflectedConsole = new ReflectionClass(get_class($display));
-        $reflectedMethod = $reflectedConsole->getMethod($methodName);
-        $reflectedMethod->setAccessible(true);
-        return $reflectedMethod;
-    }
+	protected function getAccessibleMethod(Display $display, $methodName)
+	{
+		$reflectedConsole = new ReflectionClass(get_class($display));
+		$reflectedMethod = $reflectedConsole->getMethod($methodName);
+		$reflectedMethod->setAccessible(true);
+		return $reflectedMethod;
+	}
 }

src/Display.php

Indentation +300 added lines, -300 removed lines

@@ -14,305 +14,305 @@
 class Display
 {
 
-    /** @var  array */
-    protected $defaults = array(
-        'script_path' => 'asset/script.js',
-        'style_path'  => 'asset/style.css'
-    );
-
-    /** @var  array */
-    protected $options;
-
-    /** @var  Console */
-    protected $console;
-
-    /** @var  array */
-    protected $speedData;
-
-    /** @var  array */
-    protected $queryData;
-
-    /** @var  array */
-    protected $memoryData;
-
-    /** @var  array */
-    protected $fileData;
-
-    /**
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $options = array_intersect_key($options, $this->defaults);
-        $this->options = array_replace($this->defaults, $options);
-    }
-
-    /**
-     * @param Console $console
-     */
-    public function setConsole(Console $console)
-    {
-        $this->console = $console;
-    }
-
-    /**
-     * @return array
-     */
-    protected function formatConsoleData()
-    {
-        $console_data = array(
-            'messages' => array(),
-            'meta'    => array(
-                'log'    => 0,
-                'memory' => 0,
-                'error'  => 0,
-                'speed'  => 0
-            )
-        );
-        foreach ($this->console->getLogs() as $log) {
-            switch($log['type']) {
-                case 'log':
-                    $message = array(
-                        'message' => print_r($log['data'], true),
-                        'type'    => 'log'
-                    );
-                    $console_data['meta']['log']++;
-                    break;
-                case 'memory':
-                    $message = array(
-                        'message' => (!empty($log['data_type']) ? "{$log['data_type']}: " : '') . $log['name'],
-                        'data'    => $this->getReadableMemory($log['data']),
-                        'type'    => 'memory'
-                    );
-                    $console_data['meta']['memory']++;
-                    break;
-                case 'error':
-                    $message = array(
-                        'message' => "Line {$log['line']}: {$log['data']} in {$log['file']}",
-                        'type'    => 'error'
-                    );
-                    $console_data['meta']['error']++;
-                    break;
-                case 'speed':
-                    $elapsedTime = $log['data'] - $this->startTime;
-                    $message = array(
-                        'message' => $log['name'],
-                        'data'    => $this->getReadableTime($elapsedTime),
-                        'type'    => 'speed'
-                    );
-                    $console_data['meta']['speed']++;
-                    break;
-                default:
-                    $message = array(
-                        'message' => "Unrecognized console log type: {$log['type']}",
-                        'type'    => 'error'
-                    );
-                    $console_data['meta']['error']++;
-                    break;
-            }
-            array_push($console_data['messages'], $message);
-        }
-        return $console_data;
-    }
-
-    /**
-     * Sets file data
-     *
-     * @param array $data
-     */
-    public function setFileData(array $data)
-    {
-        $this->fileData = $data;
-    }
-
-    /**
-     * @return array
-     */
-    protected function formatFileData()
-    {
-        $fileData = array(
-            'messages' => array(),
-            'meta'     => array(
-                'count'   => count($this->fileData),
-                'size'    => 0,
-                'largest' => 0
-            )
-        );
-
-        foreach ($this->fileData as $file) {
-            array_push($fileData['messages'], array(
-                'message' => $file['name'],
-                'data'    => $this->getReadableMemory($file['size'])
-            ));
-
-            $fileData['meta']['size'] += $file['size'];
-            if ($file['size'] > $fileData['meta']['largest']) {
-                $fileData['meta']['largest'] = $file['size'];
-            }
-        }
-
-        $fileData['meta']['size'] = $this->getReadableMemory($fileData['meta']['size']);
-        $fileData['meta']['largest'] = $this->getReadableMemory($fileData['meta']['largest']);
-
-        return $fileData;
-    }
-
-    /**
-     * Sets memory data
-     *
-     * @param array $data
-     */
-    public function setMemoryData(array $data)
-    {
-        $this->memoryData = $data;
-    }
-
-    /**
-     * @return array
-     */
-    public function formatMemoryData()
-    {
-        return array(
-            'meta' => array(
-                'used'    => $this->getReadableMemory($this->memoryData['used']),
-                'allowed' => $this->memoryData['allowed']
-            )
-        );
-    }
-
-    /**
-     * Sets query data
-     *
-     * @param array $data
-     */
-    public function setQueryData(array $data)
-    {
-        $this->queryData = $data;
-    }
-
-    /**
-     * @return array
-     */
-    public function formatQueryData()
-    {
-        $queryData = array(
-            'messages' => array(),
-            'meta'     => array(
-                'count'   => count($this->queryData),
-                'time'    => 0,
-                'slowest' => 0
-            )
-        );
-
-        foreach ($this->queryData as $query) {
-            array_push($queryData['messages'], array(
-                'message'  => $query['sql'],
-                'sub_data' => array_filter($query['explain']),
-                'data'     => $this->getReadableTime($query['time'])
-            ));
-            $queryData['meta']['time'] += $query['time'];
-            if ($query['time'] > $queryData['meta']['slowest']) {
-                $queryData['meta']['slowest'] = $query['time'];
-            }
-        }
-
-        $queryData['meta']['time'] = $this->getReadableTime($queryData['meta']['time']);
-        $queryData['meta']['slowest'] = $this->getReadableTime($queryData['meta']['slowest']);
-
-        return $queryData;
-    }
-
-    /**
-     * Sets speed data
-     *
-     * @param array $data
-     */
-    public function setSpeedData(array $data)
-    {
-        $this->speedData = $data;
-    }
-
-    /**
-     * @return array
-     */
-    protected function formatSpeedData()
-    {
-        return array(
-            'meta' => array(
-              'elapsed' => $this->getReadableTime($this->speedData['elapsed']),
-              'allowed' => $this->getReadableTime($this->speedData['allowed'], 0)
-            )
-        );
-    }
-
-    /**
-     * Formatter for human-readable time
-     * Only handles time up to 60 minutes gracefully
-     *
-     * @param double  $time
-     * @param integer $percision
-     * @return string
-     */
-    protected function getReadableTime($time, $percision = 3)
-    {
-        $unit = 's';
-        if ($time < 1) {
-            $time *= 1000;
-            $unit = 'ms';
-        } else if ($time > 60) {
-            $time /= 60;
-            $unit = 'm';
-        }
-        $time = number_format($time, $percision);
-        return "{$time} {$unit}";
-    }
-
-    /**
-     * Formatter for human-readable memory
-     * Only handles time up to a few gigs gracefully
-     *
-     * @param double  $size
-     * @param integer $percision
-     */
-    protected function getReadableMemory($size, $percision = 2)
-    {
-        $unitOptions = array('b', 'k', 'M', 'G');
-
-        $base = log($size, 1024);
-
-        $memory = round(pow(1024, $base - floor($base)), $percision);
-        $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  Console */
+	protected $console;
+
+	/** @var  array */
+	protected $speedData;
+
+	/** @var  array */
+	protected $queryData;
+
+	/** @var  array */
+	protected $memoryData;
+
+	/** @var  array */
+	protected $fileData;
+
+	/**
+	 * @param array $options
+	 */
+	public function __construct(array $options = array())
+	{
+		$options = array_intersect_key($options, $this->defaults);
+		$this->options = array_replace($this->defaults, $options);
+	}
+
+	/**
+	 * @param Console $console
+	 */
+	public function setConsole(Console $console)
+	{
+		$this->console = $console;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function formatConsoleData()
+	{
+		$console_data = array(
+			'messages' => array(),
+			'meta'    => array(
+				'log'    => 0,
+				'memory' => 0,
+				'error'  => 0,
+				'speed'  => 0
+			)
+		);
+		foreach ($this->console->getLogs() as $log) {
+			switch($log['type']) {
+				case 'log':
+					$message = array(
+						'message' => print_r($log['data'], true),
+						'type'    => 'log'
+					);
+					$console_data['meta']['log']++;
+					break;
+				case 'memory':
+					$message = array(
+						'message' => (!empty($log['data_type']) ? "{$log['data_type']}: " : '') . $log['name'],
+						'data'    => $this->getReadableMemory($log['data']),
+						'type'    => 'memory'
+					);
+					$console_data['meta']['memory']++;
+					break;
+				case 'error':
+					$message = array(
+						'message' => "Line {$log['line']}: {$log['data']} in {$log['file']}",
+						'type'    => 'error'
+					);
+					$console_data['meta']['error']++;
+					break;
+				case 'speed':
+					$elapsedTime = $log['data'] - $this->startTime;
+					$message = array(
+						'message' => $log['name'],
+						'data'    => $this->getReadableTime($elapsedTime),
+						'type'    => 'speed'
+					);
+					$console_data['meta']['speed']++;
+					break;
+				default:
+					$message = array(
+						'message' => "Unrecognized console log type: {$log['type']}",
+						'type'    => 'error'
+					);
+					$console_data['meta']['error']++;
+					break;
+			}
+			array_push($console_data['messages'], $message);
+		}
+		return $console_data;
+	}
+
+	/**
+	 * Sets file data
+	 *
+	 * @param array $data
+	 */
+	public function setFileData(array $data)
+	{
+		$this->fileData = $data;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function formatFileData()
+	{
+		$fileData = array(
+			'messages' => array(),
+			'meta'     => array(
+				'count'   => count($this->fileData),
+				'size'    => 0,
+				'largest' => 0
+			)
+		);
+
+		foreach ($this->fileData as $file) {
+			array_push($fileData['messages'], array(
+				'message' => $file['name'],
+				'data'    => $this->getReadableMemory($file['size'])
+			));
+
+			$fileData['meta']['size'] += $file['size'];
+			if ($file['size'] > $fileData['meta']['largest']) {
+				$fileData['meta']['largest'] = $file['size'];
+			}
+		}
+
+		$fileData['meta']['size'] = $this->getReadableMemory($fileData['meta']['size']);
+		$fileData['meta']['largest'] = $this->getReadableMemory($fileData['meta']['largest']);
+
+		return $fileData;
+	}
+
+	/**
+	 * Sets memory data
+	 *
+	 * @param array $data
+	 */
+	public function setMemoryData(array $data)
+	{
+		$this->memoryData = $data;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function formatMemoryData()
+	{
+		return array(
+			'meta' => array(
+				'used'    => $this->getReadableMemory($this->memoryData['used']),
+				'allowed' => $this->memoryData['allowed']
+			)
+		);
+	}
+
+	/**
+	 * Sets query data
+	 *
+	 * @param array $data
+	 */
+	public function setQueryData(array $data)
+	{
+		$this->queryData = $data;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function formatQueryData()
+	{
+		$queryData = array(
+			'messages' => array(),
+			'meta'     => array(
+				'count'   => count($this->queryData),
+				'time'    => 0,
+				'slowest' => 0
+			)
+		);
+
+		foreach ($this->queryData as $query) {
+			array_push($queryData['messages'], array(
+				'message'  => $query['sql'],
+				'sub_data' => array_filter($query['explain']),
+				'data'     => $this->getReadableTime($query['time'])
+			));
+			$queryData['meta']['time'] += $query['time'];
+			if ($query['time'] > $queryData['meta']['slowest']) {
+				$queryData['meta']['slowest'] = $query['time'];
+			}
+		}
+
+		$queryData['meta']['time'] = $this->getReadableTime($queryData['meta']['time']);
+		$queryData['meta']['slowest'] = $this->getReadableTime($queryData['meta']['slowest']);
+
+		return $queryData;
+	}
+
+	/**
+	 * Sets speed data
+	 *
+	 * @param array $data
+	 */
+	public function setSpeedData(array $data)
+	{
+		$this->speedData = $data;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function formatSpeedData()
+	{
+		return array(
+			'meta' => array(
+			  'elapsed' => $this->getReadableTime($this->speedData['elapsed']),
+			  'allowed' => $this->getReadableTime($this->speedData['allowed'], 0)
+			)
+		);
+	}
+
+	/**
+	 * Formatter for human-readable time
+	 * Only handles time up to 60 minutes gracefully
+	 *
+	 * @param double  $time
+	 * @param integer $percision
+	 * @return string
+	 */
+	protected function getReadableTime($time, $percision = 3)
+	{
+		$unit = 's';
+		if ($time < 1) {
+			$time *= 1000;
+			$unit = 'ms';
+		} else if ($time > 60) {
+			$time /= 60;
+			$unit = 'm';
+		}
+		$time = number_format($time, $percision);
+		return "{$time} {$unit}";
+	}
+
+	/**
+	 * Formatter for human-readable memory
+	 * Only handles time up to a few gigs gracefully
+	 *
+	 * @param double  $size
+	 * @param integer $percision
+	 */
+	protected function getReadableMemory($size, $percision = 2)
+	{
+		$unitOptions = array('b', 'k', 'M', 'G');
+
+		$base = log($size, 1024);
+
+		$memory = round(pow(1024, $base - floor($base)), $percision);
+		$unit = $unitOptions[floor($base)];
+		return "{$memory} {$unit}";
+	}
  
-    public function __invoke()
-    {
-        $console= $this->formatConsoleData();
-        $speed= $this->formatSpeedData();
-        $query= $this->formatQueryData();
-        $memory= $this->formatMemoryData();
-        $files= $this->formatFileData();
-
-        $header = array(
-          'console' => count($console['messages']),
-          'speed'   => $speed['meta']['elapsed'],
-          'query'   => $query['meta']['count'],
-          'memory'  => $memory['meta']['used'],
-          'files'   => $files['meta']['count']
-        );
-
-        $speed['messages'] = array_filter($console['messages'], function ($message) {
-            return $message['type'] == 'speed';
-        });
-
-        $memory['messages'] = array_filter($console['messages'], function ($message) {
-            return $message['type'] == 'memory';
-        });
-
-        // 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.html';
-    }
+	public function __invoke()
+	{
+		$console= $this->formatConsoleData();
+		$speed= $this->formatSpeedData();
+		$query= $this->formatQueryData();
+		$memory= $this->formatMemoryData();
+		$files= $this->formatFileData();
+
+		$header = array(
+		  'console' => count($console['messages']),
+		  'speed'   => $speed['meta']['elapsed'],
+		  'query'   => $query['meta']['count'],
+		  'memory'  => $memory['meta']['used'],
+		  'files'   => $files['meta']['count']
+		);
+
+		$speed['messages'] = array_filter($console['messages'], function ($message) {
+			return $message['type'] == 'speed';
+		});
+
+		$memory['messages'] = array_filter($console['messages'], function ($message) {
+			return $message['type'] == 'memory';
+		});
+
+		// 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.html';
+	}
 }