symfony · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011 · Feb 27, 2011
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php
@@ -17,8 +17,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
-use Doctrine\Common\Cli\Configuration;
-use Doctrine\Common\Cli\CliController as DoctrineCliController;
 use Doctrine\DBAL\Connection;
 
 /**

diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php
@@ -17,8 +17,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
-use Doctrine\Common\Cli\Configuration;
-use Doctrine\Common\Cli\CliController as DoctrineCliController;
 use Doctrine\DBAL\Connection;
 
 /**
@@ -74,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         } else {
             $output->writeln(sprintf('<info>Would drop the database named <comment>%s</comment>.</info>', $name));
-            $output->writeln(sprintf('<error>All data will be lost!</error>', $name));
+            $output->writeln('<error>All data will be lost!</error>');
         }
     }
 }
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/LoadDataFixturesDoctrineCommand.php
@@ -19,8 +19,6 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
 use Symfony\Bundle\DoctrineAbstractBundle\Common\DataFixtures\Loader as DataFixturesLoader;
-use Doctrine\Common\Cli\Configuration;
-use Doctrine\Common\Cli\CliController as DoctrineCliController;
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\ORM\EntityManager;

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/LoadDataFixturesDoctrineODMCommand.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Command/LoadDataFixturesDoctrineODMCommand.php
@@ -19,8 +19,6 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
 use Symfony\Bundle\DoctrineAbstractBundle\Common\DataFixtures\Loader as DataFixturesLoader;
-use Doctrine\Common\Cli\Configuration;
-use Doctrine\Common\Cli\CliController as DoctrineCliController;
 use Doctrine\Common\DataFixtures\Executor\MongoDBExecutor;
 use Doctrine\Common\DataFixtures\Purger\MongoDBPurger;
 use Doctrine\ODM\MongoDB\DocumentManager;

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -159,8 +159,8 @@ protected function formatValue($value)
     {
         if (is_object($value)) {
             return sprintf('object(%s)', get_class($value));
-        } else {
-            return preg_replace("/\n\s*/s", '', var_export($value, true));
         }
