Merge branch '2.5'

* 2.5:
  added missing use statements
  added missing use statement
  added missing use statement
  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/ConfigurationTest.php
	src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
	src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
	src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Stopwatch/Stopwatch.php
	src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
	src/Symfony/Component/Yaml/Parser.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php

1 files changed, 5 insertions, 5 deletions

diff --git a/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php b/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
index f4e5425..ff5fbc2 100644
--- a/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
+++ b/Http/Tests/EntryPoint/RetryAuthenticationEntryPointTest.php
@@ -39,26 +39,26 @@ class RetryAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
                 80,
                 443,
                 Request::create('http://localhost/foo/bar?baz=bat'),
-                'https://localhost/foo/bar?baz=bat'
+                'https://localhost/foo/bar?baz=bat',
             ),
             array(
                 80,
                 443,
                 Request::create('https://localhost/foo/bar?baz=bat'),
-                'http://localhost/foo/bar?baz=bat'
+                'http://localhost/foo/bar?baz=bat',
             ),
             array(
                 80,
                 123,
                 Request::create('http://localhost/foo/bar?baz=bat'),
-                'https://localhost:123/foo/bar?baz=bat'
+                'https://localhost:123/foo/bar?baz=bat',
             ),
             array(
                 8080,
                 443,
                 Request::create('https://localhost/foo/bar?baz=bat'),
-                'http://localhost:8080/foo/bar?baz=bat'
-            )
+                'http://localhost:8080/foo/bar?baz=bat',
+            ),
         );
     }
 }