Completed
Push — master ( fdf5fc...3f8872 )
by Jacob
02:18
created
tests/unit/ConsoleTest.php 1 patch
Indentation   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -5,112 +5,112 @@
 block discarded – undo
5 5
 class ConsoleTest extends PHPUnit_Framework_TestCase
6 6
 {
7 7
 
8
-    public function __construct()
9
-    {
10
-    }
11
-
12
-    public function testLog()
13
-    {
14
-        $data = array(
15
-            'key' => 'value'
16
-        );
17
-
18
-        $console = new Console();
19
-        $console->log($data);
20
-        $store = $this->getProtectedStore($console);
21
-        $log = array_pop($store);
22
-
23
-        $this->assertSame($data, $log['data']);
24
-        $this->assertEquals('log', $log['type']);
25
-    }
26
-
27
-    public function testLogMemory()
28
-    {
29
-        $data = array(
30
-            'key' => 'value'
31
-        );
32
-        $memory = strlen(serialize($data));
33
-        $name = 'Test Array';
34
-
35
-        $console = new Console();
36
-        $console->logMemory($data, $name);
37
-        $store = $this->getProtectedStore($console);
38
-        $log = array_pop($store);
39
-
40
-        $this->assertEquals($name, $log['name']);
41
-        $this->assertEquals($memory, $log['data']);
42
-        $this->assertEquals('array', $log['data_type']);
43
-        $this->assertEquals('memory', $log['type']);
44
-    }
45
-
46
-    public function testLogError()
47
-    {
48
-        $error = new Exception('Test Exception');
49
-
50
-        $console = new Console();
51
-        $console->logError($error);
52
-        $store = $this->getProtectedStore($console);
53
-        $log = array_pop($store);
54
-
55
-        $this->assertEquals($error->getMessage(), $log['data']);
56
-        $this->assertEquals($error->getFile(), $log['file']);
57
-        $this->assertEquals($error->getLine(), $log['line']);
58
-        $this->assertEquals('error', $log['type']);
59
-
60
-        $error = new Exception('Test Exception');
61
-        $message = 'override message';
62
-
63
-        $console = new Console();
64
-        $console->logError($error, $message);
65
-        $store = $this->getProtectedStore($console);
66
-        $log = array_pop($store);
67
-
68
-        $this->assertEquals($message, $log['data']);
69
-    }
70
-
71
-    public function testLogSpeed()
72
-    {
73
-        $name = 'Test Speed';
74
-
75
-        $console = new Console();
76
-        $console->logSpeed($name);
77
-        $store = $this->getProtectedStore($console);
78
-        $log = array_pop($store);
79
-
80
-        $this->assertEquals($name, $log['name']);
81
-        $this->assertEquals('speed', $log['type']);
82
-    }
83
-
84
-    public function testGetLogs()
85
-    {
86
-        $store = array(
87
-            array(
88
-                'data' => 'a string',
89
-                'type' => 'log'
90
-            ),
91
-            array(
92
-                'name' => '',
93
-                'data' => 123,
94
-                'data_type' => 'array',
95
-                'type' => 'memory'
96
-            )
97
-        );
98
-
99
-        $console = new Console();
100
-
101
-        $reflectedConsole = new ReflectionClass(get_class($console));
102
-        $reflectedProperty = $reflectedConsole->getProperty('store');
103
-        $reflectedProperty->setAccessible(true);
104
-        $reflectedProperty->setValue($console, $store);
105
-
106
-        $this->assertSame($store, $console->getLogs());
107
-    }
108
-
109
-    protected function getProtectedStore(Console $console)
110
-    {
111
-        $reflectedConsole = new ReflectionClass(get_class($console));
112
-        $reflectedProperty = $reflectedConsole->getProperty('store');
113
-        $reflectedProperty->setAccessible(true);
114
-        return $reflectedProperty->getValue($console);
115
-    }
8
+	public function __construct()
9
+	{
10
+	}
11
+
12
+	public function testLog()
13
+	{
14
+		$data = array(
15
+			'key' => 'value'
16
+		);
17
+
18
+		$console = new Console();
19
+		$console->log($data);
20
+		$store = $this->getProtectedStore($console);
21
+		$log = array_pop($store);
22
+
23
+		$this->assertSame($data, $log['data']);
24
+		$this->assertEquals('log', $log['type']);
25
+	}
26
+
27
+	public function testLogMemory()
28
+	{
29
+		$data = array(
30
+			'key' => 'value'
31
+		);
32
+		$memory = strlen(serialize($data));
33
+		$name = 'Test Array';
34
+
35
+		$console = new Console();
36
+		$console->logMemory($data, $name);
37
+		$store = $this->getProtectedStore($console);
38
+		$log = array_pop($store);
39
+
40
+		$this->assertEquals($name, $log['name']);
41
+		$this->assertEquals($memory, $log['data']);
42
+		$this->assertEquals('array', $log['data_type']);
43
+		$this->assertEquals('memory', $log['type']);
44
+	}
45
+
46
+	public function testLogError()
47
+	{
48
+		$error = new Exception('Test Exception');
49
+
50
+		$console = new Console();
51
+		$console->logError($error);
52
+		$store = $this->getProtectedStore($console);
53
+		$log = array_pop($store);
54
+
55
+		$this->assertEquals($error->getMessage(), $log['data']);
56
+		$this->assertEquals($error->getFile(), $log['file']);
57
+		$this->assertEquals($error->getLine(), $log['line']);
58
+		$this->assertEquals('error', $log['type']);
59
+
60
+		$error = new Exception('Test Exception');
61
+		$message = 'override message';
62
+
63
+		$console = new Console();
64
+		$console->logError($error, $message);
65
+		$store = $this->getProtectedStore($console);
66
+		$log = array_pop($store);
67
+
68
+		$this->assertEquals($message, $log['data']);
69
+	}
70
+
71
+	public function testLogSpeed()
72
+	{
73
+		$name = 'Test Speed';
74
+
75
+		$console = new Console();
76
+		$console->logSpeed($name);
77
+		$store = $this->getProtectedStore($console);
78
+		$log = array_pop($store);
79
+
80
+		$this->assertEquals($name, $log['name']);
81
+		$this->assertEquals('speed', $log['type']);
82
+	}
83
+
84
+	public function testGetLogs()
85
+	{
86
+		$store = array(
87
+			array(
88
+				'data' => 'a string',
89
+				'type' => 'log'
90
+			),
91
+			array(
92
+				'name' => '',
93
+				'data' => 123,
94
+				'data_type' => 'array',
95
+				'type' => 'memory'
96
+			)
97
+		);
98
+
99
+		$console = new Console();
100
+
101
+		$reflectedConsole = new ReflectionClass(get_class($console));
102
+		$reflectedProperty = $reflectedConsole->getProperty('store');
103
+		$reflectedProperty->setAccessible(true);
104
+		$reflectedProperty->setValue($console, $store);
105
+
106
+		$this->assertSame($store, $console->getLogs());
107
+	}
108
+
109
+	protected function getProtectedStore(Console $console)
110
+	{
111
+		$reflectedConsole = new ReflectionClass(get_class($console));
112
+		$reflectedProperty = $reflectedConsole->getProperty('store');
113
+		$reflectedProperty->setAccessible(true);
114
+		return $reflectedProperty->getValue($console);
115
+	}
116 116
 }
