merged 2.0

Author: fabpot

check_cs

@@ -93,6 +93,9 @@ foreach ($finder as $file) {
  $new .= "\n";
  }
 
+ // [Structure] elseif, not else if
+ $new = preg_replace('/} else if \(/', '} elseif (', $new);
+
  if ($new != $old) {
  $count++;
 

src/Symfony/Bridge/Doctrine/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/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

@@ -150,7 +150,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();
@@ -305,9 +305,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/Bridge/Doctrine/README.md

@@ -0,0 +1,12 @@
+Doctrine Bridge
+===============
+
+Provides integration for [Doctrine](http://www.doctrine-project.org/) with
+various Symfony2 components.
+
+Resources
+---------
+
+Unit tests:
+
+https://github.com/symfony/symfony/tree/master/tests/Symfony/Tests/Bridge/Doctrine

src/Symfony/Bridge/Monolog/README.md

@@ -0,0 +1,11 @@
+Monolog Bridge
+==============
+
+Provides integration for Monolog with various Symfony2 components.
+
+Resources
+---------
+
+Unit tests:
+
+https://github.com/symfony/symfony/tree/master/tests/Symfony/Tests/Bridge/Monolog

src/Symfony/Bridge/Twig/README.md

@@ -0,0 +1,12 @@
+Twig Bridge
+===========
+
+Provides integration for [Twig](http://twig.sensiolabs.org/) with various
+Symfony2 components.
+
+Resources
+---------
+
+Unit tests:
+
+https://github.com/symfony/symfony/tree/master/tests/Symfony/Tests/Bridge/Twig

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/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -240,7 +240,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']);
  }
 
@@ -524,7 +524,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']);
  }