+
+        return preg_replace("/\n\s*/s", '', var_export($value, true));
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -66,9 +66,9 @@ private function attributesCallback($name, $value)
     {
         if (false === $value || null === $value || ('' === $value && 'value' != $name)) {
             return '';
-        } else {
-            return ' '.$this->attribute($name, $value);
         }
+
+        return ' '.$this->attribute($name, $value);
     }
 
     /**

diff --git a/src/Symfony/Component/BrowserKit/Response.php b/src/Symfony/Component/BrowserKit/Response.php
@@ -118,9 +118,9 @@ public function getHeader($header, $first = true)
             if (str_replace('-', '_', strtolower($key)) == str_replace('-', '_', strtolower($header))) {
                 if ($first) {
                     return is_array($value) ? (count($value) ? $value[0] : '') : $value;
-                } else {
-                    return is_array($value) ? $value : array($value);
                 }
+
+                return is_array($value) ? $value : array($value);
             }
         }
 

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
     }
 }
diff --git a/src/Symfony/Component/CssSelector/Node/AttribNode.php b/src/Symfony/Component/CssSelector/Node/AttribNode.php
@@ -55,9 +55,9 @@ public function __toString()
     {
         if ($this->operator == 'exists') {
             return sprintf('%s[%s[%s]]', __CLASS__, $this->selector, $this->formatAttrib());
-        } else {
-            return sprintf('%s[%s[%s %s %s]]', __CLASS__, $this->selector, $this->formatAttrib(), $this->operator, $this->value);
         }
+
+        return sprintf('%s[%s[%s %s %s]]', __CLASS__, $this->selector, $this->formatAttrib(), $this->operator, $this->value);
     }
 
     /**

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -79,9 +79,9 @@ protected function resolveValue($value)
             return $resolved;
         } else if (is_string($value)) {
             return $this->resolveString($value);
-        } else {
-            return $value;
         }
+
+        return $value;
     }
 
     /**

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -466,12 +466,12 @@ protected function addServiceConfigurator($id, $definition, $variableName = 'ins
         if (is_array($callable)) {
             if (is_object($callable[0]) && $callable[0] instanceof Reference) {
                 return sprintf("        %s->%s(\$%s);\n", $this->getServiceCall((string) $callable[0]), $callable[1], $variableName);
-            } else {
-                return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
             }
-        } else {
-            return sprintf("        %s(\$%s);\n", $callable, $variableName);
+
+            return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
         }
+
+        return sprintf("        %s(\$%s);\n", $callable, $variableName);
     }
 
     /**

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -206,9 +206,9 @@ protected function dumpValue($value)
             return $this->getParameterCall((string) $value);
         } elseif (is_object($value) || is_resource($value)) {
             throw new \RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-        } else {
-            return $value;
         }
+
+        return $value;
     }
 
     /**
@@ -222,9 +222,9 @@ protected function getServiceCall($id, Reference $reference = null)
     {
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
             return sprintf('@?%s', $id);
-        } else {
-            return sprintf('@%s', $id);
         }
+
+        return sprintf('@%s', $id);
     }
 
     /**

diff --git a/src/Symfony/Component/Form/ChoiceField.php b/src/Symfony/Component/Form/ChoiceField.php
@@ -205,11 +205,11 @@ protected function newChoiceField($choice, $label)
             return new CheckboxField($choice, array(
                 'value' => $choice,
             ));
-        } else {
-            return new RadioField($choice, array(
-                'value' => $choice,
-            ));
         }
+
+        return new RadioField($choice, array(
+            'value' => $choice,
+        ));
     }
 
     /**

diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -836,9 +836,9 @@ public function isPostMaxSizeReached()
             }
 
             return $length > $max;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**

diff --git a/src/Symfony/Component/Form/HybridField.php b/src/Symfony/Component/Form/HybridField.php
@@ -95,9 +95,9 @@ public function getDisplayedData()
     {
         if ($this->mode === self::FORM) {
             return parent::getDisplayedData();
-        } else {
-            return Field::getDisplayedData();
         }
+
+        return Field::getDisplayedData();
     }
 
     /**
@@ -131,8 +131,8 @@ public function isEmpty()
     {
         if ($this->mode === self::FORM) {
             return parent::isEmpty();
-        } else {
-            return Field::isEmpty();
         }
+
+        return Field::isEmpty();
     }
 }
diff --git a/src/Symfony/Component/Form/PropertyPath.php b/src/Symfony/Component/Form/PropertyPath.php
@@ -246,9 +246,9 @@ protected function readPropertyPath(&$objectOrArray, $currentIndex)
 
         if ($currentIndex < $this->length) {
             return $this->readPropertyPath($value, $currentIndex);
-        } else {
-            return $value;
         }
+
+        return $value;
     }
 
     /**

diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php
@@ -519,9 +519,9 @@ public function getExtension()
     {
         if ($ext = pathinfo($this->getName(), \PATHINFO_EXTENSION)) {
             return '.' . $ext;
-        } else {
-            return '';
         }
+
+        return '';
     }
 
     /**
@@ -537,9 +537,9 @@ public function getDefaultExtension()
 
         if (isset(self::$defaultExtensions[$type])) {
             return '.' . self::$defaultExtensions[$type];
-        } else {
-            return $this->getExtension();
         }
+
+        return $this->getExtension();
     }
 
     /**

diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -86,13 +86,14 @@ protected function convertFileInformation($file)
             }
             if ($keys != $this->fileKeys) {
                 $file = array_map(array($this, 'convertFileInformation'), $file);
-            } else
+            } else {
                 if ($file['error'] === UPLOAD_ERR_NO_FILE) {
                     $file = null;
                 } else {
                     $file = new UploadedFile($file['tmp_name'], $file['name'],
                     $file['type'], $file['size'], $file['error']);
                 }
+            }
         }
         return $file;
     }

diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -96,16 +96,16 @@ public function get($key, $default = null, $first = true)
         if (!array_key_exists($key, $this->headers)) {
             if (null === $default) {
                 return $first ? null : array();
-            } else {
-                return $first ? $default : array($default);
             }
+
+            return $first ? $default : array($default);
         }
 
         if ($first) {
             return count($this->headers[$key]) ? $this->headers[$key][0] : $default;
-        } else {
-            return $this->headers[$key];
         }
+
+        return $this->headers[$key];
     }
 
     /**

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -436,9 +436,9 @@ public function getHttpHost()
 
         if (('http' == $scheme && $port == 80) || ('https' == $scheme && $port == 443)) {
             return $name;
-        } else {
-            return $name.':'.$port;
         }
+
+        return $name.':'.$port;
     }
 
     public function getRequestUri()

diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
@@ -171,18 +171,18 @@ public function sessionRead($id)
 
             if (count($sessionRows) == 1) {
                 return $sessionRows[0][0];
-            } else {
-                // session does not exist, create it
-                $sql = 'INSERT INTO '.$db_table.'('.$db_id_col.', '.$db_data_col.', '.$db_time_col.') VALUES (?, ?, ?)';
+            }
 
-                $stmt = $this->db->prepare($sql);
-                $stmt->bindParam(1, $id, \PDO::PARAM_STR);
-                $stmt->bindValue(2, '', \PDO::PARAM_STR);
-                $stmt->bindValue(3, time(), \PDO::PARAM_INT);
-                $stmt->execute();
+            // session does not exist, create it
+            $sql = 'INSERT INTO '.$db_table.'('.$db_id_col.', '.$db_data_col.', '.$db_time_col.') VALUES (?, ?, ?)';
 
-                return '';
-            }
+            $stmt = $this->db->prepare($sql);
+            $stmt->bindParam(1, $id, \PDO::PARAM_STR);
+            $stmt->bindValue(2, '', \PDO::PARAM_STR);
+            $stmt->bindValue(3, time(), \PDO::PARAM_INT);
+            $stmt->execute();
+
+            return '';
         } catch (\PDOException $e) {
             throw new \RuntimeException(sprintf('PDOException was thrown when trying to manipulate session data: %s', $e->getMessage()), 0, $e);
         }