Please login to merge, or discard this patch.
tests/unit/PhpQuickProfilerTest.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,18 +6,18 @@
 block discarded – undo
6 6
 class PhpQuickProfilerTest extends PHPUnit_Framework_TestCase
7 7
 {
8 8
 
9
-    public function __construct()
10
-    {
11
-    }
9
+	public function __construct()
10
+	{
11
+	}
12 12
 
13
-    public function testConstruct()
14
-    {
15
-        $console = new Console();
16
-        $startTime = microtime(true);
13
+	public function testConstruct()
14
+	{
15
+		$console = new Console();
16
+		$startTime = microtime(true);
17 17
 
18
-        $profiler = new PhpQuickProfiler($console, $startTime);
18
+		$profiler = new PhpQuickProfiler($console, $startTime);
19 19
 
20
-        $this->assertAttributeSame($console, 'console', $profiler);
21
-        $this->assertAttributeEquals($startTime, 'startTime', $profiler);
22
-    }
20
+		$this->assertAttributeSame($console, 'console', $profiler);
21
+		$this->assertAttributeEquals($startTime, 'startTime', $profiler);
22
+	}
23 23
 }
Please login to merge, or discard this patch.
src/Console.php 1 patch
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -15,88 +15,88 @@
 block discarded – undo
15 15
 class Console
