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

1 files changed, 25 insertions, 25 deletions

diff --git a/Http/Tests/Firewall/DigestDataTest.php b/Http/Tests/Firewall/DigestDataTest.php
index 86a5327..a7c8d49 100644
--- a/Http/Tests/Firewall/DigestDataTest.php
+++ b/Http/Tests/Firewall/DigestDataTest.php
@@ -18,9 +18,9 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
     public function testGetResponse()
     {
         $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", ' .
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="user", realm="Welcome, robot!", '.
+            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -30,9 +30,9 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
     public function testGetUsername()
     {
         $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", ' .
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="user", realm="Welcome, robot!", '.
+            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -42,9 +42,9 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
     public function testGetUsernameWithQuote()
     {
         $digestAuth = new DigestData(
-            'username="\"user\"", realm="Welcome, robot!", ' .
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="\"user\"", realm="Welcome, robot!", '.
+            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -54,9 +54,9 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
     public function testGetUsernameWithQuoteAndEscape()
     {
         $digestAuth = new DigestData(
-            'username="\"u\\\\\"ser\"", realm="Welcome, robot!", ' .
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="\"u\\\\\"ser\"", realm="Welcome, robot!", '.
+            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -66,9 +66,9 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
     public function testGetUsernameWithSingleQuote()
     {
         $digestAuth = new DigestData(
-            'username="\"u\'ser\"", realm="Welcome, robot!", ' .
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="\"u\'ser\"", realm="Welcome, robot!", '.
+            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -78,9 +78,9 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
     public function testGetUsernameWithSingleQuoteAndEscape()
     {
         $digestAuth = new DigestData(
-            'username="\"u\\\'ser\"", realm="Welcome, robot!", ' .
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="\"u\\\'ser\"", realm="Welcome, robot!", '.
+            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -90,9 +90,9 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
     public function testGetUsernameWithEscape()
     {
         $digestAuth = new DigestData(
-            'username="\"u\\ser\"", realm="Welcome, robot!", ' .
-            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="\"u\\ser\"", realm="Welcome, robot!", '.
+            'nonce="MTM0NzMyMTgyMy42NzkzOmRlZjM4NmIzOGNjMjE0OWJiNDU0MDAxNzJmYmM1MmZl", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -106,8 +106,8 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
         $nonce = base64_encode($time.':'.md5($time.':'.$key));
 
         $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", nonce="'.$nonce.'", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="user", realm="Welcome, robot!", nonce="'.$nonce.'", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );
 
@@ -146,8 +146,8 @@ class DigestDataTest extends \PHPUnit_Framework_TestCase
         $nonce = base64_encode($time.':'.md5($time.':'.$key));
 
         $digestAuth = new DigestData(
-            'username="user", realm="Welcome, robot!", nonce="'.$nonce.'", ' .
-            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", ' .
+            'username="user", realm="Welcome, robot!", nonce="'.$nonce.'", '.
+            'uri="/path/info?p1=5&p2=5", cnonce="MDIwODkz", nc=00000001, qop="auth", '.
             'response="b52938fc9e6d7c01be7702ece9031b42"'
         );