fixed CS

Author: fabpot

src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

@@ -142,7 +142,7 @@ protected function load()
 
  if (is_array($this->choices)) {
  $entities = $this->choices;
- } else if ($qb = $this->queryBuilder) {
+ } elseif ($qb = $this->queryBuilder) {
  $entities = $qb->getQuery()->execute();
  } else {
  $entities = $this->em->getRepository($this->class)->findAll();
@@ -269,9 +269,9 @@ public function getEntity($key)
  $entities = $this->getEntities();
 
  return isset($entities[$key]) ? $entities[$key] : null;
- } else if ($this->entities) {
+ } elseif ($this->entities) {
  return isset($this->entities[$key]) ? $this->entities[$key] : null;
- } else if ($qb = $this->queryBuilder) {
+ } elseif ($qb = $this->queryBuilder) {
  // should we clone the builder?
  $alias = $qb->getRootAlias();
  $where = $qb->expr()->eq($alias.'.'.current($this->identifier), $key);

src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php

@@ -38,7 +38,7 @@ public function onBindNormData(FilterDataEvent $event)
 
  if (!$collection) {
  $collection = $data;
- } else if (count($data) === 0) {
+ } elseif (count($data) === 0) {
  $collection->clear();
  } else {
  // merge $data into $collection

src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php

@@ -196,7 +196,7 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
  $args[0] = array_merge(array_values($driverPaths), $args[0]);
  }
  $mappingDriverDef->setArguments($args);
- } else if ($driverType == 'annotation') {
+ } elseif ($driverType == 'annotation') {
  $mappingDriverDef = new Definition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'), array(
  new Reference($this->getObjectManagerElementName('metadata.annotation_reader')),
  array_values($driverPaths)

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

@@ -88,7 +88,7 @@ public function abbrMethod($method)
  if (false !== strpos($method, '::')) {
  list($class, $method) = explode('::', $method, 2);
  $result = sprintf("%s::%s()", $this->abbrClass($class), $method);
- } else if ('Closure' === $method) {
+ } elseif ('Closure' === $method) {
  $result = sprintf("<abbr title=\"%s\">%s</abbr>", $method, $method);
  } else {
  $result = sprintf("<abbr title=\"%s\">%s</abbr>()", $method, $method);

src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php

@@ -45,7 +45,7 @@ public function parse($name)
  {
  if ($name instanceof TemplateReferenceInterface) {
  return $name;
- } else if (isset($this->cache[$name])) {
+ } elseif (isset($this->cache[$name])) {
  return $this->cache[$name];
  }
 

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php

@@ -45,6 +45,7 @@ public function welcomeAction($name=null)
  public function logoutAction()
  {
  $request = $this->container->get('request')->getSession('session')->clear();
+
  return new Response('Session cleared.');
  }
 

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -241,7 +241,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
  $matcher = null;
  if (isset($firewall['request_matcher'])) {
  $matcher = new Reference($firewall['request_matcher']);
- } else if (isset($firewall['pattern'])) {
+ } elseif (isset($firewall['pattern'])) {
  $matcher = $this->createRequestMatcher($container, $firewall['pattern']);
  }
 
@@ -515,7 +515,7 @@ private function createExceptionListener($container, $config, $id, $defaultEntry
  // access denied handler setup
  if (isset($config['access_denied_handler'])) {
  $listener->replaceArgument(5, new Reference($config['access_denied_handler']));
- } else if (isset($config['access_denied_url'])) {
+ } elseif (isset($config['access_denied_url'])) {
  $listener->replaceArgument(4, $config['access_denied_url']);
  }
 

src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php

@@ -112,7 +112,7 @@ public function testAccess()
  if (1 === $i) {
  $this->assertEquals(array('ROLE_USER'), $roles);
  $this->assertEquals('https', $channel);
- } else if (2 === $i) {
+ } elseif (2 === $i) {
  $this->assertEquals(array('IS_AUTHENTICATED_ANONYMOUSLY'), $roles);
  $this->assertNull($channel);
  }

src/Symfony/Component/Config/Definition/PrototypedArrayNode.php

@@ -197,7 +197,7 @@ protected function normalizeValue($value)
  $ex->setPath($this->getPath());
 
  throw $ex;
- } else if (isset($v[$this->keyAttribute])) {
+ } elseif (isset($v[$this->keyAttribute])) {
  $k = $v[$this->keyAttribute];
 
  // remove the key attribute when required

src/Symfony/Component/Console/Input/InputArgument.php

@@ -45,7 +45,7 @@ public function __construct($name, $mode = null, $description = '', $default = n
  {
  if (null === $mode) {
  $mode = self::OPTIONAL;
- } else if (is_string($mode) || $mode > 7) {
+ } elseif (is_string($mode) || $mode > 7) {
  throw new \InvalidArgumentException(sprintf('Argument mode "%s" is not valid.', $mode));
  }
 
@@ -102,7 +102,7 @@ public function setDefault($default = null)
  if ($this->isArray()) {
  if (null === $default) {
  $default = array();
- } else if (!is_array($default)) {
+ } elseif (!is_array($default)) {
  throw new \LogicException('A default value for an array argument must be an array.');
  }
  }