Merge branch 'patch-2' into 1.x

Author: taylorotwell

src/Commands/Concerns/InteractsWithIO.php

@@ -94,12 +94,12 @@ public function requestInfo($request, $verbosity = null)
         $terminalWidth = $this->getTerminalWidth();
 
         $url = parse_url($request['url'], PHP_URL_PATH) ?: '/';
-
         $duration = number_format(round($request['duration'], 2), 2, '.', '');
+        $memory = number_format(round($request['memory'] ?? memory_get_usage() / 1024 / 1204, 2), 2, '.', '');
 
         ['method' => $method, 'statusCode' => $statusCode] = $request;
 
-        $dots = str_repeat('.', max($terminalWidth - strlen($method.$url.$duration) - 16, 0));
+        $dots = str_repeat('.', max($terminalWidth - strlen($method.$url.$duration.$memory) - 19, 0));
 
         if (empty($dots) && ! $this->output->isVerbose()) {
             $url = substr($url, 0, $terminalWidth - strlen($method.$duration) - 15 - 3).'...';
@@ -108,7 +108,7 @@ public function requestInfo($request, $verbosity = null)
         }
 
         $this->output->writeln(sprintf(
-           '  <fg=%s;options=bold>%s </>   <fg=cyan;options=bold>%s</> <options=bold>%s</><fg=#6C7280> %s%s ms</>',
+           '  <fg=%s;options=bold>%s </>   <fg=cyan;options=bold>%s</> <options=bold>%s</><fg=#6C7280> %s%s mb %s ms</>',
             match (true) {
                 $statusCode >= 500 => 'red',
                 $statusCode >= 400 => 'yellow',
@@ -120,6 +120,7 @@ public function requestInfo($request, $verbosity = null)
            $method,
            $url,
            $dots,
+           $memory,
            $duration,
         ), $this->parseVerbosity($verbosity));
     }

tests/CommandTest.php

@@ -54,28 +54,31 @@ public function test_request()
             'method' => 'GET',
             'url' => 'http://127.0.0.1/welcome',
             'statusCode' => '200',
+            'memory' => 23.43,
             'duration' => 10,
         ]);
 
         $command->requestInfo([
             'method' => 'POST',
             'url' => 'http://127.0.0.1:8080',
             'statusCode' => '404',
+            'memory' => 26.43,
             'duration' => 1234,
         ]);
 
         $command->requestInfo([
             'method' => 'POST',
             'url' => 'http://127.0.0.1:8080/'.str_repeat('foo', 100),
             'statusCode' => 500,
+            'memory' => 28.43,
             'duration' => 4567854,
         ]);
 
         $this->assertEquals(<<<'EOF'
-  200    GET /welcome .................. 10.00 ms
-  404    POST / ...................... 1234.00 ms
-  500    POST /foofoofoofoofoofo... 4567854.00 ms
-
+  200    GET /welcome ..........23.43 mb 10.00 ms
+  404    POST / ..............26.43 mb 1234.00 ms
+  500    POST /foofoofoofoofoofo... 23.46 mb 4567854.00 ms
+  
 EOF, $output->fetch());
     }