jacobemerick / pqp

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

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/helpers/function-overrides.php';
-require_once __DIR__ . '/helpers/LoggingPdo.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/helpers/function-overrides.php';
+require_once __DIR__.'/helpers/LoggingPdo.php';

src/PhpQuickProfiler.php

Indentation +190 added lines, -190 removed lines

@@ -17,194 +17,194 @@
 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->setStartTime($this->startTime);
-        $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->setStartTime($this->startTime);
+		$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/PhpQuickProfilerTest.php

Indentation +321 added lines, -321 removed lines

@@ -8,19 +8,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
@@ -28,318 +28,318 @@ 
                 ('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();
-
-        $reflectedProfiler = new ReflectionClass(get_class($profiler));
-        $reflectedProperty = $reflectedProfiler->getProperty('startTime');
-        $reflectedProperty->setAccessible(true);
-        $startTime = $reflectedProperty->getValue($profiler);
-
-        $expectedDisplay = new Display();
-        $expectedDisplay->setStartTime($startTime);
-        $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();
+
+		$reflectedProfiler = new ReflectionClass(get_class($profiler));
+		$reflectedProperty = $reflectedProfiler->getProperty('startTime');
+		$reflectedProperty->setAccessible(true);
+		$startTime = $reflectedProperty->getValue($profiler);
+
+		$expectedDisplay = new Display();
+		$expectedDisplay->setStartTime($startTime);
+		$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;
+	}
 }

tests/helpers/function-overrides.php

Indentation +14 added lines, -14 removed lines

@@ -5,43 +5,43 @@
 // 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_usage()
 {
-    return 12345678;
+	return 12345678;
 }
 
 // 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/unit/DisplayTest.php

Doc Comments +8 added lines

@@ -228,6 +228,10 @@ 
         );
     }
 
+    /**
+     * @param Console $class
+     * @param string $property
+     */
     protected function setInternalProperty($class, $property, $value)
     {
         $reflectedClass = new ReflectionClass(get_class($class));
@@ -236,6 +240,10 @@ 
         $reflectedProperty->setValue($class, $value);
     }
 
+    /**
+     * @param Display $class
+     * @param string $method
+     */
     protected function getAccessibleMethod($class, $method)
     {
         $reflectedClass = new ReflectionClass(get_class($class));

Indentation +512 added lines, -512 removed lines

@@ -9,516 +9,516 @@
 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);
