jacobemerick / pqp

src/Display.php

Indentation +226 added lines, -226 removed lines

@@ -14,231 +14,231 @@
 class Display
 {
 
-    /** @var  array */
-    protected $defaults = array(
-        'script_path' => 'asset/script.js',
-        'style_path'  => 'asset/style.css'
-    );
-
-    /** @var  array */
-    protected $options;
-
-    /** @var  array */
-    protected $output;
-
-    /**
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $options = array_intersect_key($options, $this->defaults);
-        $this->options = array_replace($this->defaults, $options);
-    }
-
-    public function setConsole(Console $console)
-    {
-        $console_data = array(
-            'messages' => array(),
-            'meta'    => array(
-                'log'    => 0,
-                'memory' => 0,
-                'error'  => 0,
-                'speed'  => 0
-            )
-        );
-        foreach ($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'    => self::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'    => self::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);
-        }
-        $this->output['console'] = $console_data;
-    }
-
-    /**
-     * Sets file data
-     *
-     * @param array $data
-     */
-    public function setFileData(array $data)
-    {
-        $fileData = array(
-            'fileList'   => array(),
-            'fileTotals' => array(
-                'count'   => count($data),
-                'size'    => 0,
-                'largest' => 0
-            )
-        );
-
-        foreach ($data as $file) {
-            array_push($fileData['fileList'], array(
-                'name' => $file['name'],
-                'size' => self::getReadableMemory($file['size'])
-            ));
-
-            $fileData['fileTotals']['size'] += $file['size'];
-            if ($file['size'] > $fileData['fileTotals']['largest']) {
-                $fileData['fileTotals']['largest'] = $file['size'];
-            }
-        }
-
-        $fileData['fileTotals']['size'] = self::getReadableMemory($fileData['fileTotals']['size']);
-        $fileData['fileTotals']['largest'] = self::getReadableMemory($fileData['fileTotals']['largest']);
-
-        $this->output['files'] = $fileData['fileList'];
-        $this->output['fileTotals'] = $fileData['fileTotals'];
-    }
-
-    /**
-     * Sets memory data
-     *
-     * @param array $data
-     */
-    public function setMemoryData(array $data)
-    {
-        $this->output['memory'] = array(
-            'used'    => self::getReadableMemory($data['used']),
-            'allowed' => $data['allowed']
-        );
-    }
-
-    public function setQueryData(array $data)
-    {
-        $queryData = array(
-            'queries'     => array(),
-            'queryTotals' => array(
-                'count'   => count($data),
-                'time'    => 0,
-            )
-        );
-
-        foreach ($data as $query) {
-            array_push($queryData['queries'], array(
-                'sql'     => $query['sql'],
-                'explain' => $query['explain'],
-                'time'    => self::getReadableTime($query['time'])
-            ));
-
-            $queryData['queryTotals']['time'] += $query['time'];
-        }
-
-        $queryData['queryTotals']['time'] = self::getReadableTime($queryData['queryTotals']['time']);
-
-        $this->output['queries'] = $queryData['queries'];
-        $this->output['queryTotals'] = $queryData['queryTotals'];
-    }
-
-    /**
-     * Sets speed data
-     *
-     * @param array $data
-     */
-    public function setSpeedData(array $data)
-    {
-        $this->output['speed']['meta'] = array(
-            'elapsed' => self::getReadableTime($data['elapsed']),
-            'allowed' => self::getReadableTime($data['allowed'], 0)
-        );
-    }
-
-    /**
-     * Static formatter for human-readable time
-     * Only handles time up to 60 minutes gracefully
-     *
-     * @param double  $time
-     * @param integer $decimals
-     * @return string
-     */
-    public static function getReadableTime($time, $decimals = 3)
-    {
-        $unit = 's';
-        if ($time < 1) {
-            $time *= 1000;
-            $unit = 'ms';
-        } else if ($time > 60) {
-            $time /= 60;
-            $unit = 'm';
-        }
-        $time = number_format($time, $decimals);
-        return "{$time} {$unit}";
-    }
-
-    /**
-     * Static formatter for human-readable memory
-     *
-     * @param double  $size
-     * @param integer $decimals
-     */
-    public static function getReadableMemory($size, $decimals = 2)
-    {
-        $unitOptions = array('b', 'k', 'M', 'G');
-
-        $base = log($size, 1024);
-
-        $memory = round(pow(1024, $base - floor($base)), $decimals);
-        $unit = $unitOptions[floor($base)];
-        return "{$memory} {$unit}";
-    }
+	/** @var  array */
+	protected $defaults = array(
+		'script_path' => 'asset/script.js',
+		'style_path'  => 'asset/style.css'
+	);
+
+	/** @var  array */
+	protected $options;
+
+	/** @var  array */
+	protected $output;
+
+	/**
+	 * @param array $options
+	 */
+	public function __construct(array $options = array())
+	{
+		$options = array_intersect_key($options, $this->defaults);
+		$this->options = array_replace($this->defaults, $options);
+	}
+
+	public function setConsole(Console $console)
+	{
+		$console_data = array(
+			'messages' => array(),
+			'meta'    => array(
+				'log'    => 0,
+				'memory' => 0,
+				'error'  => 0,
+				'speed'  => 0
+			)
+		);
+		foreach ($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'    => self::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'    => self::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);
+		}
+		$this->output['console'] = $console_data;
+	}
+
+	/**
+	 * Sets file data
+	 *
+	 * @param array $data
+	 */
+	public function setFileData(array $data)
+	{
+		$fileData = array(
+			'fileList'   => array(),
+			'fileTotals' => array(
+				'count'   => count($data),
+				'size'    => 0,
+				'largest' => 0
+			)
+		);
+
+		foreach ($data as $file) {
+			array_push($fileData['fileList'], array(
+				'name' => $file['name'],
+				'size' => self::getReadableMemory($file['size'])
+			));
+
+			$fileData['fileTotals']['size'] += $file['size'];
+			if ($file['size'] > $fileData['fileTotals']['largest']) {
+				$fileData['fileTotals']['largest'] = $file['size'];
+			}
+		}
+
+		$fileData['fileTotals']['size'] = self::getReadableMemory($fileData['fileTotals']['size']);
+		$fileData['fileTotals']['largest'] = self::getReadableMemory($fileData['fileTotals']['largest']);
+
+		$this->output['files'] = $fileData['fileList'];
+		$this->output['fileTotals'] = $fileData['fileTotals'];
+	}
+
+	/**
+	 * Sets memory data
+	 *
+	 * @param array $data
+	 */
+	public function setMemoryData(array $data)
+	{
+		$this->output['memory'] = array(
+			'used'    => self::getReadableMemory($data['used']),
+			'allowed' => $data['allowed']
+		);
+	}
+
+	public function setQueryData(array $data)
+	{
+		$queryData = array(
+			'queries'     => array(),
+			'queryTotals' => array(
+				'count'   => count($data),
+				'time'    => 0,
+			)
+		);
+
+		foreach ($data as $query) {
+			array_push($queryData['queries'], array(
+				'sql'     => $query['sql'],
+				'explain' => $query['explain'],
+				'time'    => self::getReadableTime($query['time'])
+			));
+
+			$queryData['queryTotals']['time'] += $query['time'];
+		}
+
+		$queryData['queryTotals']['time'] = self::getReadableTime($queryData['queryTotals']['time']);
+
+		$this->output['queries'] = $queryData['queries'];
+		$this->output['queryTotals'] = $queryData['queryTotals'];
+	}
+
+	/**
+	 * Sets speed data
+	 *
+	 * @param array $data
+	 */
+	public function setSpeedData(array $data)
+	{
+		$this->output['speed']['meta'] = array(
+			'elapsed' => self::getReadableTime($data['elapsed']),
+			'allowed' => self::getReadableTime($data['allowed'], 0)
+		);
+	}
+
+	/**
+	 * Static formatter for human-readable time
+	 * Only handles time up to 60 minutes gracefully
+	 *
+	 * @param double  $time
+	 * @param integer $decimals
+	 * @return string
+	 */
+	public static function getReadableTime($time, $decimals = 3)
+	{
+		$unit = 's';
+		if ($time < 1) {
+			$time *= 1000;
+			$unit = 'ms';
+		} else if ($time > 60) {
+			$time /= 60;
+			$unit = 'm';
+		}
+		$time = number_format($time, $decimals);
+		return "{$time} {$unit}";
+	}
+
+	/**
+	 * Static formatter for human-readable memory
+	 *
+	 * @param double  $size
+	 * @param integer $decimals
+	 */
+	public static function getReadableMemory($size, $decimals = 2)
+	{
+		$unitOptions = array('b', 'k', 'M', 'G');
+
+		$base = log($size, 1024);
+
+		$memory = round(pow(1024, $base - floor($base)), $decimals);
+		$unit = $unitOptions[floor($base)];
+		return "{$memory} {$unit}";
+	}
  
