Adding timeout options both CLI and .cigar.json #32
Conversation
1 similar comment
bin/cigar
Outdated
| @@ -18,7 +18,7 @@ use Brunty\Cigar\Outputter; | |||
| use Brunty\Cigar\Parser; | |||
| use Brunty\Cigar\Result; | |||
|
|
|||
| $options = getopt('c:ia:u:jh:', ['version', 'help', 'quiet', 'config:', 'insecure', 'auth:', 'url:', 'json', 'header:']); | |||
| $options = getopt('c:ia:u:jh:t:ct:', ['version', 'help', 'quiet', 'config:', 'insecure', 'auth:', 'url:', 'json', 'header:', 'timeout:', 'connect-timeout:']); | |||
There was a problem hiding this comment.
Shortopts are for single-character options only, so ct won't work (we also already have a c and a t option, so it'll produce results like this:
> php opts.php -c 'config_file.json' -t 'timeout' -ct '1'
array(2) {
["c"]=>
array(2) {
[0]=>
string(16) "config_file.json"
[1]=>
string(1) "t"
}
["t"]=>
string(7) "timeout"
}
There was a problem hiding this comment.
Doh my bad, changed it 👍
bin/cigar
Outdated
| \033[32m-i, --insecure\033[0m Allow invalid SSL certificates | ||
| \033[32m-a, --auth\033[0m Authorization header "\074type\076 \074credentials\076" | ||
| \033[32m-h, --header\033[0m Custom header "\074name\076: \074value\076" | ||
| \033[32m-ct, --connect-timeout=TIMEOUT\033[0m Connect Timeout |
There was a problem hiding this comment.
Help output will need changing with the change of the ct option
There was a problem hiding this comment.
Removed the mention of ct here
bin/cigar
Outdated
| $secure = ! (isset($options['i']) || isset($options['insecure'])); | ||
| $authorization = $options['a'] ?? $options['auth'] ?? null; | ||
| $headers = (array) ($options['h'] ?? $options['header'] ?? []); | ||
| $connectTimeout = $options['connect-timeout'] ?? null; |
There was a problem hiding this comment.
This will always be null as connect-timeout is not in the options anymore (but it's still in the help text)
|
@Brunty pick a letter and I can use that one. But there isn't one that directly makes sense. |
|
@Brunty ping, let me know if you have a preference for a letter I can use, otherwise I'll pick one using RNG later this week |
|
@Brunty ok updated it with |
|
Assuming this would be 1.12, should I tag is later today? |
|
Please! I'll squash and merge now :) |
|
Ok it's out: https://github.com/Brunty/cigar/releases/tag/1.12.0 |
🎆🎆🎆 Happy New Year 🎆🎆🎆
This PR adds the timeout options discussed in #31
Closes / implements #31
Any values in the CLI are overridden by what ever value is in the
.cigar.json