rabe/helpers-cli-input
11
0
Fork 0
mirror of https://github.com/n3w/helpers-cli-input.git synced 2025-12-19 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Added Argv::findOptionInCollection() and Argv::findArgumentInCollection() wrapper method, which are used in Argv::parse()

Browse source
This commit is contained in:
Alannah Kearney 2019-06-01 22:44:09 +10:00
commit f7a9b66590
1 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/Input/Handlers/Argv.php
View file

@ -3,9 +3,10 @@
declare(strict_types=1); declare(strict_types=1);
namespace pointybeard\Helpers\Cli\Input\Handlers; namespace pointybeard\Helpers\Cli\Input\Handlers;
use pointybeard\Helpers\Cli\Input\Exceptions;
use pointybeard\Helpers\Cli\Input; use pointybeard\Helpers\Cli\Input;
use pointybeard\Helpers\Functions\Flags; use pointybeard\Helpers\Functions\Flags;
use pointybeard\Helpers\Functions\Debug;
class Argv extends Input\AbstractInputHandler class Argv extends Input\AbstractInputHandler
{ {
@ -61,9 +62,31 @@ class Argv extends Input\AbstractInputHandler
return $result; return $result;
} }
protected function findOptionInCollection(string $name): ?Input\AbstractInputType
{
$option = $this->collection->find($name);
if(!($option instanceof Input\AbstractInputType)) {
return null;
}
return $option;
}
protected function findArgumentInCollection(int $index, string $token): ?Input\AbstractInputType
{
$arguments = $this->collection->getItemsByType('Argument');
$position = 0;
foreach($arguments as $a) {
if($position == $index) {
return $a;
}
$position++;
}
return null;
}
protected function parse(): bool protected function parse(): bool
{ {
// So some parsing here.
$it = new \ArrayIterator($this->argv); $it = new \ArrayIterator($this->argv);
$position = 0; $position = 0;
@ -83,7 +106,7 @@ class Argv extends Input\AbstractInputHandler
$value = true; $value = true;
} }
$o = $this->collection->find($name); $o = $this->findOptionInCollection($name);
$this->input[ $this->input[
$o instanceof Input\AbstractInputType $o instanceof Input\AbstractInputType
@ -99,7 +122,7 @@ class Argv extends Input\AbstractInputHandler
// Determine if we're expecting a value. // Determine if we're expecting a value.
// It also might have a long option equivalent, so we need // It also might have a long option equivalent, so we need
// to look for that too. // to look for that too.
$o = $this->collection->find($name); $o = $this->findOptionInCollection($name);
// This could also be an incrementing value // This could also be an incrementing value
// and needs to be added up. E.g. e.g. -vvv or -v -v -v // and needs to be added up. E.g. e.g. -vvv or -v -v -v
@ -142,7 +165,8 @@ class Argv extends Input\AbstractInputHandler
// Arguments are positional, so we need to keep a track // Arguments are positional, so we need to keep a track
// of the index and look at the collection for an argument // of the index and look at the collection for an argument
// with the same index // with the same index
$a = $this->collection->getItemByIndex('Argument', $argumentCount); $a = $this->findArgumentInCollection($argumentCount, $token);
$this->input[ $this->input[
$a instanceof Input\AbstractInputType $a instanceof Input\AbstractInputType
? $a->name() ? $a->name()