Merge branch '2.4' into 2.5

* 2.4:
  fixed CS
  [Process] fixed some volatile tests
  [HttpKernel] fixed a volatile test
  [HttpFoundation] fixed some volatile tests
  [Tests] PHPUnit Optimizations
  Use getPathname() instead of string casting to get BinaryFileReponse file path

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
	src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
	src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
	src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
	src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
	src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
	src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php
	src/Symfony/Component/Yaml/Parser.php

Author: fabpot

Encoder/JsonDecode.php

@@ -132,7 +132,7 @@ private function resolveContext(array $context)
         $defaultOptions = array(
             'json_decode_associative' => $this->associative,
             'json_decode_recursion_depth' => $this->recursionDepth,
-            'json_decode_options' => 0
+            'json_decode_options' => 0,
         );
 
         return array_merge($defaultOptions, $context);

Encoder/JsonEncode.php

@@ -20,7 +20,7 @@
  */
 class JsonEncode implements EncoderInterface
 {
-    private $options ;
+    private $options;
     private $lastError = JSON_ERROR_NONE;
 
     public function __construct($bitmask = 0)

Serializer.php

@@ -164,7 +164,6 @@ public function supportsDenormalization($data, $type, $format = null)
      */
     private function getNormalizer($data, $format)
     {
-
         $class = get_class($data);
         if (isset($this->normalizerCache[$class][$format])) {
             return $this->normalizerCache[$class][$format];

Tests/Encoder/XmlEncoderTest.php

@@ -67,11 +67,11 @@ public function testAttributes()
         $obj->xmlFoo = array(
             'foo-bar' => array(
                 '@id' => 1,
-                '@name' => 'Bar'
+                '@name' => 'Bar',
             ),
             'Foo' => array(
                 'Bar' => "Test",
-                '@Type' => 'test'
+                '@Type' => 'test',
             ),
             'föo_bär' => 'a',
             "Bar" => array(1,2,3),
@@ -141,7 +141,7 @@ public function testEncodeScalarRootAttributes()
     {
         $array = array(
           '#' => 'Paul',
-          '@gender' => 'm'
+          '@gender' => 'm',
         );
 
         $expected = '<?xml version="1.0"?>'."\n".
@@ -154,7 +154,7 @@ public function testEncodeRootAttributes()
     {
         $array = array(
           'firstname' => 'Paul',
-          '@gender' => 'm'
+          '@gender' => 'm',
         );
 
         $expected = '<?xml version="1.0"?>'."\n".
@@ -272,7 +272,7 @@ public function testDecodeScalarRootAttributes()
 
         $expected = array(
             '#' => 'Peter',
-            '@gender' => 'M'
+            '@gender' => 'M',
         );
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -286,7 +286,7 @@ public function testDecodeRootAttributes()
         $expected = array(
             'firstname' => 'Peter',
             'lastname' => 'Mac Calloway',
-            '@gender' => 'M'
+            '@gender' => 'M',
         );
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -305,8 +305,8 @@ public function testDecodeArray()
         $expected = array(
             'people' => array('person' => array(
                 array('firstname' => 'Benjamin', 'lastname' => 'Alexandre'),
-                array('firstname' => 'Damien', 'lastname' => 'Clay')
-            ))
+                array('firstname' => 'Damien', 'lastname' => 'Clay'),
+            )),
         );
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -318,11 +318,11 @@ public function testDecodeWithoutItemHash()
         $obj->xmlFoo = array(
             'foo-bar' => array(
                 '@key' => "value",
-                'item' => array("@key" => 'key', "key-val" => 'val')
+                'item' => array("@key" => 'key', "key-val" => 'val'),
             ),
             'Foo' => array(
                 'Bar' => "Test",
-                '@Type' => 'test'
+                '@Type' => 'test',
             ),
             'föo_bär' => 'a',
             "Bar" => array(1,2,3),
@@ -331,11 +331,11 @@ public function testDecodeWithoutItemHash()
         $expected = array(
             'foo-bar' => array(
                 '@key' => "value",
-                'key' => array('@key' => 'key', "key-val" => 'val')
+                'key' => array('@key' => 'key', "key-val" => 'val'),
             ),
             'Foo' => array(
                 'Bar' => "Test",
-                '@Type' => 'test'
+                '@Type' => 'test',
             ),
             'föo_bär' => 'a',
             "Bar" => array(1,2,3),

Tests/Fixtures/DenormalizableDummy.php

@@ -16,10 +16,7 @@
 
 class DenormalizableDummy implements DenormalizableInterface
 {
-
     public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
     {
-
     }
-
 }

Tests/Normalizer/GetSetMethodNormalizerTest.php

@@ -216,7 +216,7 @@ public function provideCallbacks()
                 ),
                 'baz',
                 array('foo' => '', 'bar' => null, 'baz' => true),
-                'Null an item'
+                'Null an item',
             ),
             array(
                 array(