Merge branch '2.5' into 2.6

* 2.5:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
	src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolver.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Stopwatch/Stopwatch.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php

Author: fabpot

Command/InitAclCommand.php

@@ -17,7 +17,7 @@
 use Doctrine\DBAL\Schema\SchemaException;
 
 /**
- * Installs the tables required by the ACL system
+ * Installs the tables required by the ACL system.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */

DataCollector/SecurityDataCollector.php

@@ -63,7 +63,7 @@ public function collect(Request $request, Response $response, \Exception $except
                 'authenticated' => $token->isAuthenticated(),
                 'token_class' => get_class($token),
                 'user' => $token->getUsername(),
-                'roles' => array_map(function (RoleInterface $role) { return $role->getRole();}, $token->getRoles()),
+                'roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $token->getRoles()),
             );
         }
     }

DependencyInjection/Compiler/AddSecurityVotersPass.php

@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
- * Adds all configured security voters to the access decision manager
+ * Adds all configured security voters to the access decision manager.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */

DependencyInjection/MainConfiguration.php

@@ -18,7 +18,9 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This class contains the configuration information for the following tags:
+ * This class contains the configuration information.
+ *
+ * This information is for the following tags:
  *
  *   * security.config
  *   * security.acl

DependencyInjection/Security/Factory/AbstractFactory.php

@@ -18,7 +18,7 @@
 
 /**
  * AbstractFactory is the base class for all classes inheriting from
- * AbstractAuthenticationListener
+ * AbstractAuthenticationListener.
  *
  * @author Fabien Potencier <[email protected]>
  * @author Lukas Kahwe Smith <[email protected]>

Security/FirewallMap.php

@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * This is a lazy-loading firewall map implementation
+ * This is a lazy-loading firewall map implementation.
  *
  * Listeners will only be initialized if we really need them.
  *

Tests/DataCollector/SecurityDataCollectorTest.php

@@ -80,6 +80,7 @@ private function getRequest()
             ->disableOriginalConstructor()
             ->getMock();
     }
+
     private function getResponse()
     {
         return $this

Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php

@@ -10,7 +10,6 @@ class DummyProvider implements UserProviderFactoryInterface
 {
     public function create(ContainerBuilder $container, $id, $config)
     {
-        
     }
 
     public function getKey()
@@ -20,6 +19,5 @@ public function getKey()
 
     public function addConfiguration(NodeDefinition $node)
     {
-        
     }
 }