Cli: improve option parsing

Author: janedbal

src/Cli.php

@@ -98,6 +98,10 @@ public function __construct(string $cwd, array $argv)
                     $this->providedOptions[$optionName] = $optionArgument;
                 }
             } else {
+                if ($this->getOptionArgumentAfterAssign($arg) !== null) {
+                    throw new InvalidCliException("Option --$optionName does not accept arguments, see --help");
+                }
+
                 $this->providedOptions[$optionName] = true;
             }
         }
@@ -122,7 +126,10 @@ private function isOptionWithRequiredValue(string $optionName): bool
     private function getKnownOptionName(string $option): ?string
     {
         foreach (self::OPTIONS as $knownOption => $needsArgument) {
-            if (strpos($option, $knownOption) === 0) {
+            if (
+                strpos($option, $knownOption) === 0
+                && (strlen($option) === strlen($knownOption) || $option[strlen($knownOption)] === '=')
+            ) {
                 return $knownOption;
             }
         }

tests/CliTest.php

@@ -115,6 +115,16 @@ public function validationDataProvider(): iterable
             ['bin/script.php', '--composer-json='],
         ];
 
+        yield 'valid option is substring of provided option' => [
+            'Unknown option --configuration=foo, see --help',
+            ['bin/script.php', '--configuration=foo'],
+        ];
+
+        yield 'argument-less option with argument' => [
+            'Option --verbose does not accept arguments, see --help',
+            ['bin/script.php', '--verbose=foo'],
+        ];
+
         yield 'suggestion #1' => [
             'Unknown option --hep, did you mean --help?',
             ['bin/script.php', '--hep'],