Fix parsing error in console when parameter description contains -- (…

…#48021)
laravel · Aug 11, 2023 · d522b86 · d522b86
1 parent e95dc82
commit d522b86
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Illuminate/Console/Parser.php b/src/Illuminate/Console/Parser.php
@@ -16,7 +16,7 @@ class Parser
      *
      * @throws \InvalidArgumentException
      */
-    public static function parse($expression)
+    public static function parse(string $expression)
     {
         $name = static::name($expression);
 
@@ -35,7 +35,7 @@ public static function parse($expression)
      *
      * @throws \InvalidArgumentException
      */
-    protected static function name($expression)
+    protected static function name(string $expression)
     {
         if (! preg_match('/[^\s]+/', $expression, $matches)) {
             throw new InvalidArgumentException('Unable to determine command name from signature.');
@@ -45,7 +45,7 @@ protected static function name($expression)
     }
 
     /**
-     * Extract all of the parameters from the tokens.
+     * Extract all parameters from the tokens.
      *
      * @param  array  $tokens
      * @return array
@@ -57,7 +57,7 @@ protected static function parameters(array $tokens)
         $options = [];
 
         foreach ($tokens as $token) {
-            if (preg_match('/-{2,}(.*)/', $token, $matches)) {
+            if (preg_match('/^-{2,}(.*)/', $token, $matches)) {
                 $options[] = static::parseOption($matches[1]);
             } else {
                 $arguments[] = static::parseArgument($token);
@@ -73,7 +73,7 @@ protected static function parameters(array $tokens)
      * @param  string  $token
      * @return \Symfony\Component\Console\Input\InputArgument
      */
-    protected static function parseArgument($token)
+    protected static function parseArgument(string $token)
     {
         [$token, $description] = static::extractDescription($token);
 
@@ -99,7 +99,7 @@ protected static function parseArgument($token)
      * @param  string  $token
      * @return \Symfony\Component\Console\Input\InputOption
      */
-    protected static function parseOption($token)
+    protected static function parseOption(string $token)
     {
         [$token, $description] = static::extractDescription($token);
 
@@ -132,7 +132,7 @@ protected static function parseOption($token)
      * @param  string  $token
      * @return array
      */
-    protected static function extractDescription($token)
+    protected static function extractDescription(string $token)
     {
         $parts = preg_split('/\s+:\s+/', trim($token), 2);