merged branch jfsimon/issue-6749 (PR #7220)

fabpot · fabpot · commit f52120bdd33b · 2013-02-28T18:08:29.000+01:00
This PR was merged into the 2.1 branch. Commits ------- 5b19c89 [Console] fixed unparsed StringInput tokens 635b1fc StringInput resets the given options. Discussion ---------- [Console] fixes unparsed StringInput tokens `StringInput` instances call `setToken` after constructor, `parse` method is called in constructor, so `StringInput` tokens where never parsed. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6749
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -68,6 +68,7 @@ public function __construct(array $argv = null, InputDefinition $definition = nu
     protected function setTokens(array $tokens)
     {
         $this->tokens = $tokens;
+        $this->parse();
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Console\Tests\Input;
 
 use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
 
 class StringInputTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,6 +29,18 @@ public function testTokenize($input, $tokens, $message)
         $this->assertEquals($tokens, $p->getValue($input), $message);
     }
 
+    public function testInputOptionWithGivenString()
+    {
+        $definition = new InputDefinition(
+            array(new InputOption('foo', null, InputOption::VALUE_REQUIRED))
+        );
+
+        $input = new StringInput('--foo=bar', $definition);
+        $actual = $input->getOption('foo');
+
+        $this->assertEquals('bar', $actual);
+    }
+
     public function getTokenizeData()
     {
         return array(

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public function __construct(array $argv = null, InputDefinition $definition = nu`
`68`	`68`	`protected function setTokens(array $tokens)`
`69`	`69`	`{`
`70`	`70`	`$this->tokens = $tokens;`
	`71`	`+ $this->parse();`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`/**`