fix: do not read an undefined offset when a value argument is last
The argument parser looked up the next command-line token via $argv[$key + 1] guarded only by count($argv) === 0. The remaining arguments array is not reindexed after earlier arguments are removed, so a value-taking argument placed last (after an unconsumed token) read an undefined offset and raised an Undefined array key warning under PHP 8, and the argument was set to empty instead of falling back to its default. Check that the next offset exists with isset().
This commit is contained in:
1 parent
e8a9b69c46
commit
06b3825ee5
2 files changed
+26
-1
No files matched your search
@@ -261,7 +261,9 @@ class Parser
|
||||
}
|
||||
|
||||
if (is_null($value)) {
|
||||
if (count($argv) === 0) {
|
||||
// The array is not reindexed as arguments are removed, so check the next
|
||||
// offset itself rather than the overall count.
|
||||
if (!isset($argv[$key + 1])) {
|
||||
return $argv;
|
||||
}
|
||||
|
||||
|
||||
@@ -87,6 +87,29 @@ class ManagerTest extends TestCase
|
||||
$this->assertEquals('', $this->manager->get('foo'));
|
||||
}
|
||||
|
||||
public function testItParsesAValueTakingArgumentThatIsLastWithoutAWarning()
|
||||
{
|
||||
$this->manager->add([
|
||||
'name' => ['prefix' => 'n', 'longPrefix' => 'name', 'defaultValue' => 'default-name'],
|
||||
]);
|
||||
|
||||
set_error_handler(static function (int $errno, string $errstr): bool {
|
||||
throw new \ErrorException($errstr, 0, $errno);
|
||||
});
|
||||
|
||||
try {
|
||||
// "-n" is the last element but not at a reindexed offset, so reading the
|
||||
// next offset must not raise "Undefined array key".
|
||||
$this->manager->parse(['command', 'somefile', '-n']);
|
||||
} finally {
|
||||
restore_error_handler();
|
||||
}
|
||||
|
||||
// No value was supplied for -n, so it must fall back to its default.
|
||||
$this->assertFalse($this->manager->provided('name'));
|
||||
$this->assertEquals('default-name', $this->manager->get('name'));
|
||||
}
|
||||
|
||||
public function testItStoresTrailingInArray()
|
||||
{
|
||||
$this->manager->add([
|
||||
|
||||
Reference in new issue
Block a user