jacobemerick / pqp

tests/unit/DisplayTest.php

Indentation +53 added lines, -53 removed lines

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

src/Display.php

Indentation +300 added lines, -300 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -70,7 +70,7 @@ 
             )
         );
         foreach ($this->console->getLogs() as $log) {
-            switch($log['type']) {
+            switch ($log['type']) {
                 case 'log':
                     $message = array(
                         'message' => print_r($log['data'], true),
@@ -80,7 +80,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'
                     );
@@ -287,11 +287,11 @@ 
  
     public function __invoke()
     {
-        $console= $this->formatConsoleData();
-        $speed= $this->formatSpeedData();
-        $query= $this->formatQueryData();
-        $memory= $this->formatMemoryData();
-        $files= $this->formatFileData();
+        $console = $this->formatConsoleData();
+        $speed = $this->formatSpeedData();
+        $query = $this->formatQueryData();
+        $memory = $this->formatMemoryData();
+        $files = $this->formatFileData();
 
         $header = array(
           'console' => count($console['messages']),
@@ -301,18 +301,18 @@ 
           'files'   => $files['meta']['count']
         );
 
-        $speed['messages'] = array_filter($console['messages'], function ($message) {
+        $speed['messages'] = array_filter($console['messages'], function($message) {
             return $message['type'] == 'speed';
         });
 
-        $memory['messages'] = array_filter($console['messages'], function ($message) {
+        $memory['messages'] = array_filter($console['messages'], function($message) {
             return $message['type'] == 'memory';
         });
 
         // todo is this really the best way to load these?
-        $styles = file_get_contents(__DIR__ . "./../{$this->options['style_path']}");
-        $script = file_get_contents(__DIR__ . "./../{$this->options['script_path']}");
+        $styles = file_get_contents(__DIR__."./../{$this->options['style_path']}");
+        $script = file_get_contents(__DIR__."./../{$this->options['script_path']}");
 
-        require_once __DIR__ .'/../asset/display.html';
+        require_once __DIR__.'/../asset/display.html';
     }
 }