16 16
 {
17 17
 
18
-    /** @var  array */
19
-    protected $store = array();
18
+	/** @var  array */
19
+	protected $store = array();
20 20
 
21
-    /**
22
-     * Logs data to the console
23
-     * Accepts any data type
24
-     *
25
-     * @param mixed $data
26
-     */
27
-    public function log($data)
28
-    {
29
-        array_push($this->store, array(
30
-          'data' => $data,
31
-          'type' => 'log'
32
-        ));
33
-    }
21
+	/**
22
+	 * Logs data to the console
23
+	 * Accepts any data type
24
+	 *
25
+	 * @param mixed $data
26
+	 */
27
+	public function log($data)
28
+	{
29
+		array_push($this->store, array(
30
+		  'data' => $data,
31
+		  'type' => 'log'
32
+		));
33
+	}
34 34
 
35
-    /**
36
-     * Logs memory usage of a variable
37
-     * If no parameter is passed in, logs current memory usage
38
-     *
39
-     * @param mixed $object
40
-     * @param string $name
41
-     */
42
-    public function logMemory($object = null, $name = 'PHP')
43
-    {
44
-        $memory = memory_get_usage();
45
-        $data_type = '';
46
-        if (!is_null($object)) {
47
-            $memory = strlen(serialize($object));
48
-            $data_type = gettype($object);
49
-        }
35
+	/**
36
+	 * Logs memory usage of a variable
37
+	 * If no parameter is passed in, logs current memory usage
38
+	 *
39
+	 * @param mixed $object
40
+	 * @param string $name
41
+	 */
42
+	public function logMemory($object = null, $name = 'PHP')
43
+	{
44
+		$memory = memory_get_usage();
45
+		$data_type = '';
46
+		if (!is_null($object)) {
47
+			$memory = strlen(serialize($object));
48
+			$data_type = gettype($object);
49
+		}
50 50
 
51
-        array_push($this->store, array(
52
-            'name'      => $name,
53
-            'data'      => $memory,
54
-            'data_type' => $data_type,
55
-            'type'      => 'memory'
56
-        ));
57
-    }
51
+		array_push($this->store, array(
52
+			'name'      => $name,
53
+			'data'      => $memory,
54
+			'data_type' => $data_type,
55
+			'type'      => 'memory'
56
+		));
57
+	}
58 58
 
59
-    /**
60
-     * Logs exception with optional message override
61
-     *
62
-     * @param Exception $exception
63
-     * @param string    $message
64
-     */
65
-    public function logError(Exception $exception, $message = '')
66
-    {
67
-        if (empty($message)) {
68
-            $message = $exception->getMessage();
69
-        }
59
+	/**
60
+	 * Logs exception with optional message override
61
+	 *
62
+	 * @param Exception $exception
63
+	 * @param string    $message
64
+	 */
65
+	public function logError(Exception $exception, $message = '')
66
+	{
67
+		if (empty($message)) {
68
+			$message = $exception->getMessage();
69
+		}
70 70
 
71
-        array_push($this->store, array(
72
-            'data' => $message,
73
-            'file' => $exception->getFile(),
74
-            'line' => $exception->getLine(),
75
-            'type' => 'error'
76
-        ));
77
-    }
71
+		array_push($this->store, array(
72
+			'data' => $message,
73
+			'file' => $exception->getFile(),
74
+			'line' => $exception->getLine(),
75
+			'type' => 'error'
76
+		));
77
+	}
78 78
 
79
-    /**
80
-     * Logs current time with optional message
81
-     *
82
-     * @param string $name
83
-     */
84
-    public function logSpeed($name = 'Point in Time')
85
-    {
86
-        array_push($this->store, array(
87
-            'data' => microtime(true),
88
-            'name' => $name,
89
-            'type' => 'speed'
90
-        ));
91
-    }
79
+	/**
80
+	 * Logs current time with optional message
81
+	 *
82
+	 * @param string $name
83
+	 */
84
+	public function logSpeed($name = 'Point in Time')
85
+	{
86
+		array_push($this->store, array(
87
+			'data' => microtime(true),
88
+			'name' => $name,
89
+			'type' => 'speed'
90
+		));
91
+	}
92 92
 
93
-    /**
94
-     * Returns the collected logs
95
-     *
96
-     * @returns array
97
-     */
98
-    public function getLogs()
99
-    {
100
-        return $this->store;
101
-    }
93
+	/**
94
+	 * Returns the collected logs
95
+	 *
96
+	 * @returns array
97
+	 */
98
+	public function getLogs()
99
+	{
100
+		return $this->store;
101
+	}
102 102
 }
Please login to merge, or discard this patch.
asset/display.tpl.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -157,10 +157,10 @@  discard block
 block discarded – undo
157 157
 			}
158 158
 			elseif($log['type'] == 'memory') {
159 159
 				echo '<div><pre>'.$log['data'].'</pre>';
160
-          if (!empty($log['data_type'])) {
161
-            echo '<em>'.$log['data_type'].'</em>: ';
162
-          }
163
-        echo $log['name'].' </div>';
160
+		  if (!empty($log['data_type'])) {
161
+			echo '<em>'.$log['data_type'].'</em>: ';
162
+		  }
163
+		echo $log['name'].' </div>';
164 164
 			}
