[11.x] Support New Lines in Command Argument and Option Descriptions

src/Illuminate/Console/Parser.php

@@ -14,13 +14,13 @@ class Parser
      * @param  string  $expression
      * @return array
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
-    public static function parse(string $expression)
+    public static function parse(string $expression): array
     {
         $name = static::name($expression);
 
-        if (preg_match_all('/\{\s*(.*?)\s*\}/', $expression, $matches) && count($matches[1])) {
+        if (preg_match_all('/\{([^}]*)}/s', $expression, $matches) && count($matches[1])) {
             return array_merge([$name], static::parameters($matches[1]));
         }
 
@@ -33,9 +33,9 @@ public static function parse(string $expression)
      * @param  string  $expression
      * @return string
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
-    protected static function name(string $expression)
+    protected static function name(string $expression): string
     {
         if (! preg_match('/[^\s]+/', $expression, $matches)) {
             throw new InvalidArgumentException('Unable to determine command name from signature.');
@@ -50,7 +50,7 @@ protected static function name(string $expression)
      * @param  array  $tokens
      * @return array
      */
-    protected static function parameters(array $tokens)
+    protected static function parameters(array $tokens): array
     {
         $arguments = [];
 
@@ -73,7 +73,7 @@ protected static function parameters(array $tokens)
      * @param  string  $token
      * @return \Symfony\Component\Console\Input\InputArgument
      */
-    protected static function parseArgument(string $token)
+    protected static function parseArgument(string $token): InputArgument
     {
         [$token, $description] = static::extractDescription($token);
 
@@ -99,7 +99,7 @@ protected static function parseArgument(string $token)
      * @param  string  $token
      * @return \Symfony\Component\Console\Input\InputOption
      */
-    protected static function parseOption(string $token)
+    protected static function parseOption(string $token): InputOption
     {
         [$token, $description] = static::extractDescription($token);
 
@@ -132,7 +132,7 @@ protected static function parseOption(string $token)
      * @param  string  $token
      * @return array
      */
-    protected static function extractDescription(string $token)
+    protected static function extractDescription(string $token): array
     {
         $parts = preg_split('/\s+:\s+/', trim($token), 2);
 

tests/Console/ConsoleParserTest.php

@@ -5,6 +5,8 @@
 use Illuminate\Console\Parser;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
 
 class ConsoleParserTest extends TestCase
 {
@@ -161,4 +163,24 @@ public function testNameInEmptyException()
 
         Parser::parse('');
     }
+
+    public function testItParsesCommandWithArgumentAndOptionWithNewLines()
+    {
+        $signature = 'command:name
+                    {argument= :
+                        The description of the argument.
+                        This can span multiple lines for clarity.}
+                    {--o|option= : The description of the option. Can be a value like "value1", "value2", etc.}';
+
+        $result = Parser::parse($signature);
+
+        $this->assertIsArray($result);
+        $this->assertEquals('command:name', $result[0]);
+
+        $this->assertCount(1, $result[1]);
+        $this->assertInstanceOf(InputArgument::class, $result[1][0]);
+
+        $this->assertCount(1, $result[2]);
+        $this->assertInstanceOf(InputOption::class, $result[2][0]);
+    }
 }