bug #14888 [Console] Fix ask and askHidden methods (dosten)

fabpot · fabpot · commit 18f0dda25aaf · 2015-06-06T16:06:47.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Console] Fix ask and askHidden methods | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14885 | License | MIT | Doc PR | - Commits ------- 5bb2cc8 Fix ask and askHidden methods
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -205,7 +205,7 @@ public function ask($question, $default = null, $validator = null)
         $question = new Question($question, $default);
         $question->setValidator($validator);
 
-        return $this->askQuestion($question, $validator);
+        return $this->askQuestion($question);
     }
 
     /**
@@ -214,9 +214,11 @@ public function ask($question, $default = null, $validator = null)
     public function askHidden($question, $validator = null)
     {
         $question = new Question($question);
+
         $question->setHidden(true);
+        $question->setValidator($validator);
 
-        return $this->askQuestion($question, $validator);
+        return $this->askQuestion($question);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function ask($question, $default = null, $validator = null)`
`205`	`205`	`$question = new Question($question, $default);`
`206`	`206`	`$question->setValidator($validator);`
`207`	`207`
`208`		`- return $this->askQuestion($question, $validator);`
	`208`	`+ return $this->askQuestion($question);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`/**`
`@@ -214,9 +214,11 @@ public function ask($question, $default = null, $validator = null)`
`214`	`214`	`public function askHidden($question, $validator = null)`
`215`	`215`	`{`
`216`	`216`	`$question = new Question($question);`
	`217`	`+`
`217`	`218`	`$question->setHidden(true);`
	`219`	`+ $question->setValidator($validator);`
`218`	`220`
`219`		`- return $this->askQuestion($question, $validator);`
	`221`	`+ return $this->askQuestion($question);`
`220`	`222`	`}`
`221`	`223`
`222`	`224`	`/**`