Merge branch '2.3' into 2.4

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

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
	src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/ApplicationTest.php
	src/Symfony/Component/Filesystem/Exception/IOException.php
	src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
	src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
	src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
	src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Tests/ExecutionContextTest.php

Author: fabpot

Tests/OptionsResolverTest.php

@@ -623,7 +623,7 @@ public function testResolveWithoutOptionSucceedsIfRequiredAndDefaultValue()
         ));
 
         $this->assertEquals(array(
-            'foo' => 'bar'
+            'foo' => 'bar',
         ), $this->resolver->resolve(array()));
     }
 
@@ -637,7 +637,7 @@ public function testResolveWithoutOptionSucceedsIfDefaultValueAndRequired()
         ));
 
         $this->assertEquals(array(
-            'foo' => 'bar'
+            'foo' => 'bar',
         ), $this->resolver->resolve(array()));
     }
 
@@ -652,7 +652,7 @@ public function testResolveSucceedsIfOptionRequiredAndValueAllowed()
 
         $options = array(
             'one' => '1',
-            'two' => '2'
+            'two' => '2',
         );
 
         $this->assertEquals($options, $this->resolver->resolve($options));

Tests/OptionsTest.php

@@ -372,7 +372,7 @@ public function testReplaceClearsAndSets()
             'two' => '2',
             'three' => function (Options $options) {
                 return '2' === $options['two'] ? '3' : 'foo';
-            }
+            },
         ));
 
         $this->assertEquals(array(
@@ -389,7 +389,6 @@ public function testClearRemovesAllOptions()
         $this->options->clear();
 
         $this->assertEmpty($this->options->all());
-
     }
 
     /**