[Console] Removed useless else

symfony · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011
commit 46d28ce1b153d61d7e6276e107e3a3d1647a4497
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -129,9 +129,9 @@ public function run(InputInterface $input = null, OutputInterface $output = null
             // @codeCoverageIgnoreStart
             exit($statusCode);
             // @codeCoverageIgnoreEnd
-        } else {
-            return $statusCode;
         }
+
+        return $statusCode;
     }
 
     /**
@@ -315,9 +315,9 @@ public function getLongVersion()
     {
         if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) {
             return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
-        } else {
-            return '<info>Console Tool</info>';
         }
+
+        return '<info>Console Tool</info>';
     }
 
     /**

diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -159,9 +159,9 @@ public function run(InputInterface $input, OutputInterface $output)
 
         if ($this->code) {
             return call_user_func($this->code, $input, $output);
-        } else {
-            return $this->execute($input, $output);
         }
+
+        return $this->execute($input, $output);
     }
 
     /**

diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -61,9 +61,9 @@ public function askConfirmation(OutputInterface $output, $question, $default = t
 
         if (false === $default) {
             return $answer && 'y' == strtolower($answer[0]);
-        } else {
-            return !$answer || 'y' == strtolower($answer[0]);
         }
+
+        return !$answer || 'y' == strtolower($answer[0]);
         // @codeCoverageIgnoreEnd
     }
 

diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -275,9 +275,9 @@ public function getParameterOption($values, $default = false)
                 if (0 === strpos($token, $value)) {
                     if (false !== $pos = strpos($token, '=')) {
                         return substr($token, $pos + 1);
-                    } else {
-                        return array_shift($tokens);
                     }
+
+                    return array_shift($tokens);
                 }
             }
         }

diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -97,9 +97,9 @@ protected function hasColorSupport()
         // @codeCoverageIgnoreStart
         if (DIRECTORY_SEPARATOR == '\\') {
             return false !== getenv('ANSICON');
-        } else {
-            return function_exists('posix_isatty') && @posix_isatty($this->stream);
         }
+
+        return function_exists('posix_isatty') && @posix_isatty($this->stream);
         // @codeCoverageIgnoreEnd
     }
 }