opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

git: Refactor, use getopt() for parsing args

Browse source
This commit is contained in:
Oliver Davies 2020-05-27 17:35:01 +01:00
parent 01a30f5168
commit e82e134e51
1 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bin/git-close-pull-request
View file

@ -29,7 +29,6 @@ class ClosesPullRequests
public function __construct() public function __construct()
{ {
$this->localBranch = exec('git rev-parse --abbrev-ref HEAD'); $this->localBranch = exec('git rev-parse --abbrev-ref HEAD');
$this->targetBranch = $this->getTargetBranchFromArgs(); $this->targetBranch = $this->getTargetBranchFromArgs();
$this->remoteBranch = exec('git rev-parse --abbrev-ref --symbolic-full-name @{u}'); $this->remoteBranch = exec('git rev-parse --abbrev-ref --symbolic-full-name @{u}');
@ -52,7 +51,7 @@ class ClosesPullRequests
private function getTargetBranchFromArgs(): string private function getTargetBranchFromArgs(): string
{ {
if (!$targetBranchName = $this->getArg(['-t', '--target'])) { if (!$targetBranchName = $this->getArg('t:', ['target:'])) {
die('Invalid target branch specified. Aborting.'); die('Invalid target branch specified. Aborting.');
} }
@ -160,34 +159,13 @@ class ClosesPullRequests
exec(sprintf('git branch -d %s', $this->localBranch)); exec(sprintf('git branch -d %s', $this->localBranch));
} }
private function getArg(array $flags): ?string private function getArg(string $shortOpts, array $longOpts = []): ?string
{ {
$args = $_SERVER['argv']; if (!$values = getopt($shortOpts, $longOpts)) {
return NULL;
if (!$this->hasArg($flags)) {
return null;
} }
$foundArgs = array_intersect($args, $flags); return current($values);
// Find the position of the first matching argument within the arguments
// array.
$position = array_search(current($foundArgs), $args);
// Return the value by finding the next value. For example:
// [2 => '-t', 3 => 'master']
if (!array_key_exists($position + 1, $args)) {
return null;
}
return $args[$position + 1];
}
private function hasArg(array $flags): bool
{
$args = $_SERVER['argv'];
return !empty(array_intersect($args, $flags));
} }
} }