Edited src/Symfony/Component/Console/Helper/DialogHelper.php via GitHub

lenar · lenar · commit 511a9a1fd75a · 2011-07-05T00:19:44.000-07:00
diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -35,9 +35,12 @@ public function ask(OutputInterface $output, $question, $default = null)
     {
         $output->write($question);
 
-        $ret = trim(fgets(null === $this->inputStream ? STDIN : $this->inputStream));
+        if (false === $ret = fgets(null === $this->inputStream ? STDIN : $this->inputStream)) {
+            throw new \Exception('Aborted');
+        }
+        $ret = trim($ret);
 
-        return $ret ? $ret : $default;
+        return strlen($ret) > 0 ? $ret : $default;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,12 @@ public function ask(OutputInterface $output, $question, $default = null)`
`35`	`35`	`{`
`36`	`36`	`$output->write 8E13 ($question);`
`37`	`37`
`38`		`- $ret = trim(fgets(null === $this->inputStream ? STDIN : $this->inputStream));`
	`38`	`+ if (false === $ret = fgets(null === $this->inputStream ? STDIN : $this->inputStream)) {`
	`39`	`+ throw new \Exception('Aborted');`
	`40`	`+ }`
	`41`	`+ $ret = trim($ret);`
`39`	`42`
`40`		`- return $ret ? $ret : $default;`
	`43`	`+ return strlen($ret) > 0 ? $ret : $default;`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`/**`