[Console] fixed StringInput binding

jfsimon · jfsimon · commit 6681df0a12a1 · 2013-03-01T17:50:10.000+01:00
diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
@@ -37,9 +37,13 @@ class StringInput extends ArgvInput
      */
     public function __construct($input, InputDefinition $definition = null)
     {
-        parent::__construct(array(), $definition);
+        parent::__construct(array(), null);
 
         $this->setTokens($this->tokenize($input));
+
+        if (null !== $definition) {
+            $this->bind($definition);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
@@ -35,11 +35,14 @@ public function testInputOptionWithGivenString()
             array(new InputOption('foo', null, InputOption::VALUE_REQUIRED))
         );
 
+        // call to bind
         $input = new StringInput('--foo=bar');
         $input->bind($definition);
-        $actual = $input->getOption('foo');
+        $this->assertEquals('bar', $input->getOption('foo'));
 
-        $this->assertEquals('bar', $actual);
+        // definition in constructor
+        $input = new StringInput('--foo=bar', $definition);
+        $this->assertEquals('bar', $input->getOption('foo'));
     }
 
     public function getTokenizeData()

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,13 @@ class StringInput extends ArgvInput`
`37`	`37`	`*/`
`38`	`38`	`public function __construct($input, InputDefinition $definition = null)`
`39`	`39`	`{`
`40`		`- parent::__construct(array(), $definition);`
	`40`	`+ parent::__construct(array(), null);`
`41`	`41`
`42`	`42`	`$this->setTokens($this->tokenize($input));`
	`43`	`+`
	`44`	`+ if (null !== $definition) {`
	`45`	`+ $this->bind($definition);`
	`46`	`+ }`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`/**`