Merge branch '2.7' into 2.8

* 2.7:
  [Console] Application update PHPDoc of add and register methods
  [Config] Extra tests for Config component
  Fixed bugs in names of classes and methods.
  [DoctrineBridge] Fixed php doc
  [FrameworkBundle] Fixed parameters number mismatch declaration
  [BrowserKit] Added test for followRedirect method (POST method)
  Fix the money form type render with Bootstrap3
  [BrowserKit] Uppercase the "GET" method in redirects
  [WebProfilerBundle] Fixed  JSDoc parameter definition
  [HttpFoundation] HttpCache refresh stale responses containing an ETag

Conflicts:
	src/Symfony/Component/BrowserKit/Tests/ClientTest.php
	src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php

Author: nicolas-grekas

Command/AbstractConfigCommand.php

@@ -45,7 +45,7 @@ protected function listBundles($output)
         } else {
             $output->writeln('Available registered bundles with their extension alias if available:');
             $table = new Table($output);
-            $table->setHeaders($headers)->setRows($rows)->render($output);
+            $table->setHeaders($headers)->setRows($rows)->render();
         }
     }
 

DependencyInjection/FrameworkExtension.php

@@ -836,10 +836,10 @@ private function getValidatorMappingFiles(ContainerBuilder $container)
 
             if (is_dir($dir = $dirname.'/Resources/config/validation')) {
                 foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {
-                    $files[0][] = $file->getRealpath();
+                    $files[0][] = $file->getRealPath();
                 }
                 foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {
-                    $files[1][] = $file->getRealpath();
+                    $files[1][] = $file->getRealPath();
                 }
 
                 $container->addResource(new DirectoryResource($dir));
@@ -964,13 +964,13 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
             if (is_dir($dir = $dirname.'/Resources/config/serialization')) {
                 foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {
-                    $definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file->getRealpath()));
+                    $definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file->getRealPath()));
                     $definition->setPublic(false);
 
                     $serializerLoaders[] = $definition;
                 }
                 foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {
-                    $definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader', array($file->getRealpath()));
+                    $definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader', array($file->getRealPath()));
                     $definition->setPublic(false);
 
                     $serializerLoaders[] = $definition;

Tests/Templating/DelegatingEngineTest.php

@@ -38,7 +38,7 @@ public function testGetExistingEngine()
 
         $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
 
-        $this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php', array('foo' => 'bar')));
+        $this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
     }
 
     /**
@@ -55,7 +55,7 @@ public function testGetInvalidEngine()
         ));
 
         $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
-        $delegatingEngine->getEngine('template.php', array('foo' => 'bar'));
+        $delegatingEngine->getEngine('template.php');
     }
 
     public function testRenderResponseWithFrameworkEngine()

Translation/TranslationLoader.php

@@ -58,7 +58,7 @@ public function loadMessages($directory, MessageCatalogue $catalogue)
             $extension = $catalogue->getLocale().'.'.$format;
             $files = $finder->files()->name('*.'.$extension)->in($directory);
             foreach ($files as $file) {
-                $domain = substr($file->getFileName(), 0, -1 * strlen($extension) - 1);
+                $domain = substr($file->getFilename(), 0, -1 * strlen($extension) - 1);
                 $catalogue->addCatalogue($loader->load($file->getPathname(), $catalogue->getLocale(), $domain));
             }
         }