-    public function __invoke()
-    {
-        $output = $this->output;
-        $header = array(
-          'console' => count($output['console']['messages']),
-          'speed'   => $output['speed']['meta']['elapsed'],
-          'query'   => $output['queryTotals']['count'],
-          'memory'  => $output['memory']['used'],
-          'files'   => count($output['files'])
-        );
-
-        $console = $output['console'];
-        $speed = $output['speed'];
-        $speed['messages'] = array_filter($console['messages'], function ($message) {
-            return $message['type'] == 'speed';
-        });
-
-        // todo is this really the best way to load these?
-        $styles = file_get_contents(__DIR__ . "./../{$this->options['style_path']}");
-        $script = file_get_contents(__DIR__ . "./../{$this->options['script_path']}");
-
-        require_once __DIR__ .'/../asset/display.tpl.php';
-    }
+	public function __invoke()
+	{
+		$output = $this->output;
+		$header = array(
+		  'console' => count($output['console']['messages']),
+		  'speed'   => $output['speed']['meta']['elapsed'],
+		  'query'   => $output['queryTotals']['count'],
+		  'memory'  => $output['memory']['used'],
+		  'files'   => count($output['files'])
+		);
+
+		$console = $output['console'];
+		$speed = $output['speed'];
+		$speed['messages'] = array_filter($console['messages'], function ($message) {
+			return $message['type'] == 'speed';
+		});
+
+		// todo is this really the best way to load these?
+		$styles = file_get_contents(__DIR__ . "./../{$this->options['style_path']}");
+		$script = file_get_contents(__DIR__ . "./../{$this->options['script_path']}");
+
+		require_once __DIR__ .'/../asset/display.tpl.php';
+	}
 }	

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
             )
         );
         foreach ($console->getLogs() as $log) {
-            switch($log['type']) {
+            switch ($log['type']) {
                 case 'log':
                     $message = array(
                         'message' => print_r($log['data'], true),
@@ -57,7 +57,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'    => self::getReadableMemory($log['data']),
                         'type'    => 'memory'
                     );
@@ -231,14 +231,14 @@ 
 
         $console = $output['console'];
         $speed = $output['speed'];
-        $speed['messages'] = array_filter($console['messages'], function ($message) {
+        $speed['messages'] = array_filter($console['messages'], function($message) {
             return $message['type'] == 'speed';
         });
 
         // todo is this really the best way to load these?
-        $styles = file_get_contents(__DIR__ . "./../{$this->options['style_path']}");
-        $script = file_get_contents(__DIR__ . "./../{$this->options['script_path']}");
+        $styles = file_get_contents(__DIR__."./../{$this->options['style_path']}");
+        $script = file_get_contents(__DIR__."./../{$this->options['script_path']}");
 
-        require_once __DIR__ .'/../asset/display.tpl.php';
+        require_once __DIR__.'/../asset/display.tpl.php';
     }
 }