-
-        $display = new Display();
-        $this->assertAttributeEquals($defaults, 'options', $display);
-        $this->assertAttributeGreaterThan(0, 'pathTrimStart', $display);
-
-        $options = array(
-            'script_path' => 'testing/testing.js',
-            'fake_key' => 'foo bar',
-            'relative_path' => false,
-        );
-        $expectedOptions = array_intersect_key($options, $defaults);
-        $expectedOptions = array_replace($defaults, $expectedOptions);
-        $display = new Display($options);
-        $this->assertAttributeEquals($expectedOptions, 'options', $display);
-        $this->assertAttributeEquals(0, 'pathTrimStart', $display);
-    }
-
-    public function testSetStartTime()
-    {
-        $startTime = microtime(true);
-        $display = new Display();
-        $display->setStartTime($startTime);
-
-        $this->assertAttributeEquals($startTime, 'startTime', $display);
-    }
-
-    public function testSetConsole()
-    {
-        $console = new Console();
-        $display = new Display();
-        $display->setConsole($console);
-
-        $this->assertAttributeSame($console, 'console', $display);
-    }
-
-    public function testSetMemoryData()
-    {
-        $memoryData = array(
-            'used'    => memory_get_peak_usage(),
-            'allowed' => ini_get('memory_limit')
-        );
-        $display = new Display();
-        $display->setMemoryData($memoryData);
-
-        $this->assertAttributeEquals($memoryData, 'memoryData', $display);
-    }
-
-    public function testSetQueryData()
-    {
-        $queryData = array(
-            'sql'     => 'SELECT * FROM testing',
-            'explain' => array(
-                'key' => 'value'
-            ),
-            'time'    => 300
-        );
-        $display = new Display();
-        $display->setQueryData($queryData);
-
-        $this->assertAttributeEquals($queryData, 'queryData', $display);
-    }
-
-    public function testSetSpeedData()
-    {
-        $speedData = array(
-            'elapsed' => 1.234,
-            'allowed' => 30
-        );
-        $display = new Display();
-        $display->setSpeedData($speedData);
-
-        $this->assertAttributeEquals($speedData, 'speedData', $display);
-    }
-
-    /**
-     * @dataProvider dataPathTrimStart
-     */
-    public function testGetPathTrimStart($cwd, $dir, $expectedPosition)
-    {
-        $display = new Display();
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getPathTrimStart');
-        $position = $reflectedMethod->invokeArgs($display, array($cwd, $dir));
-
-        $this->assertEquals($expectedPosition, $position);
-    }
-
-    /**
-     * @dataProvider dataConsoleStore
-     */
-    public function testGetConsoleMeta($consoleStore, $expectedMeta, $expectedMessages)
-    {
-        $console = new Console();
-        $this->setInternalProperty($console, 'store', $consoleStore);
-        $display = new Display();
-        $display->setConsole($console);
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getConsoleMeta');
-
-        $consoleMeta = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedMeta, $consoleMeta);
-    }
-
-    /**
-     * @dataProvider dataConsoleStore
-     */
-    public function testGetConsoleMessages($consoleStore, $expectedMeta, $expectedMessages)
-    {
-        $console = new Console();
-        $this->setInternalProperty($console, 'store', $consoleStore);
-        $display = new Display();
-        $display->setConsole($console);
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getConsoleMessages');
-
-        $consoleMessages = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedMessages, $consoleMessages);
-    }
-
-    public function testGetSpeedMeta()
-    {
-        $elapsedTime = 1234.678;
-        $allowedTime = 30;
-        $display = new Display();
-        $display->setSpeedData(array(
-            'elapsed' => $elapsedTime,
-            'allowed' => $allowedTime
-        ));
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getReadableTime');
-        $elapsedTime = $reflectedMethod->invokeArgs($display, array($elapsedTime));
-        $allowedTime = $reflectedMethod->invokeArgs($display, array($allowedTime, 0));
-        $expectedMeta = array(
-            'elapsed' => $elapsedTime,
-            'allowed' => $allowedTime
-        );
-
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getSpeedMeta');
-        $speedMeta = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedMeta, $speedMeta);
-    }
-
-    /**
-     * @dataProvider dataQueryData
-     */
-    public function testGetQueryMeta($queryData, $expectedMeta, $expectedList)
-    {
-        $display = new Display();
-        $display->setQueryData($queryData);
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getQueryMeta');
-
-        $queryMeta = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedMeta, $queryMeta);
-    }
-
-    /**
-     * @dataProvider dataQueryData
-     */
-    public function testGetQueryList($queryData, $expectedMeta, $expectedList)
-    {
-        $display = new Display();
-        $display->setQueryData($queryData);
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getQueryList');
-
-        $queryList = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedList, $queryList);
-    }
-
-    public function testGetMemoryMeta()
-    {
-        $usedMemory = 123456;
-        $allowedMemory = '128M';
-        $display = new Display();
-        $display->setMemoryData(array(
-            'used'    => $usedMemory,
-            'allowed' => $allowedMemory
-        ));
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getReadableMemory');
-        $usedMemory = $reflectedMethod->invokeArgs($display, array($usedMemory));
-        $expectedMeta = array(
-            'used'    => $usedMemory,
-            'allowed' => $allowedMemory
-        );
-
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getMemoryMeta');
-        $memoryMeta = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedMeta, $memoryMeta);
-    }
-
-    /**
-     * @dataProvider dataFileData
-     */
-    public function testGetFileMeta($fileData, $expectedMeta, $expectedList)
-    {
-        $display = new Display();
-        $display->setFileData($fileData);
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getFileMeta');
-
-        $fileMeta = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedMeta, $fileMeta);
-    }
-
-    /**
-     * @dataProvider dataFileData
-     */
-    public function testGetFileList($fileData, $expectedMeta, $expectedList)
-    {
-        $display = new Display();
-        $display->setFileData($fileData);
-        $reflectedMethod = $this->getAccessibleMethod($display, 'getFileList');
-
-        $fileList = $reflectedMethod->invoke($display);
-        $this->assertEquals($expectedList, $fileList);
-    }
-
-    public function testFilterMessages()
-    {
-        $display = new Display();
-        $reflectedMethod = $this->getAccessibleMethod($display, 'filterMessages');
-
-        $filteredMessages = $reflectedMethod->invokeArgs($display, array(array(array(
-            'type' => 'remove'
-        )), 'keep'));
-        $this->assertEmpty($filteredMessages);
-        $filteredMessages = $reflectedMethod->invokeArgs($display, array(array(array(
-            'type' => 'keep'
-        )), 'keep'));
-        $this->assertCount(1, $filteredMessages);
-    }
-
-    public function testGetReadableTime()
-    {
-        $timeTest = array(
-            '.032432' => '32 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);
-        }
-    }
-
-    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);
-        }
-    }
-
-    public function testGetFilePath()
-    {
-        $display = new Display(array('relative_path' => false));
-        $path = getcwd() . '/puppies';
-        $reflectedFilePath = $this->getAccessibleMethod($display, 'getFilePath');
-        $path = $reflectedFilePath->invokeArgs($display, array($path));
-        $expectedPath = getcwd() . '/puppies';
-
-        $this->assertEquals($expectedPath, $path);
-
-        $display = new Display();
-        $path = getcwd() . '/puppies';
-        $reflectedFilePath = $this->getAccessibleMethod($display, 'getFilePath');
-        $path = $reflectedFilePath->invokeArgs($display, array($path));
-        $expectedPath = '/puppies';
-
-        $this->assertEquals($expectedPath, $path);
-    }
-
-    public function dataConsoleStore()
-    {
-        $testException = new Exception('testing');
-        $display = new Display();
-        $reflectedPathTrim = $this->getAccessibleMethod($display, 'getPathTrimStart');
-        $trimStart = $reflectedPathTrim->invokeArgs($display, array(getcwd(), __DIR__));
-        $reflectedTime = $this->getAccessibleMethod($display, 'getReadableTime');
-        $reflectedMemory = $this->getAccessibleMethod($display, 'getReadableMemory');
-
-        return array(
-            array(
-                'store' => array(
-                    array(
-                        'data' => 'testing message',
-                        'type' => 'log'
-                    ),
-                    array(
-                        'name' => 'now',
-                        'data' => microtime(true),
-                        'type' => 'speed'
-                    ),
-                    array(
-                        'name' => 'little later',
-                        'data' => microtime(true) + 1,
-                        'type' => 'speed'
-                    ),
-                    array(
-                        'name' => 'invalid key',
-                        'type' => 'foo'
-                    )
-                ),
-                'meta' => array(
-                    'log'    => 1,
-                    'memory' => 0,
-                    'error'  => 1,
-                    'speed'  => 2
-                ),
-                'messages' => array(
-                    array(
-                        'message' => 'testing message',
-                        'type'    => 'log'
-                    ),
-                    array(
-                        'message' => 'now',
-                        'data'    => $reflectedTime->invokeArgs($display, array(microtime(true))),
-                        'type'    => 'speed'
-                    ),
-                    array(
-                        'message' => 'little later',
-                        'data'    => $reflectedTime->invokeArgs($display, array(microtime(true) + 1)),
-                        'type'    => 'speed'
-                    ),
-                    array(
-                        'message' => 'Unrecognized console log type: foo',
-                        'type'    => 'error'
-                    )
-                )
-            ),
-            array(
-                'store' => array(
-                    array(
-                        'data' => 'another testing message',
-                        'type' => 'log'
-                    ),
-                    array(
-                        'name'      => 'test array',
-                        'data'      => strlen(serialize(array('key' => 'value'))),
-                        'data_type' => 'array',
-                        'type'      => 'memory'
-                    ),
-                    array(
-                        'name'      => 'memory usage test',
-                        'data'      => memory_get_usage(),
-                        'data_type' => '',
-                        'type'      => 'memory'
-                    ),
-                    array(
-                        'data' => $testException->getMessage(),
-                        'file' => $testException->getFile(),
-                        'line' => $testException->getLine(),
-                        'type' => 'error'
-                    )
-                ),
-                'meta' => array(
-                    'log'    => 1,
-                    'memory' => 2,
-                    'error'  => 1,
-                    'speed'  => 0
-                ),
-                'messages' => array(
-                    array(
-                        'message' => 'another testing message',
-                        'type'    => 'log'
-                    ),
-                    array(
-                        'message' => 'array: test array',
-                        'data'    => $reflectedMemory->invokeArgs(
-                            $display,
-                            array(strlen(serialize(array('key' => 'value'))))
-                        ),
-                        'type'    => 'memory'
-                    ),
-                    array(
-                        'message' => 'memory usage test',
-                        'data'    => $reflectedMemory->invokeArgs($display, array(memory_get_usage())),
-                        'type'    => 'memory'
-                    ),
-                    array(
-                        'message' => sprintf(
-                            'Line %s: %s in %s',
-                            $testException->getLine(),
-                            $testException->getMessage(),
-                            substr($testException->getFile(), $trimStart)
-                        ),
-                        'type'    => 'error'
-                    )
-                )
-            )
-        );
-    }
-
-    public function dataPathTrimStart()
-    {
-        return array(
-            array(
-                'cwd' => '/Users/fakeUser/project',
-                'dir' => '/Users/fakeUser/project/vendor/particletree/pqp/tests/unit',
-                'expectedPosition' => 23,
-            ),
-            array(
-                'cwd' => '/Users/fakeUser/project/public/path',
-                'dir' => '/Users/fakeUser/project/vendor/particletree/pqp/tests/unit',
-                'expectedPosition' => 24,
-            ),
-        );
-    }
-
-    public function dataQueryData()
-    {
-        $display = new Display();
-        $reflectedTime = $this->getAccessibleMethod($display, 'getReadableTime');
-
-        return array(
-            array(
-                'data' => array(
-                    array(
-                        'sql'     => "SELECT * FROM testing",
-                        'explain' => array('empty_key' => ''),
-                        'time'    => 25
-                    ),
-                    array(
-                        'sql'     => "SELECT id FROM testing WHERE title = :title",
-                        'explain' => array('key' => 'value'),
-                        'time'    => 5
-                    )
-                ),
-                'meta' => array(
-                    'count'   => 2,
-                    'time'    => $reflectedTime->invokeArgs($display, array(30)),
-                    'slowest' => $reflectedTime->invokeArgs($display, array(25)),
-                ),
-                'list' => array(
-                    array(
-                        'message'  => 'SELECT * FROM testing',
-                        'sub_data' => array(),
-                        'data'     => $reflectedTime->invokeArgs($display, array(25))
-                    ),
-                    array(
-                        'message'  => 'SELECT id FROM testing WHERE title = :title',
-                        'sub_data' => array('key' => 'value'),
-                        'data'     => $reflectedTime->invokeArgs($display, array(5))
-                    )
-                )
-            )
-        );
-    }
-
-    public function dataFileData()
-    {
-        $display = new Display();
-        $reflectedMemory = $this->getAccessibleMethod($display, 'getReadableMemory');
-
-        return array(
-            array(
-                'data' => array(
-                    array(
-                        'name' => getcwd() . '/test-file',
-                        'size' => 1234
-                    ),
-                    array(
-                        'name' => getcwd() . '/test-file-2',
-                        'size' => 66
-                    )
-                ),
-                'meta' => array(
-                    'count'   => 2,
-                    'size'    => $reflectedMemory->invokeArgs($display, array(1300)),
-                    'largest' => $reflectedMemory->invokeArgs($display, array(1234)),
-                ),
-                'list' => array(
-                    array(
-                        'message' => '/test-file',
-                        'data'    => $reflectedMemory->invokeArgs($display, array(1234))
-                    ),
-                    array(
-                        'message' => '/test-file-2',
-                        'data'    => $reflectedMemory->invokeArgs($display, array(66))
-                    )
-                )
-            )
-        );
-    }
-
-    protected function setInternalProperty($class, $property, $value)
-    {
-        $reflectedClass = new ReflectionClass(get_class($class));
-        $reflectedProperty = $reflectedClass->getProperty($property);
-        $reflectedProperty->setAccessible(true);
-        $reflectedProperty->setValue($class, $value);
-    }
-
-    protected function getAccessibleMethod($class, $method)
-    {
-        $reflectedClass = new ReflectionClass(get_class($class));
-        $reflectedMethod = $reflectedClass->getMethod($method);
-        $reflectedMethod->setAccessible(true);
-        return $reflectedMethod;
-    }
+	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);
+		$this->assertAttributeGreaterThan(0, 'pathTrimStart', $display);
+
+		$options = array(
+			'script_path' => 'testing/testing.js',
+			'fake_key' => 'foo bar',
+			'relative_path' => false,
+		);
+		$expectedOptions = array_intersect_key($options, $defaults);
+		$expectedOptions = array_replace($defaults, $expectedOptions);
+		$display = new Display($options);
+		$this->assertAttributeEquals($expectedOptions, 'options', $display);
+		$this->assertAttributeEquals(0, 'pathTrimStart', $display);
+	}
+
+	public function testSetStartTime()
+	{
+		$startTime = microtime(true);
+		$display = new Display();
+		$display->setStartTime($startTime);
+
+		$this->assertAttributeEquals($startTime, 'startTime', $display);
+	}
+
+	public function testSetConsole()
+	{
+		$console = new Console();
+		$display = new Display();
+		$display->setConsole($console);
+
+		$this->assertAttributeSame($console, 'console', $display);
+	}
+
+	public function testSetMemoryData()
+	{
+		$memoryData = array(
+			'used'    => memory_get_peak_usage(),
+			'allowed' => ini_get('memory_limit')
+		);
+		$display = new Display();
+		$display->setMemoryData($memoryData);
+
+		$this->assertAttributeEquals($memoryData, 'memoryData', $display);
+	}
+
+	public function testSetQueryData()
+	{
+		$queryData = array(
+			'sql'     => 'SELECT * FROM testing',
+			'explain' => array(
+				'key' => 'value'
+			),
+			'time'    => 300
+		);
+		$display = new Display();
+		$display->setQueryData($queryData);
+
+		$this->assertAttributeEquals($queryData, 'queryData', $display);
+	}
+
+	public function testSetSpeedData()
+	{
+		$speedData = array(
+			'elapsed' => 1.234,
+			'allowed' => 30
+		);
+		$display = new Display();
+		$display->setSpeedData($speedData);
+
+		$this->assertAttributeEquals($speedData, 'speedData', $display);
+	}
+
+	/**
+	 * @dataProvider dataPathTrimStart
+	 */
+	public function testGetPathTrimStart($cwd, $dir, $expectedPosition)
+	{
+		$display = new Display();
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getPathTrimStart');
+		$position = $reflectedMethod->invokeArgs($display, array($cwd, $dir));
+
+		$this->assertEquals($expectedPosition, $position);
+	}
+
+	/**
+	 * @dataProvider dataConsoleStore
+	 */
+	public function testGetConsoleMeta($consoleStore, $expectedMeta, $expectedMessages)
+	{
+		$console = new Console();
+		$this->setInternalProperty($console, 'store', $consoleStore);
+		$display = new Display();
+		$display->setConsole($console);
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getConsoleMeta');
+
+		$consoleMeta = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedMeta, $consoleMeta);
+	}
+
+	/**
+	 * @dataProvider dataConsoleStore
+	 */
+	public function testGetConsoleMessages($consoleStore, $expectedMeta, $expectedMessages)
+	{
+		$console = new Console();
+		$this->setInternalProperty($console, 'store', $consoleStore);
+		$display = new Display();
+		$display->setConsole($console);
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getConsoleMessages');
+
+		$consoleMessages = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedMessages, $consoleMessages);
+	}
+
+	public function testGetSpeedMeta()
+	{
+		$elapsedTime = 1234.678;
+		$allowedTime = 30;
+		$display = new Display();
+		$display->setSpeedData(array(
+			'elapsed' => $elapsedTime,
+			'allowed' => $allowedTime
+		));
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getReadableTime');
+		$elapsedTime = $reflectedMethod->invokeArgs($display, array($elapsedTime));
+		$allowedTime = $reflectedMethod->invokeArgs($display, array($allowedTime, 0));
+		$expectedMeta = array(
+			'elapsed' => $elapsedTime,
+			'allowed' => $allowedTime
+		);
+
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getSpeedMeta');
+		$speedMeta = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedMeta, $speedMeta);
+	}
+
+	/**
+	 * @dataProvider dataQueryData
+	 */
+	public function testGetQueryMeta($queryData, $expectedMeta, $expectedList)
+	{
+		$display = new Display();
+		$display->setQueryData($queryData);
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getQueryMeta');
+
+		$queryMeta = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedMeta, $queryMeta);
+	}
+
+	/**
+	 * @dataProvider dataQueryData
+	 */
+	public function testGetQueryList($queryData, $expectedMeta, $expectedList)
+	{
+		$display = new Display();
+		$display->setQueryData($queryData);
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getQueryList');
+
+		$queryList = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedList, $queryList);
+	}
+
+	public function testGetMemoryMeta()
+	{
+		$usedMemory = 123456;
+		$allowedMemory = '128M';
+		$display = new Display();
+		$display->setMemoryData(array(
+			'used'    => $usedMemory,
+			'allowed' => $allowedMemory
+		));
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getReadableMemory');
+		$usedMemory = $reflectedMethod->invokeArgs($display, array($usedMemory));
+		$expectedMeta = array(
+			'used'    => $usedMemory,
+			'allowed' => $allowedMemory
+		);
+
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getMemoryMeta');
+		$memoryMeta = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedMeta, $memoryMeta);
+	}
+
+	/**
+	 * @dataProvider dataFileData
+	 */
+	public function testGetFileMeta($fileData, $expectedMeta, $expectedList)
+	{
+		$display = new Display();
+		$display->setFileData($fileData);
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getFileMeta');
+
+		$fileMeta = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedMeta, $fileMeta);
+	}
+
+	/**
+	 * @dataProvider dataFileData
+	 */
+	public function testGetFileList($fileData, $expectedMeta, $expectedList)
+	{
+		$display = new Display();
+		$display->setFileData($fileData);
+		$reflectedMethod = $this->getAccessibleMethod($display, 'getFileList');
+
+		$fileList = $reflectedMethod->invoke($display);
+		$this->assertEquals($expectedList, $fileList);
+	}
+
+	public function testFilterMessages()
+	{
+		$display = new Display();
+		$reflectedMethod = $this->getAccessibleMethod($display, 'filterMessages');
+
+		$filteredMessages = $reflectedMethod->invokeArgs($display, array(array(array(
+			'type' => 'remove'
+		)), 'keep'));
+		$this->assertEmpty($filteredMessages);
+		$filteredMessages = $reflectedMethod->invokeArgs($display, array(array(array(
+			'type' => 'keep'
+		)), 'keep'));
+		$this->assertCount(1, $filteredMessages);
+	}
+
+	public function testGetReadableTime()
+	{
+		$timeTest = array(
+			'.032432' => '32 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);
+		}
+	}
+
+	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);
+		}
+	}
+
+	public function testGetFilePath()
+	{
+		$display = new Display(array('relative_path' => false));
+		$path = getcwd() . '/puppies';
+		$reflectedFilePath = $this->getAccessibleMethod($display, 'getFilePath');
+		$path = $reflectedFilePath->invokeArgs($display, array($path));
+		$expectedPath = getcwd() . '/puppies';
+
+		$this->assertEquals($expectedPath, $path);
+
+		$display = new Display();
+		$path = getcwd() . '/puppies';
+		$reflectedFilePath = $this->getAccessibleMethod($display, 'getFilePath');
+		$path = $reflectedFilePath->invokeArgs($display, array($path));
+		$expectedPath = '/puppies';
+
+		$this->assertEquals($expectedPath, $path);
+	}
+
+	public function dataConsoleStore()
+	{
+		$testException = new Exception('testing');
+		$display = new Display();
+		$reflectedPathTrim = $this->getAccessibleMethod($display, 'getPathTrimStart');
+		$trimStart = $reflectedPathTrim->invokeArgs($display, array(getcwd(), __DIR__));
+		$reflectedTime = $this->getAccessibleMethod($display, 'getReadableTime');
+		$reflectedMemory = $this->getAccessibleMethod($display, 'getReadableMemory');
+
+		return array(
+			array(
+				'store' => array(
+					array(
+						'data' => 'testing message',
+						'type' => 'log'
+					),
+					array(
+						'name' => 'now',
+						'data' => microtime(true),
+						'type' => 'speed'
+					),
+					array(
+						'name' => 'little later',
+						'data' => microtime(true) + 1,
+						'type' => 'speed'
+					),
+					array(
+						'name' => 'invalid key',
+						'type' => 'foo'
+					)
+				),
+				'meta' => array(
+					'log'    => 1,
+					'memory' => 0,
+					'error'  => 1,
+					'speed'  => 2
+				),
+				'messages' => array(
+					array(
+						'message' => 'testing message',
+						'type'    => 'log'
+					),
+					array(
+						'message' => 'now',
+						'data'    => $reflectedTime->invokeArgs($display, array(microtime(true))),
+						'type'    => 'speed'
+					),
+					array(
+						'message' => 'little later',
+						'data'    => $reflectedTime->invokeArgs($display, array(microtime(true) + 1)),
+						'type'    => 'speed'
+					),
+					array(
+						'message' => 'Unrecognized console log type: foo',
+						'type'    => 'error'
+					)
+				)
+			),
+			array(
+				'store' => array(
+					array(
+						'data' => 'another testing message',
+						'type' => 'log'
+					),
+					array(
+						'name'      => 'test array',
+						'data'      => strlen(serialize(array('key' => 'value'))),
+						'data_type' => 'array',
+						'type'      => 'memory'
+					),
+					array(
+						'name'      => 'memory usage test',
+						'data'      => memory_get_usage(),
+						'data_type' => '',
+						'type'      => 'memory'
+					),
+					array(
+						'data' => $testException->getMessage(),
+						'file' => $testException->getFile(),
+						'line' => $testException->getLine(),
+						'type' => 'error'
+					)
+				),
+				'meta' => array(
+					'log'    => 1,
+					'memory' => 2,
+					'error'  => 1,
+					'speed'  => 0
+				),
+				'messages' => array(
+					array(
+						'message' => 'another testing message',
+						'type'    => 'log'
+					),
+					array(
+						'message' => 'array: test array',
+						'data'    => $reflectedMemory->invokeArgs(
+							$display,
+							array(strlen(serialize(array('key' => 'value'))))
+						),
+						'type'    => 'memory'
+					),
+					array(
+						'message' => 'memory usage test',
+						'data'    => $reflectedMemory->invokeArgs($display, array(memory_get_usage())),
+						'type'    => 'memory'
+					),
+					array(
+						'message' => sprintf(
+							'Line %s: %s in %s',
+							$testException->getLine(),
+							$testException->getMessage(),
+							substr($testException->getFile(), $trimStart)
+						),
+						'type'    => 'error'
+					)
+				)
+			)
+		);
+	}
+
+	public function dataPathTrimStart()
+	{
+		return array(
+			array(
+				'cwd' => '/Users/fakeUser/project',
+				'dir' => '/Users/fakeUser/project/vendor/particletree/pqp/tests/unit',
+				'expectedPosition' => 23,
+			),
+			array(
+				'cwd' => '/Users/fakeUser/project/public/path',
+				'dir' => '/Users/fakeUser/project/vendor/particletree/pqp/tests/unit',
+				'expectedPosition' => 24,
+			),
+		);
+	}
+
+	public function dataQueryData()
+	{
+		$display = new Display();
+		$reflectedTime = $this->getAccessibleMethod($display, 'getReadableTime');
+
+		return array(
+			array(
+				'data' => array(
+					array(
+						'sql'     => "SELECT * FROM testing",
+						'explain' => array('empty_key' => ''),
+						'time'    => 25
+					),
+					array(
+						'sql'     => "SELECT id FROM testing WHERE title = :title",
+						'explain' => array('key' => 'value'),
+						'time'    => 5
+					)
+				),
+				'meta' => array(
+					'count'   => 2,
+					'time'    => $reflectedTime->invokeArgs($display, array(30)),
+					'slowest' => $reflectedTime->invokeArgs($display, array(25)),
+				),
+				'list' => array(
+					array(
+						'message'  => 'SELECT * FROM testing',
+						'sub_data' => array(),
+						'data'     => $reflectedTime->invokeArgs($display, array(25))
+					),
+					array(
+						'message'  => 'SELECT id FROM testing WHERE title = :title',
+						'sub_data' => array('key' => 'value'),
+						'data'     => $reflectedTime->invokeArgs($display, array(5))
+					)
+				)
+			)
+		);
+	}
+
+	public function dataFileData()
+	{
+		$display = new Display();
+		$reflectedMemory = $this->getAccessibleMethod($display, 'getReadableMemory');
+
+		return array(
+			array(
+				'data' => array(
+					array(
+						'name' => getcwd() . '/test-file',
+						'size' => 1234
+					),
+					array(
+						'name' => getcwd() . '/test-file-2',
+						'size' => 66
+					)
+				),
+				'meta' => array(
+					'count'   => 2,
+					'size'    => $reflectedMemory->invokeArgs($display, array(1300)),
+					'largest' => $reflectedMemory->invokeArgs($display, array(1234)),
+				),
+				'list' => array(
+					array(
+						'message' => '/test-file',
+						'data'    => $reflectedMemory->invokeArgs($display, array(1234))
+					),
+					array(
+						'message' => '/test-file-2',
+						'data'    => $reflectedMemory->invokeArgs($display, array(66))
+					)
+				)
+			)
+		);
+	}
+
+	protected function setInternalProperty($class, $property, $value)
+	{
+		$reflectedClass = new ReflectionClass(get_class($class));
+		$reflectedProperty = $reflectedClass->getProperty($property);
+		$reflectedProperty->setAccessible(true);
+		$reflectedProperty->setValue($class, $value);
+	}
+
+	protected function getAccessibleMethod($class, $method)
+	{
+		$reflectedClass = new ReflectionClass(get_class($class));
+		$reflectedMethod = $reflectedClass->getMethod($method);
+		$reflectedMethod->setAccessible(true);
+		return $reflectedMethod;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -277,15 +277,15 @@ 
     public function testGetFilePath()
     {
         $display = new Display(array('relative_path' => false));
-        $path = getcwd() . '/puppies';
+        $path = getcwd().'/puppies';
         $reflectedFilePath = $this->getAccessibleMethod($display, 'getFilePath');
         $path = $reflectedFilePath->invokeArgs($display, array($path));
-        $expectedPath = getcwd() . '/puppies';
+        $expectedPath = getcwd().'/puppies';
 
         $this->assertEquals($expectedPath, $path);
 
         $display = new Display();
-        $path = getcwd() . '/puppies';
+        $path = getcwd().'/puppies';
         $reflectedFilePath = $this->getAccessibleMethod($display, 'getFilePath');
         $path = $reflectedFilePath->invokeArgs($display, array($path));
         $expectedPath = '/puppies';
@@ -479,11 +479,11 @@ 
             array(
                 'data' => array(
                     array(
-                        'name' => getcwd() . '/test-file',
+                        'name' => getcwd().'/test-file',
                         'size' => 1234
                     ),
                     array(
-                        'name' => getcwd() . '/test-file-2',
+                        'name' => getcwd().'/test-file-2',
                         'size' => 66
                     )
                 ),

src/Display.php

Spacing +10 added lines, -10 removed lines

@@ -144,7 +144,7 @@ 
                     break;
                 case 'memory':
                     $message = array(
-                        'message' => (!empty($log['data_type']) ? "{$log['data_type']}: " : '') . $log['name'],
+                        'message' => (!empty($log['data_type']) ? "{$log['data_type']}: " : '').$log['name'],
                         'data'    => $this->getReadableMemory($log['data']),
                         'type'    => 'memory'
                     );
@@ -195,11 +195,11 @@ 
     public function getQueryMeta()
     {
         $queryCount = count($this->queryData);
-        $queryTotalTime = array_reduce($this->queryData, function ($sum, $row) {
+        $queryTotalTime = array_reduce($this->queryData, function($sum, $row) {
             return $sum + $row['time'];
         }, 0);
         $queryTotalTime = $this->getReadableTime($queryTotalTime);
-        $querySlowestTime = array_reduce($this->queryData, function ($slowest, $row) {
+        $querySlowestTime = array_reduce($this->queryData, function($slowest, $row) {
             return ($slowest < $row['time']) ? $row['time'] : $slowest;
         }, 0);
         $querySlowestTime = $this->getReadableTime($querySlowestTime);
@@ -247,11 +247,11 @@ 
     protected function getFileMeta()
     {
         $fileCount = count($this->fileData);
-        $fileTotalSize = array_reduce($this->fileData, function ($sum, $row) {
+        $fileTotalSize = array_reduce($this->fileData, function($sum, $row) {
             return $sum + $row['size'];
         }, 0);
         $fileTotalSize = $this->getReadableMemory($fileTotalSize);
-        $fileLargestSize = array_reduce($this->fileData, function ($largest, $row) {
+        $fileLargestSize = array_reduce($this->fileData, function($largest, $row) {
             return ($largest < $row['size']) ? $row['size'] : $largest;
         }, 0);
         $fileLargestSize = $this->getReadableMemory($fileLargestSize);
@@ -325,7 +325,7 @@ 
      */
     protected function filterMessages($messages, $type)
     {
-        return array_filter($messages, function ($message) use ($type) {
+        return array_filter($messages, function($message) use ($type) {
             return $message['type'] == $type;
         });
     }
@@ -381,12 +381,12 @@ 
         $templateData = $this->gatherTemplateData();
 
         // 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']}");
 
-        call_user_func(function () use ($templateData, $styles, $script) {
+        call_user_func(function() use ($templateData, $styles, $script) {
             extract($templateData);
-            require_once __DIR__ . '/../asset/display.html';
+            require_once __DIR__.'/../asset/display.html';
         });
     }
 }

Indentation +411 added lines, -411 removed lines

@@ -14,415 +14,415 @@
 class Display
 {
 
-    /** @var  array */
-    protected $defaults = array(
-        'relative_path' => true,
-        'script_path' => 'asset/script.js',
-        'style_path' => 'asset/style.css'
-    );
-
-    /** @var  array */
-    protected $options;
-
-    /** @var  double */
-    protected $startTime;
-
-    /** @var  Console */
-    protected $console;
-
-    /** @var  array */
-    protected $speedData;
-
-    /** @var  array */
-    protected $queryData;
-
-    /** @var  array */
-    protected $memoryData;
-
-    /** @var  array */
-    protected $fileData;
-
-    /** @var  integer */
-    protected $pathTrimStart = 0;
-
-    /**
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $options = array_intersect_key($options, $this->defaults);
-        $this->options = array_replace($this->defaults, $options);
-
-        if ($this->options['relative_path']) {
-            $this->pathTrimStart = $this->getPathTrimStart(getcwd(), __DIR__);
-        }
-    }
-
-    /**
-     * @param double $startTime
-     */
-    public function setStartTime($startTime)
-    {
-        $this->startTime = $startTime;
-    }
-
-    /**
-     * @param Console $console
-     */
-    public function setConsole(Console $console)
-    {
-        $this->console = $console;
-    }
-
-    /**
-     * Sets memory data
-     *
-     * @param array $data
-     */
-    public function setMemoryData(array $data)
-    {
-        $this->memoryData = $data;
-    }
-
-    /**
-     * Sets query data
-     *
-     * @param array $data
-     */
-    public function setQueryData(array $data)
-    {
-        $this->queryData = $data;
-    }
-
-    /**
-     * Sets speed data
-     *
-     * @param array $data
-     */
-    public function setSpeedData(array $data)
-    {
-        $this->speedData = $data;
-    }
-
-    /**
-     * Sets file data
-     *
-     * @param array $data
-     */
-    public function setFileData(array $data)
-    {
-        $this->fileData = $data;
-    }
-
-    /**
-     * @return integer
-     */
-    protected function getPathTrimStart($cwd, $dir)
-    {
-        for ($pos = 0; $pos <= strlen($cwd); $pos++) {
-            if (strncmp($cwd, $dir, $pos + 1) !== 0) {
-                break;
-            }
-        }
-
-        return $pos;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getConsoleMeta()
-    {
-        $consoleMeta = array(
-            'log' => 0,
-            'memory' => 0,
-            'error' => 0,
-            'speed' => 0
-        );
-        foreach ($this->console->getLogs() as $log) {
-            if (array_key_exists($log['type'], $consoleMeta)) {
-                $consoleMeta[$log['type']]++;
-                continue;
-            }
-            $consoleMeta['error']++;
-        }
-
-        return $consoleMeta;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getConsoleMessages()
-    {
-        $messages = array();
-        foreach ($this->console->getLogs() as $log) {
-            switch ($log['type']) {
-                case 'log':
-                    $message = array(
-                        'message' => print_r($log['data'], true),
-                        'type'    => 'log'
-                    );
-                    break;
-                case 'memory':
-                    $message = array(
-                        'message' => (!empty($log['data_type']) ? "{$log['data_type']}: " : '') . $log['name'],
-                        'data'    => $this->getReadableMemory($log['data']),
-                        'type'    => 'memory'
-                    );
-                    break;
-                case 'error':
-                    $message = array(
-                        'message' => "Line {$log['line']}: {$log['data']} in {$this->getFilePath($log['file'])}",
-                        'type'    => 'error'
-                    );
-                    break;
-                case 'speed':
-                    $elapsedTime = $log['data'] - $this->startTime;
-                    $message = array(
-                        'message' => $log['name'],
-                        'data'    => $this->getReadableTime($elapsedTime),
-                        'type'    => 'speed'
-                    );
-                    break;
-                default:
-                    $message = array(
-                        'message' => "Unrecognized console log type: {$log['type']}",
-                        'type'    => 'error'
-                    );
-                    break;
-            }
-            array_push($messages, $message);
-        }
-        return $messages;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getSpeedMeta()
-    {
-        $elapsedTime = $this->getReadableTime($this->speedData['elapsed']);
-        $allowedTime = $this->getReadableTime($this->speedData['allowed'], 0);
-
-        return array(
-            'elapsed' => $elapsedTime,
-            'allowed' => $allowedTime,
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function getQueryMeta()
-    {
-        $queryCount = count($this->queryData);
-        $queryTotalTime = array_reduce($this->queryData, function ($sum, $row) {
-            return $sum + $row['time'];
-        }, 0);
-        $queryTotalTime = $this->getReadableTime($queryTotalTime);
-        $querySlowestTime = array_reduce($this->queryData, function ($slowest, $row) {
-            return ($slowest < $row['time']) ? $row['time'] : $slowest;
-        }, 0);
-        $querySlowestTime = $this->getReadableTime($querySlowestTime);
-
-        return array(
-            'count'   => $queryCount,
-            'time'    => $queryTotalTime,
-            'slowest' => $querySlowestTime
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function getQueryList()
-    {
-        $queryList = array();
-        foreach ($this->queryData as $query) {
-            array_push($queryList, array(
-                'message'  => $query['sql'],
-                'sub_data' => array_filter($query['explain']),
-                'data'     => $this->getReadableTime($query['time'])
-            ));
-        }
-        return $queryList;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMemoryMeta()
-    {
-        $usedMemory = $this->getReadableMemory($this->memoryData['used']);
-        $allowedMemory = $this->memoryData['allowed']; // todo parse this, maybe?
-
-        return array(
-            'used'    => $usedMemory,
-            'allowed' => $allowedMemory
-        );
-    }
-
-    /**
-     * @return array
-     */
-    protected function getFileMeta()
-    {
-        $fileCount = count($this->fileData);
-        $fileTotalSize = array_reduce($this->fileData, function ($sum, $row) {
-            return $sum + $row['size'];
-        }, 0);
-        $fileTotalSize = $this->getReadableMemory($fileTotalSize);
-        $fileLargestSize = array_reduce($this->fileData, function ($largest, $row) {
-            return ($largest < $row['size']) ? $row['size'] : $largest;
-        }, 0);
-        $fileLargestSize = $this->getReadableMemory($fileLargestSize);
-
-        return array(
-            'count' => $fileCount,
-            'size' => $fileTotalSize,
-            'largest' => $fileLargestSize
-        );
-    }
-
-    /**
-     * @return array
-     */
-    protected function getFileList()
-    {
-        $fileList = array();
-        foreach ($this->fileData as $file) {
-            array_push($fileList, array(
-                'message' => $this->getFilePath($file['name']),
-                'data'    => $this->getReadableMemory($file['size'])
-            ));
-        }
-        return $fileList;
-    }
-
-    /**
-     * 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;
-            $percision = 0;
-            $unit = 'ms';
-        } elseif ($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}";
-    }
-
-    /**
-     * @param string $path
-     * @return string
-     */
-    protected function getFilePath($path)
-    {
-        if (!$this->options['relative_path']) {
-            return $path;
-        }
-
-        return substr($path, $this->pathTrimStart);
-    }
-
-    /**
-     * @param array  $messages
-     * @param string $type
-     * @return array
-     */
-    protected function filterMessages($messages, $type)
-    {
-        return array_filter($messages, function ($message) use ($type) {
-            return $message['type'] == $type;
-        });
-    }
-
-    /**
-     * @returns array
-     */
-    protected function gatherTemplateData()
-    {
-        $consoleMeta = $this->getConsoleMeta();
-        $speedMeta = $this->getSpeedMeta();
-        $queryMeta = $this->getQueryMeta();
-        $memoryMeta = $this->getMemoryMeta();
-        $fileMeta = $this->getFileMeta();
-
-        $consoleMessages = $this->getConsoleMessages();
-        $queryList = $this->getQueryList();
-        $fileList = $this->getFileList();
-
-        return array(
-            'header' => array(
-                'console' => array_sum($consoleMeta),
-                'speed'   => $speedMeta['elapsed'],
-                'query'   => $queryMeta['count'],
-                'memory'  => $memoryMeta['used'],
-                'files'   => $fileMeta['count']
-            ),
-            'console' => array(
-                'meta' => $consoleMeta,
-                'messages' => $consoleMessages
-            ),
-            'speed' => array(
-                'meta' => $speedMeta,
-                'messages' => $this->filterMessages($consoleMessages, 'speed')
-            ),
-            'query' => array(
-                'meta' => $queryMeta,
-                'messages' => $queryList
-            ),
-            'memory' => array(
-                'meta' => $memoryMeta,
-                'messages' => $this->filterMessages($consoleMessages, 'memory')
-            ),
-            'files' => array(
-                'meta' => $fileMeta,
-                'messages' => $fileList
-            )
-        );
-    }
-
-    public function __invoke()
-    {
-        $templateData = $this->gatherTemplateData();
-
-        // 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']}");
-
-        call_user_func(function () use ($templateData, $styles, $script) {
-            extract($templateData);
-            require_once __DIR__ . '/../asset/display.html';
-        });
-    }
+	/** @var  array */
+	protected $defaults = array(
+		'relative_path' => true,
+		'script_path' => 'asset/script.js',
+		'style_path' => 'asset/style.css'
+	);
+
+	/** @var  array */
+	protected $options;
+
+	/** @var  double */
+	protected $startTime;
+
+	/** @var  Console */
+	protected $console;
+
+	/** @var  array */
+	protected $speedData;
+
+	/** @var  array */
+	protected $queryData;
+
+	/** @var  array */
+	protected $memoryData;
+
+	/** @var  array */
+	protected $fileData;
+
+	/** @var  integer */
+	protected $pathTrimStart = 0;
+
+	/**
+	 * @param array $options
+	 */
+	public function __construct(array $options = array())
+	{
+		$options = array_intersect_key($options, $this->defaults);
+		$this->options = array_replace($this->defaults, $options);
+
+		if ($this->options['relative_path']) {
+			$this->pathTrimStart = $this->getPathTrimStart(getcwd(), __DIR__);
+		}
+	}
+
+	/**
+	 * @param double $startTime
+	 */
+	public function setStartTime($startTime)
+	{
+		$this->startTime = $startTime;
+	}
+
+	/**
+	 * @param Console $console
+	 */
+	public function setConsole(Console $console)
+	{
+		$this->console = $console;
+	}
+
+	/**
+	 * Sets memory data
+	 *
+	 * @param array $data
+	 */
+	public function setMemoryData(array $data)
+	{
+		$this->memoryData = $data;
+	}
+
+	/**
+	 * Sets query data
+	 *
+	 * @param array $data
+	 */
+	public function setQueryData(array $data)
+	{
+		$this->queryData = $data;
+	}
+
+	/**
+	 * Sets speed data
+	 *
+	 * @param array $data
+	 */
+	public function setSpeedData(array $data)
+	{
+		$this->speedData = $data;
+	}
+
+	/**
+	 * Sets file data
+	 *
+	 * @param array $data
+	 */
+	public function setFileData(array $data)
+	{
+		$this->fileData = $data;
+	}
+
+	/**
+	 * @return integer
+	 */
+	protected function getPathTrimStart($cwd, $dir)
+	{
+		for ($pos = 0; $pos <= strlen($cwd); $pos++) {
+			if (strncmp($cwd, $dir, $pos + 1) !== 0) {
+				break;
+			}
+		}
+
+		return $pos;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getConsoleMeta()
+	{
+		$consoleMeta = array(
+			'log' => 0,
+			'memory' => 0,
+			'error' => 0,
+			'speed' => 0
+		);
+		foreach ($this->console->getLogs() as $log) {
+			if (array_key_exists($log['type'], $consoleMeta)) {
+				$consoleMeta[$log['type']]++;
+				continue;
+			}
+			$consoleMeta['error']++;
+		}
+
+		return $consoleMeta;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getConsoleMessages()
+	{
+		$messages = array();
+		foreach ($this->console->getLogs() as $log) {
+			switch ($log['type']) {
+				case 'log':
+					$message = array(
+						'message' => print_r($log['data'], true),
+						'type'    => 'log'
+					);
+					break;
+				case 'memory':
+					$message = array(
+						'message' => (!empty($log['data_type']) ? "{$log['data_type']}: " : '') . $log['name'],
+						'data'    => $this->getReadableMemory($log['data']),
+						'type'    => 'memory'
+					);
+					break;
+				case 'error':
+					$message = array(
+						'message' => "Line {$log['line']}: {$log['data']} in {$this->getFilePath($log['file'])}",
+						'type'    => 'error'
+					);
+					break;
+				case 'speed':
+					$elapsedTime = $log['data'] - $this->startTime;
+					$message = array(
+						'message' => $log['name'],
+						'data'    => $this->getReadableTime($elapsedTime),
+						'type'    => 'speed'
+					);
+					break;
+				default:
+					$message = array(
+						'message' => "Unrecognized console log type: {$log['type']}",
+						'type'    => 'error'
+					);
+					break;
+			}
+			array_push($messages, $message);
+		}
+		return $messages;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getSpeedMeta()
+	{
+		$elapsedTime = $this->getReadableTime($this->speedData['elapsed']);
+		$allowedTime = $this->getReadableTime($this->speedData['allowed'], 0);
+
+		return array(
+			'elapsed' => $elapsedTime,
+			'allowed' => $allowedTime,
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getQueryMeta()
+	{
+		$queryCount = count($this->queryData);
+		$queryTotalTime = array_reduce($this->queryData, function ($sum, $row) {
+			return $sum + $row['time'];
+		}, 0);
+		$queryTotalTime = $this->getReadableTime($queryTotalTime);
+		$querySlowestTime = array_reduce($this->queryData, function ($slowest, $row) {
+			return ($slowest < $row['time']) ? $row['time'] : $slowest;
+		}, 0);
+		$querySlowestTime = $this->getReadableTime($querySlowestTime);
+
+		return array(
+			'count'   => $queryCount,
+			'time'    => $queryTotalTime,
+			'slowest' => $querySlowestTime
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getQueryList()
+	{
+		$queryList = array();
+		foreach ($this->queryData as $query) {
+			array_push($queryList, array(
+				'message'  => $query['sql'],
+				'sub_data' => array_filter($query['explain']),
+				'data'     => $this->getReadableTime($query['time'])
+			));
+		}
+		return $queryList;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getMemoryMeta()
+	{
+		$usedMemory = $this->getReadableMemory($this->memoryData['used']);
+		$allowedMemory = $this->memoryData['allowed']; // todo parse this, maybe?
+
+		return array(
+			'used'    => $usedMemory,
+			'allowed' => $allowedMemory
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getFileMeta()
+	{
+		$fileCount = count($this->fileData);
+		$fileTotalSize = array_reduce($this->fileData, function ($sum, $row) {
+			return $sum + $row['size'];
+		}, 0);
+		$fileTotalSize = $this->getReadableMemory($fileTotalSize);
+		$fileLargestSize = array_reduce($this->fileData, function ($largest, $row) {
+			return ($largest < $row['size']) ? $row['size'] : $largest;
+		}, 0);
+		$fileLargestSize = $this->getReadableMemory($fileLargestSize);
+
+		return array(
+			'count' => $fileCount,
+			'size' => $fileTotalSize,
+			'largest' => $fileLargestSize
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getFileList()
+	{
+		$fileList = array();
+		foreach ($this->fileData as $file) {
+			array_push($fileList, array(
+				'message' => $this->getFilePath($file['name']),
+				'data'    => $this->getReadableMemory($file['size'])
+			));
+		}
+		return $fileList;
+	}
+
+	/**
+	 * 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;
+			$percision = 0;
+			$unit = 'ms';
+		} elseif ($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}";
+	}
+
+	/**
+	 * @param string $path
+	 * @return string
+	 */
+	protected function getFilePath($path)
+	{
+		if (!$this->options['relative_path']) {
+			return $path;
+		}
+
+		return substr($path, $this->pathTrimStart);
+	}
+
+	/**
+	 * @param array  $messages
+	 * @param string $type
+	 * @return array
+	 */
+	protected function filterMessages($messages, $type)
+	{
+		return array_filter($messages, function ($message) use ($type) {
+			return $message['type'] == $type;
+		});
+	}
+
+	/**
+	 * @returns array
+	 */
+	protected function gatherTemplateData()
+	{
+		$consoleMeta = $this->getConsoleMeta();
+		$speedMeta = $this->getSpeedMeta();
+		$queryMeta = $this->getQueryMeta();
+		$memoryMeta = $this->getMemoryMeta();
+		$fileMeta = $this->getFileMeta();
+
+		$consoleMessages = $this->getConsoleMessages();
+		$queryList = $this->getQueryList();
+		$fileList = $this->getFileList();
+
+		return array(
+			'header' => array(
+				'console' => array_sum($consoleMeta),
+				'speed'   => $speedMeta['elapsed'],
+				'query'   => $queryMeta['count'],
+				'memory'  => $memoryMeta['used'],
+				'files'   => $fileMeta['count']
+			),
+			'console' => array(
+				'meta' => $consoleMeta,
+				'messages' => $consoleMessages
+			),
+			'speed' => array(
+				'meta' => $speedMeta,
+				'messages' => $this->filterMessages($consoleMessages, 'speed')
+			),
+			'query' => array(
+				'meta' => $queryMeta,
+				'messages' => $queryList
+			),
+			'memory' => array(
+				'meta' => $memoryMeta,
+				'messages' => $this->filterMessages($consoleMessages, 'memory')
+			),
+			'files' => array(
+				'meta' => $fileMeta,
+				'messages' => $fileList
+			)
+		);
+	}
+
+	public function __invoke()
+	{
+		$templateData = $this->gatherTemplateData();
+
+		// 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']}");
+
+		call_user_func(function () use ($templateData, $styles, $script) {
+			extract($templateData);
+			require_once __DIR__ . '/../asset/display.html';
+		});
+	}
 }

src/Console.php

Indentation +85 added lines, -85 removed lines

@@ -15,97 +15,97 @@
 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
-     * @param boolean $literal
-     */
-    public function logMemory($object = null, $name = 'PHP', $literal = false)
-    {
-        $memory = memory_get_usage();
-        $dataType = '';
-        if (!is_null($object) && !$literal) {
-            $memory = strlen(serialize($object));
-            $dataType = gettype($object);
-        } else if (is_numeric($object) && $literal) {
-            $memory = floatval($object);
-        }
+	/**
+	 * Logs memory usage of a variable
+	 * If no parameter is passed in, logs current memory usage
+	 *
+	 * @param mixed $object
+	 * @param string $name
+	 * @param boolean $literal
+	 */
+	public function logMemory($object = null, $name = 'PHP', $literal = false)
+	{
+		$memory = memory_get_usage();
+		$dataType = '';
+		if (!is_null($object) && !$literal) {
+			$memory = strlen(serialize($object));
+			$dataType = gettype($object);
+		} else if (is_numeric($object) && $literal) {
+			$memory = floatval($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
-     * @param float  $literalTime
-     */
-    public function logSpeed($name = 'Point in Time', $literalTime = null)
-    {
-        $time = microtime(true);
-        if (!is_null($literalTime) && is_float($literalTime)) {
-            $time = $literalTime;
-        }
+	/**
+	 * Logs current time with optional message
+	 *
+	 * @param string $name
+	 * @param float  $literalTime
+	 */
+	public function logSpeed($name = 'Point in Time', $literalTime = null)
+	{
+		$time = microtime(true);
+		if (!is_null($literalTime) && is_float($literalTime)) {
+			$time = $literalTime;
+		}
 
-        array_push($this->store, array(
-            'data' => $time,
-            'name' => $name,
-            'type' => 'speed'
-        ));
-    }
+		array_push($this->store, array(
+			'data' => $time,
+			'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 +124 added lines, -124 removed lines

@@ -9,128 +9,128 @@
 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']);
-
-        $data = '12345';
-
-        $console = new Console();
-        $console->logMemory($data, 'PHP', true);
-        $store = $this->getProtectedStore($console);
-        $log = array_pop($store);
-
-        $this->assertEquals($data, $log['data']);
-    }
-
-    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']);
-
-        $name = 'Literal Time';
-        $time = 12345.1231;
-
-        $console = new Console();
-        $console->logSpeed($name, $time);
-        $store = $this->getProtectedStore($console);
-        $log = array_pop($store);
-
-        $this->assertEquals($name, $log['name']);
-        $this->assertEquals($time, $log['data']);
-    }
-
-    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']);
+
+		$data = '12345';
+
+		$console = new Console();
+		$console->logMemory($data, 'PHP', true);
+		$store = $this->getProtectedStore($console);
+		$log = array_pop($store);
+
+		$this->assertEquals($data, $log['data']);
+	}
+
+	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']);
+
+		$name = 'Literal Time';
+		$time = 12345.1231;
+
+		$console = new Console();
+		$console->logSpeed($name, $time);
+		$store = $this->getProtectedStore($console);
+		$log = array_pop($store);
+
+		$this->assertEquals($name, $log['name']);
+		$this->assertEquals($time, $log['data']);
+	}
+
+	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);
+	}
 }