Merge branch '2.3' into 2.5

* 2.3:
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
	src/Symfony/Component/Process/Process.php

Author: fabpot

Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php

@@ -279,37 +279,6 @@ public function testValidateTokenOnSubmitIfRootAndCompoundUsesTypeClassAsIntenti
         $this->assertSame($valid, $form->isValid());
     }
 
-    /**
-     * @dataProvider provideBoolean
-     */
-    public function testValidateTokenOnBindIfRootAndCompoundUsesTypeClassAsIntentionIfEmptyFormName($valid)
-    {
-        $this->tokenManager->expects($this->once())
-            ->method('isTokenValid')
-            ->with(new CsrfToken('Symfony\Component\Form\Extension\Core\Type\FormType', 'token'))
-            ->will($this->returnValue($valid));
-
-        $form = $this->factory
-            ->createNamedBuilder('', 'form', null, array(
-                'csrf_field_name' => 'csrf',
-                'csrf_token_manager' => $this->tokenManager,
-                'compound' => true,
-            ))
-            ->add('child', 'text')
-            ->getForm();
-
-        $form->submit(array(
-            'child' => 'foobar',
-            'csrf' => 'token',
-        ));
-
-        // Remove token from data
-        $this->assertSame(array('child' => 'foobar'), $form->getData());
-
-        // Validate accordingly
-        $this->assertSame($valid, $form->isValid());
-    }
-
     public function testFailIfRootAndCompoundAndTokenMissing()
     {
         $this->tokenManager->expects($this->never())