merged branch jfsimon/console-tests-fix (PR #7232)

fabpot · fabpot · commit ff00f9856aea · 2013-03-01T15:57:26.000+01:00
This PR was merged into the 2.2 branch. Commits ------- 5bf2f71 [Console] added deprecation annotation f95f8e2 [Console] added string input test 4b12118 Revert "merged branch jfsimon/issue-6749 (PR #7220)" Discussion ---------- [Console] fixes tests Previous `StringInputTest::testInputOptionWithGivenString` test was broken. Trying make it pass broke the way `StringInput` is used in the console. Two things to know abour the `StringInput` class in its actual state: * the second argument in the constructor is useless * the `bind` method **must** be called in order to access arguments/options | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -68,7 +68,6 @@ 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/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
@@ -33,6 +33,8 @@ class StringInput extends ArgvInput
      * @param string          $input      An array of parameters from the CLI (in the argv format)
      * @param InputDefinition $definition A InputDefinition instance
      *
+     * @deprecated The second argument is deprecated as it does not work (will be removed in 3.0), use 'bind' method instead
+     *
      * @api
      */
     public function __construct($input, InputDefinition $definition = null)
diff --git a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Console\Tests\Input;
 
-use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\StringInput;
 
 class StringInputTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,7 +35,8 @@ public function testInputOptionWithGivenString()
             array(new InputOption('foo', null, InputOption::VALUE_REQUIRED))
         );
 
-        $input = new StringInput('--foo=bar', $definition);
+        $input = new StringInput('--foo=bar');
+        $input->bind($definition);
         $actual = $input->getOption('foo');
 
         $this->assertEquals('bar', $actual);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ 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();`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ class StringInput extends ArgvInput`
`33`	`33`	`* @param string $input An array of parameters from the CLI (in the argv format)`
`34`	`34`	`* @param InputDefinition $definition A InputDefinition instance`
`35`	`35`	`*`
	`36`	`+ * @deprecated The second argument is deprecated as it does not work (will be removed in 3.0), use 'bind' method instead`
	`37`	`+ *`
`36`	`38`	`* @api`
`37`	`39`	`*/`
`38`	`40`	`public function __construct($input, InputDefinition $definition = null)`