165 165
 			elseif($log['type'] == 'speed') {
166 166
 				echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
@@ -261,10 +261,10 @@  discard block
 block discarded – undo
261 261
 			if($log['type'] == 'memory') {
262 262
 				echo '<tr class="log-'.$log['type'].'">';
263 263
 				echo '<td class="'.$class.'"><b>'.$log['data'].'</b>';
264
-          if ($log['data_type']) {
265
-            echo '<em>'.$log['data_type'].'</em>: ';
266
-          }
267
-        echo $log['name'].'</td>';
264
+		  if ($log['data_type']) {
265
+			echo '<em>'.$log['data_type'].'</em>: ';
266
+		  }
267
+		echo $log['name'].'</td>';
268 268
 				echo '</tr>';
269 269
 				if($class == '') $class = 'alt';
270 270
 				else $class = '';
Please login to merge, or discard this patch.
tests/unit/DisplayTest.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -5,29 +5,29 @@
 block discarded – undo
5 5
 class DisplayTest extends PHPUnit_Framework_TestCase
6 6
 {
7 7
 
8
-    public function testGetReadableTime()
9
-    {
10
-        $test_input = array(
11
-            '.032432' => '32.432 ms',
12
-            '24.3781' => '24.378 s',
13
-            '145.123' => '2.419 m'
14
-        );
8
+	public function testGetReadableTime()
9
+	{
10
+		$test_input = array(
11
+			'.032432' => '32.432 ms',
12
+			'24.3781' => '24.378 s',
13
+			'145.123' => '2.419 m'
14
+		);
15 15
 
16
-        foreach ($test_input as $input => $expected_return) {
17
-            $this->assertEquals($expected_return, Display::getReadableTime($input));
18
-        }
19
-    }
16
+		foreach ($test_input as $input => $expected_return) {
17
+			$this->assertEquals($expected_return, Display::getReadableTime($input));
18
+		}
19
+	}
20 20
 
21
-    public function testGetReadableMemory()
22
-    {
23
-        $test_input = array(
24
-            '314'     => '314 b',
25
-            '7403'    => '7.23 k',
26
-            '2589983' => '2.47 M'
27
-        );
21
+	public function testGetReadableMemory()
22
+	{
23
+		$test_input = array(
24
+			'314'     => '314 b',
25
+			'7403'    => '7.23 k',
26
+			'2589983' => '2.47 M'
27
+		);
28 28
 
29
-        foreach ($test_input as $input => $expected_return) {
30
-            $this->assertEquals($expected_return, Display::getReadableMemory($input));
31
-        }
32
-    }
29
+		foreach ($test_input as $input => $expected_return) {
30
+			$this->assertEquals($expected_return, Display::getReadableMemory($input));
31
+		}
32
+	}
33 33
 }
Please login to merge, or discard this patch.
src/Display.php 1 patch
Indentation   +178 added lines, -178 removed lines patch added patch discarded remove patch
@@ -14,183 +14,183 @@
 block discarded – undo
14 14
 class Display
15 15
 {
16 16
 
17
-    /** @var  array */
18
-    protected $output;
19
-
20
-    public function __construct()
21
-    {
22
-    }
23
-
24
-    public function setConsole(Console $console)
25
-    {
26
-        $console_data = array(
27
-            'messages' => array(),
28
-            'count'    => array(
29
-                'log'    => 0,
30
-                'memory' => 0,
31
-                'error'  => 0,
32
-                'speed'  => 0
33
-            )
34
-        );
35
-        foreach ($console->getLogs() as $log) {
36
-            switch($log['type']) {
37
-                case 'log':
38
-                    $message = array(
39
-                        'data' => print_r($log['data'], true),
40
-                        'type' => 'log'
41
-                    );
42
-                    $console_data['count']['log']++;
43
-                    break;
44
-                case 'memory':
45
-                    $message = array(
46
-                        'name' => $log['name'],
47
-                        'data' => self::getReadableMemory($log['data']),
48
-                        'type' => 'memory'
49
-                    );
50
-                    if (!empty($log['data_type'])) {
51
-                        $message['data_type'] = $log['data_type'];
52
-                    }
53
-                    $console_data['count']['memory']++;
54
-                    break;
55
-                case 'error':
56
-                    $message = array(
57
-                        'data' => $log['data'],
58
-                        'file' => $log['file'],
59
-                        'line' => $log['line'],
60
-                        'type' => 'error'
61
-                    );
62
-                    $console_data['count']['error']++;
63
-                    break;
64
-                case 'speed':
65
-                    $elapsedTime = $log['data'] - $this->startTime;
66
-                    $message = array(
67
-                        'name' => $log['name'],
68
-                        'data' => self::getReadableTime($elapsedTime),
69
-                        'type' => 'speed'
70
-                    );
71
-                    $console_data['count']['speed']++;
72
-                    break;
73
-                default:
74
-                    $message = array(
75
-                        'data' => "Unrecognized console log type: {$log['type']}",
76
-                        'type' => 'error'
77
-                    );
78
-                    $console_data['count']['error']++;
79
-                    break;
80
-            }
81
-            array_push($console_data['messages'], $message);
82
-        }
83
-        $this->output['console'] = $console_data;
84
-    }
85
-
86
-    /**
87
-     * Sets file data
88
-     *
89
-     * @param array $data
90
-     */
91
-    public function setFileData(array $data)
92
-    {
93
-        $fileData = array(
94
-            'fileList'   => array(),
95
-            'fileTotals' => array(
96
-                'count'   => count($data),
97
-                'size'    => 0,
98
-                'largest' => 0
99
-            )
100
-        );
101
-
102
-        foreach ($data as $file) {
103
-            array_push($fileData['fileList'], array(
104
-                'name' => $file['name'],
105
-                'size' => self::getReadableMemory($file['size'])
106
-            ));
107
-
108
-            $fileData['fileTotals']['size'] += $file['size'];
109
-            if ($file['size'] > $fileData['fileTotals']['largest']) {
110
-                $fileData['fileTotals']['largest'] = $file['size'];
111
-            }
112
-        }
113
-
114
-        $fileData['fileTotals']['size'] = self::getReadableMemory($fileData['fileTotals']['size']);
115
-        $fileData['fileTotals']['largest'] = self::getReadableMemory($fileData['fileTotals']['largest']);
116
-
117
-        $this->output['files'] = $fileData['fileList'];
118
-        $this->output['fileTotals'] = $fileData['fileTotals'];
119
-    }
120
-
121
-    /**
122
-     * Sets memory data
123
-     *
124
-     * @param array $data
125
-     */
126
-    public function setMemoryData(array $data)
127
-    {
128
-        $this->output['memory'] = array(
129
-            'used'    => self::getReadableMemory($data['used']),
130
-            'allowed' => $data['allowed']
131
-        );
132
-    }
133
-
134
-    public function setQueryData(array $query_data)
135
-    {
136
-        // the void
137
-    }
138
-
139
-    /**
140
-     * Sets speed data
141
-     *
142
-     * @param array $data
143
-     */
144
-    public function setSpeedData(array $data)
145
-    {
146
-        $this->output['speed'] = array(
147
-            'elapsed' => self::getReadableTime($data['elapsed']),
148
-            'allowed' => self::getReadableTime($data['allowed'], 0)
149
-        );
150
-    }
151
-
152
-    /**
153
-     * Static formatter for human-readable time
154
-     * Only handles time up to 60 minutes gracefully
155
-     *
156
-     * @param double  $time
157
-     * @param integer $decimals
158
-     * @return string
159
-     */
160
-    public static function getReadableTime($time, $decimals = 3)
161
-    {
162
-        $unit = 's';
163
-        if ($time < 1) {
164
-            $time *= 1000;
165
-            $unit = 'ms';
166
-        } else if ($time > 60) {
167
-            $time /= 60;
168
-            $unit = 'm';
169
-        }
170
-        $time = number_format($time, $decimals);
171
-        return "{$time} {$unit}";
172
-    }
173
-
174
-    /**
175
-     * Static formatter for human-readable memory
176
-     *
177
-     * @param double  $size
178
-     * @param integer $decimals
179
-     */
180
-    public static function getReadableMemory($size, $decimals = 2)
181
-    {
182
-        $unitOptions = array('b', 'k', 'M', 'G');
183
-
184
-        $base = log($size, 1024);
185
-
186
-        $memory = round(pow(1024, $base - floor($base)), $decimals);
187
-        $unit = $unitOptions[floor($base)];
188
-        return "{$memory} {$unit}";
189
-    }
17
+	/** @var  array */
18
+	protected $output;
19
+
20
+	public function __construct()
21
+	{
22
+	}
23
+
24
+	public function setConsole(Console $console)
25
+	{
26
+		$console_data = array(
27
+			'messages' => array(),
28
+			'count'    => array(
29
+				'log'    => 0,
30
+				'memory' => 0,
31
+				'error'  => 0,
32
+				'speed'  => 0
33
+			)
34
+		);
35
+		foreach ($console->getLogs() as $log) {
36
+			switch($log['type']) {
37
+				case 'log':
38
+					$message = array(
39
+						'data' => print_r($log['data'], true),
40
+						'type' => 'log'
41
+					);
42
+					$console_data['count']['log']++;
43
+					break;
44
+				case 'memory':
45
+					$message = array(
46
+						'name' => $log['name'],
47
+						'data' => self::getReadableMemory($log['data']),
48
+						'type' => 'memory'
49
+					);
50
+					if (!empty($log['data_type'])) {
51
+						$message['data_type'] = $log['data_type'];
52
+					}
53
+					$console_data['count']['memory']++;
54
+					break;
55
+				case 'error':
56
+					$message = array(
57
+						'data' => $log['data'],
58
+						'file' => $log['file'],
59
+						'line' => $log['line'],
60
+						'type' => 'error'
61
+					);
62
+					$console_data['count']['error']++;
63
+					break;
64
+				case 'speed':
65
+					$elapsedTime = $log['data'] - $this->startTime;
66
+					$message = array(
67
+						'name' => $log['name'],
68
+						'data' => self::getReadableTime($elapsedTime),
69
+						'type' => 'speed'
70
+					);
71
+					$console_data['count']['speed']++;
72
+					break;
73
+				default:
74
+					$message = array(
75
+						'data' => "Unrecognized console log type: {$log['type']}",
76
+						'type' => 'error'
77
+					);
78
+					$console_data['count']['error']++;
79
+					break;
80
+			}
81
+			array_push($console_data['messages'], $message);
82
+		}
83
+		$this->output['console'] = $console_data;
84
+	}
85
+
86
+	/**
87
+	 * Sets file data
88
+	 *
89
+	 * @param array $data
90
+	 */
91
+	public function setFileData(array $data)
92
+	{
93
+		$fileData = array(
94
+			'fileList'   => array(),
95
+			'fileTotals' => array(
96
+				'count'   => count($data),
97
+				'size'    => 0,
98
+				'largest' => 0
99
+			)
100
+		);
101
+
102
+		foreach ($data as $file) {
103
+			array_push($fileData['fileList'], array(
104
+				'name' => $file['name'],
105
+				'size' => self::getReadableMemory($file['size'])
106
+			));
107
+
108
+			$fileData['fileTotals']['size'] += $file['size'];
109
+			if ($file['size'] > $fileData['fileTotals']['largest']) {
110
+				$fileData['fileTotals']['largest'] = $file['size'];
111
+			}
112
+		}
113
+
114
+		$fileData['fileTotals']['size'] = self::getReadableMemory($fileData['fileTotals']['size']);
115
+		$fileData['fileTotals']['largest'] = self::getReadableMemory($fileData['fileTotals']['largest']);
116
+
117
+		$this->output['files'] = $fileData['fileList'];
118
+		$this->output['fileTotals'] = $fileData['fileTotals'];
119
+	}
120
+
121
+	/**
122
+	 * Sets memory data
123
+	 *
124
+	 * @param array $data
125
+	 */
126
+	public function setMemoryData(array $data)
127
+	{
128
+		$this->output['memory'] = array(
129
+			'used'    => self::getReadableMemory($data['used']),
130
+			'allowed' => $data['allowed']
131
+		);
132
+	}
133
+
134
+	public function setQueryData(array $query_data)
135
+	{
136
+		// the void
137
+	}
138
+
139
+	/**
140
+	 * Sets speed data
141
+	 *
142
+	 * @param array $data
143
+	 */
144
+	public function setSpeedData(array $data)
145
+	{
146
+		$this->output['speed'] = array(
147
+			'elapsed' => self::getReadableTime($data['elapsed']),
148
+			'allowed' => self::getReadableTime($data['allowed'], 0)
149
+		);
150
+	}
151
+
152
+	/**
153
+	 * Static formatter for human-readable time
154
+	 * Only handles time up to 60 minutes gracefully
155
+	 *
156
+	 * @param double  $time
157
+	 * @param integer $decimals
158
+	 * @return string
159
+	 */
160
+	public static function getReadableTime($time, $decimals = 3)
161
+	{
162
+		$unit = 's';
163
+		if ($time < 1) {
164
+			$time *= 1000;
165
+			$unit = 'ms';
166
+		} else if ($time > 60) {
167
+			$time /= 60;
168
+			$unit = 'm';
169
+		}
170
+		$time = number_format($time, $decimals);
171
+		return "{$time} {$unit}";
172
+	}
173
+
174
+	/**
175
+	 * Static formatter for human-readable memory
176
+	 *
177
+	 * @param double  $size
178
+	 * @param integer $decimals
179
+	 */
180
+	public static function getReadableMemory($size, $decimals = 2)
181
+	{
182
+		$unitOptions = array('b', 'k', 'M', 'G');
183
+
184
+		$base = log($size, 1024);
185
+
186
+		$memory = round(pow(1024, $base - floor($base)), $decimals);
187
+		$unit = $unitOptions[floor($base)];
188
+		return "{$memory} {$unit}";
189
+	}
190 190
  
191
-    public function __invoke()
192
-    {
193
-        $output = $this->output;
194
-        require_once __DIR__ .'/../asset/display.tpl.php';
195
-    }
191
+	public function __invoke()
192
+	{
193
+		$output = $this->output;
194
+		require_once __DIR__ .'/../asset/display.tpl.php';
195
+	}
196 196
 }	
Please login to merge, or discard this patch.
src/PhpQuickProfiler.php 1 patch
Indentation   +101 added lines, -101 removed lines patch added patch discarded remove patch
@@ -15,82 +15,82 @@  discard block
 block discarded – undo
15 15
 class PhpQuickProfiler
16 16
 {
17 17
 
18
-    /** @var  Particletree\Pqp\Console */
19
-    protected $console;
18
+	/** @var  Particletree\Pqp\Console */
19
+	protected $console;
20 20
 
21
-    /** @var  integer */
22
-    protected $startTime;
21
+	/** @var  integer */
22
+	protected $startTime;
23 23
 
24
-    /**
25
-     * @param Particletree\Pqp\Console $console
26
-     * @param integer                  $startTime
27
-     */
28
-    public function __construct(Console $console, $startTime = null)
29
-    {
30
-        $this->console = $console;
24
+	/**
25
+	 * @param Particletree\Pqp\Console $console
26
+	 * @param integer                  $startTime
27
+	 */
28
+	public function __construct(Console $console, $startTime = null)
29
+	{
30
+		$this->console = $console;
31 31
 
32
-        if (is_null($startTime)) {
33
-            $startTime = microtime(true);
34
-        }
35
-        $this->startTime = $startTime;
36
-    }
32
+		if (is_null($startTime)) {
33
+			$startTime = microtime(true);
34
+		}
35
+		$this->startTime = $startTime;
36
+	}
37 37
 
38
-    /**
39
-     * Get data about files loaded for the application to current point
40
-     *
41
-     * @returns array
42
-     */
43
-    public function gatherFileData()
44
-    {
45
-        $files = get_included_files();
46
-        $data = array();
47
-        foreach ($files as $file) {
48
-            array_push($data, array(
49
-                'name' => $file,
50
-                'size' => filesize($file)
51
-            ));
52
-        }
53
-        return $data;
54
-    }
38
+	/**
39
+	 * Get data about files loaded for the application to current point
40
+	 *
41
+	 * @returns array
42
+	 */
43
+	public function gatherFileData()
44
+	{
45
+		$files = get_included_files();
46
+		$data = array();
47
+		foreach ($files as $file) {
48
+			array_push($data, array(
49
+				'name' => $file,
50
+				'size' => filesize($file)
51
+			));
52
+		}
53
+		return $data;
54
+	}
55 55
 
56
-    /**
57
-     * Get data about memory usage of the application
58
-     *
59
-     * @returns array
60
-     */
61
-    public function gatherMemoryData()
62
-    {
63
-        $usedMemory = memory_get_peak_usage();
64
-        $allowedMemory = ini_get('memory_limit');
65
-        return array(
66
-            'used'    => $usedMemory,
67
-            'allowed' => $allowedMemory
68
-        );
69
-    }
56
+	/**
57
+	 * Get data about memory usage of the application
58
+	 *
59
+	 * @returns array
60
+	 */
61
+	public function gatherMemoryData()
62
+	{
63
+		$usedMemory = memory_get_peak_usage();
64
+		$allowedMemory = ini_get('memory_limit');
65
+		return array(
66
+			'used'    => $usedMemory,
67
+			'allowed' => $allowedMemory
68
+		);
69
+	}
70 70
   
71 71
   /*--------------------------------------------------------
72 72
        QUERY DATA -- DATABASE OBJECT WITH LOGGING REQUIRED
73 73
   ----------------------------------------------------------*/
74 74
   
75 75
   public function gatherQueryData() {
76
-    $queryTotals = array();
77
-    $queryTotals['count'] = 0;
78
-    $queryTotals['time'] = 0;
79
-    $queries = array();
76
+	$queryTotals = array();
77
+	$queryTotals['count'] = 0;
78
+	$queryTotals['time'] = 0;
79
+	$queries = array();
80 80
     
81
-    if($this->db != '') {
82
-      $queryTotals['count'] += $this->db->queryCount;
83
-      foreach($this->db->queries as $query) {
84
-        $query = $this->attemptToExplainQuery($query);
85
-        $queryTotals['time'] += $query['time'];
86
-        $query['time'] = Display::getReadableTime($query['time']);
87
-        $queries[] = $query;
88
-      }
89
-    }
81
+	if($this->db != '') {
82
+	  $queryTotals['count'] += $this->db->queryCount;
83
+	  foreach($this->db->queries as $query) {
84
+		$query = $this->attemptToExplainQuery($query);
85
+		$queryTotals['time'] += $query['time'];
86
+		$query['time'] = Display::getReadableTime($query['time']);
87
+		$queries[] = $query;
88
+	  }
89
+	}
90 90
     
91
-    $queryTotals['time'] = Display::getReadableTime($queryTotals['time']);
92
-    $this->output['queries'] = $queries;
93
-    $this->output['queryTotals'] = $queryTotals;
91
+	$queryTotals['time'] = Display::getReadableTime($queryTotals['time']);
92
+	$this->output['queries'] = $queries;
93
+	$this->output['queryTotals'] = $queryTotals;
94 94
   }
95 95
   
96 96
   /*--------------------------------------------------------
@@ -98,46 +98,46 @@  discard block
 block discarded – undo
98 98
   ----------------------------------------------------------*/
99 99
   
100 100
   function attemptToExplainQuery($query) {
101
-    try {
102
-      $sql = 'EXPLAIN '.$query['sql'];
103
-      $rs = $this->db->query($sql);
104
-    }
105
-    catch(Exception $e) {}
106
-    if($rs) {
107
-      $row = mysql_fetch_array($rs, MYSQL_ASSOC);
108
-      $query['explain'] = $row;
109
-    }
110
-    return $query;
101
+	try {
102
+	  $sql = 'EXPLAIN '.$query['sql'];
103
+	  $rs = $this->db->query($sql);
104
+	}
105
+	catch(Exception $e) {}
106
+	if($rs) {
107
+	  $row = mysql_fetch_array($rs, MYSQL_ASSOC);
108
+	  $query['explain'] = $row;
109
+	}
110
+	return $query;
111 111
   }
112 112
 
113
-    /**
114
-     * Get data about speed of the application
115
-     *
116
-     * @returns array
117
-     */
118
-    public function gatherSpeedData()
119
-    {
120
-        $elapsedTime = microtime(true) - $this->startTime;
121
-        $allowedTime = ini_get('max_execution_time');
122
-        return array(
123
-            'elapsed' => $elapsedTime,
124
-            'allowed' => $allowedTime
125
-        );
126
-    }
113
+	/**
114
+	 * Get data about speed of the application
115
+	 *
116
+	 * @returns array
117
+	 */
118
+	public function gatherSpeedData()
119
+	{
120
+		$elapsedTime = microtime(true) - $this->startTime;
121
+		$allowedTime = ini_get('max_execution_time');
122
+		return array(
123
+			'elapsed' => $elapsedTime,
124
+			'allowed' => $allowedTime
125
+		);
126
+	}
127 127
 
128
-    /**
129
-     * Triggers end display of the profiling data
130
-     *
131
-     * @param Display $display
132
-     */
133
-    public function display(Display $display)
134
-    {
135
-        $display->setConsole($this->console);
136
-        $display->setFileData($this->gatherFileData());
137
-        $display->setMemoryData($this->gatherMemoryData());
138
-        $display->setQueryData($this->gatherQueryData());
139
-        $display->setSpeedData($this->gatherSpeedData());
128
+	/**
129
+	 * Triggers end display of the profiling data
130
+	 *
131
+	 * @param Display $display
132
+	 */
133
+	public function display(Display $display)
134
+	{
135
+		$display->setConsole($this->console);
136
+		$display->setFileData($this->gatherFileData());
137
+		$display->setMemoryData($this->gatherMemoryData());
138
+		$display->setQueryData($this->gatherQueryData());
139
+		$display->setSpeedData($this->gatherSpeedData());
140 140
 
141
-        $display();
142
-    }
141
+		$display();
142
+	}
143 143
 }
Please login to merge, or discard this patch.