Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Apr 4, 2024
2 parents a540d9b + 3a3cd12 commit 47c93ee
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Parser.php
Expand Up @@ -53,7 +53,7 @@ public function parse(array $argv, string $shortOptions, ?array $longOptions = n
$options = [];
$nonOptions = [];

if ($longOptions) {
if ($longOptions !== null) {
sort($longOptions);
}

Expand Down Expand Up @@ -82,7 +82,7 @@ public function parse(array $argv, string $shortOptions, ?array $longOptions = n
break;
}

if ($arg[0] !== '-' || (strlen($arg) > 1 && $arg[1] === '-' && !$longOptions)) {
if ($arg[0] !== '-' || (strlen($arg) > 1 && $arg[1] === '-' && $longOptions === null)) {
$nonOptions[] = $arg;

continue;
Expand Down Expand Up @@ -135,7 +135,7 @@ private function parseShortOption(string $argument, string $shortOptions, array
if (!(strlen($spec) > 2 && $spec[2] === ':')) {
$optionArgument = current($argv);

if (!$optionArgument) {
if ($optionArgument === false) {
throw new RequiredOptionArgumentMissingException('-' . $option);
}

Expand Down Expand Up @@ -191,7 +191,7 @@ private function parseLongOption(string $argument, array $longOptions, array &$o

next($argv);
}
} elseif ($optionArgument) {
} elseif ($optionArgument !== null) {
throw new OptionDoesNotAllowArgumentException('--' . $option);
}

Expand Down

0 comments on commit 47c93ee

Please sign in to comment.