jacobemerick / pqp

src/Display.php

Indentation +366 added lines, -366 removed lines

@@ -14,371 +14,371 @@
 class Display
 {
 
-    /** @var  array */
-    protected $defaults = array(
-        '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;
-
-    /**
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $options = array_intersect_key($options, $this->defaults);
-        $this->options = array_replace($this->defaults, $options);
-    }
-
-    /**
-     * @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 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 {$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' => $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;
-            $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 array  $messages
-     * @param string $type
-     * @return array
-     */
-    protected function filterMessages($messages, $type)
-    {
-        return array_filter($messages, function ($message) use ($type) {
-            return $message['type'] == $type;
-        });
-    }
+	/** @var  array */
+	protected $defaults = array(
+		'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;
+
+	/**
+	 * @param array $options
+	 */
+	public function __construct(array $options = array())
+	{
+		$options = array_intersect_key($options, $this->defaults);
+		$this->options = array_replace($this->defaults, $options);
+	}
+
+	/**
+	 * @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 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 {$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' => $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;
+			$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 array  $messages
+	 * @param string $type
+	 * @return array
+	 */
+	protected function filterMessages($messages, $type)
+	{
+		return array_filter($messages, function ($message) use ($type) {
+			return $message['type'] == $type;
+		});
+	}
  
-    public function __invoke()
-    {
-        $consoleMeta = $this->getConsoleMeta();
-        $speedMeta = $this->getSpeedMeta();
-        $queryMeta = $this->getQueryMeta();
-        $memoryMeta = $this->getMemoryMeta();
-        $fileMeta = $this->getFileMeta();
-
-        $header = array(
-            'console' => array_sum($consoleMeta),
-            'speed'   => $speedMeta['elapsed'],
-            'query'   => $queryMeta['count'],
-            'memory'  => $memoryMeta['used'],
-            'files'   => $fileMeta['count']
-        );
-
-        $consoleMessages = $this->getConsoleMessages();
-        $queryList = $this->getQueryList();
-        $fileList = $this->getFileList();
-
-        $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
-        );
-
-        // 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()
+	{
+		$consoleMeta = $this->getConsoleMeta();
+		$speedMeta = $this->getSpeedMeta();
+		$queryMeta = $this->getQueryMeta();
+		$memoryMeta = $this->getMemoryMeta();
+		$fileMeta = $this->getFileMeta();
+
+		$header = array(
+			'console' => array_sum($consoleMeta),
+			'speed'   => $speedMeta['elapsed'],
+			'query'   => $queryMeta['count'],
+			'memory'  => $memoryMeta['used'],
+			'files'   => $fileMeta['count']
+		);
+
+		$consoleMessages = $this->getConsoleMessages();
+		$queryList = $this->getQueryList();
+		$fileList = $this->getFileList();
+
+		$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
+		);
+
+		// 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 +9 added lines, -9 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;
         });
     }
@@ -376,9 +376,9 @@ 
         );
 
         // 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';
     }
 }