FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Ensure php7.4 compatibility by usox · Pull Request #16 · splitbrain/php-cli · GitHub

/ php-cli Public

Ensure php7.4 compatibility #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
splitbrain merged 1 commit into from
Dec 12, 2019
Conversation 4 Commits 1 Checks 0 Files changed
Merged

Ensure php7.4 compatibility #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .php  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 2 additions & 2 deletions src/Options.php
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,13 @@ public function parseOptions()
}

// first non-option
if ($arg{0} != '-') {
if ($arg[0] != '-') {
$non_opts = array_merge($non_opts, array_slice($this->args, $i));
break;
}

// long option
if (strlen($arg) > 1 && $arg{1} == '-') {
if (strlen($arg) > 1 && $arg[1] === '-') {
$arg = explode('=', substr($arg, 2), 2);
$opt = array_shift($arg);
$val = array_shift($arg);
Expand Down
43 changes: 27 additions & 16 deletions tests/OptionsTest.php
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,41 @@ class Options extends \splitbrain\phpcli\Options
class OptionsTest extends \PHPUnit_Framework_TestCase
{

function test_simpleshort()
{
/**
* @dataProvider optionDataProvider
*
* @param string $option
* @param string $value
* @param string $argument
*/
function test_optionvariants(
$option,
$value,
$argument
) {
$options = new Options();
$options->registerOption('exclude', 'exclude files', 'x', 'file');

$options->args = array('-x', 'foo', 'bang');
$options->args = array($option, $value, $argument);
$options->parseOptions();

$this->assertEquals('foo', $options->getOpt('exclude'));
$this->assertEquals(array('bang'), $options->args);
$this->assertEquals($value, $options->getOpt('exclude'));
$this->assertEquals(array($argument), $options->args);
$this->assertFalse($options->getOpt('nothing'));
}

function test_simplelong1()
{
$options = new Options();
$options->registerOption('exclude', 'exclude files', 'x', 'file');

$options->args = array('--exclude', 'foo', 'bang');
$options->parseOptions();

$this->assertEquals('foo', $options->getOpt('exclude'));
$this->assertEquals(array('bang'), $options->args);
$this->assertFalse($options->getOpt('nothing'));
/**
* @return array
*/
public function optionDataProvider() {
return array(
array('-x', 'foo', 'bang'),
array('--exclude', 'foo', 'bang'),
array('-x', 'foo-bar', 'bang'),
array('--exclude', 'foo-bar', 'bang'),
array('-x', 'foo', 'bang--bang'),
array('--exclude', 'foo', 'bang--bang'),
);
}

function test_simplelong2()
Expand Down
Back | FazBrowse Home | New Git URL