From 36ff9abe67535eaa6fd6c1cf75d11abdc26ab844 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Thu, 10 Feb 2011 16:53:18 -0800 Subject: [PATCH] [Console] fixed new ArgvInput method --- .../Component/Console/Input/ArgvInput.php | 2 +- .../Component/Console/Input/ArgvInputTest.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 6ad4812144..256a15c9c4 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -276,7 +276,7 @@ class ArgvInput extends Input if (false !== $pos = strpos($token, '=')) { return substr($token, $pos + 1); } else { - return array_shift($this->tokens); + return array_shift($tokens); } } } diff --git a/tests/Symfony/Tests/Component/Console/Input/ArgvInputTest.php b/tests/Symfony/Tests/Component/Console/Input/ArgvInputTest.php index c9d1feb318..f9e701fc60 100644 --- a/tests/Symfony/Tests/Component/Console/Input/ArgvInputTest.php +++ b/tests/Symfony/Tests/Component/Console/Input/ArgvInputTest.php @@ -157,6 +157,25 @@ class ArgvInputTest extends \PHPUnit_Framework_TestCase $input = new TestInput(array('cli.php', 'foo')); $this->assertFalse($input->hasParameterOption('--foo'), '->hasParameterOption() returns false if the given short option is not in the raw input'); } + + /** + * @dataProvider provideGetParameterOptionValues + */ + public function testGetParameterOptionEqualSign($argv, $key, $expected) + { + $input = new ArgvInput($argv); + $this->assertEquals($expected, $input->getParameterOption($key), '->getParameterOption() returns the expected value'); + } + + public function provideGetParameterOptionValues() + { + return array( + array(array('app/console', 'foo:bar', '-e', 'dev'), '-e', 'dev'), + array(array('app/console', 'foo:bar', '--env=dev'), '--env', 'dev'), + array(array('app/console', 'foo:bar', '-e', 'dev'), array('-e', '--env'), 'dev'), + array(array('app/console', 'foo:bar', '--env=dev'), array('-e', '--env'), 'dev'), + ); + } } class TestInput extends ArgvInput