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

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)

Encoder/XmlEncoder.php

@@ -99,7 +99,6 @@ public function decode($data, $format, array $context = array())
         // todo: throw an exception if the root node name is not correctly configured (bc)
 
         if ($rootNode->hasChildNodes()) {
-
             $xpath = new \DOMXPath($dom);
             $data = array();
             foreach ($xpath->query('namespace::*', $dom->documentElement) as $nsNode) {

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".
@@ -288,7 +288,7 @@ public function testDecodeScalarRootAttributes()
 
         $expected = array(
             '#' => 'Peter',
-            '@gender' => 'M'
+            '@gender' => 'M',
         );
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -302,7 +302,7 @@ public function testDecodeRootAttributes()
         $expected = array(
             'firstname' => 'Peter',
             'lastname' => 'Mac Calloway',
-            '@gender' => 'M'
+            '@gender' => 'M',
         );
 
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -321,8 +321,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'));
@@ -345,7 +345,7 @@ public function testDecodeIgnoreWhiteSpace()
 XML;
         $expected = 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'));
@@ -357,11 +357,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),
@@ -370,11 +370,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),
@@ -464,7 +464,7 @@ protected function getNamespacedArray()
                     ),
                     array(
                         'title' => 'title2',
-                    )
+                    ),
                 ),
                 'Barry' => array(
                     '@size' => 'large',

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(