Merge branch '4.1' into 4.2

* 4.1:
  Bump phpunit bridge cache id
  [appveyor] fix create-project phpunit
  Fix HttpKernel Debug requirement
  Fix heredoc
  use final annotation to allow mocking the class
  synchronise the form builder docblock
  Grammar fix in exception message
  fix tests
  forward the parse error to the calling code
  [Debug][DebugClassLoader] Match more cases for final, deprecated and internal classes / methods extends
  ensure compatibility with older PHPUnit mocks
  [Security] Do not mix usage of password_*() functions and sodium_*() ones

Author: nicolas-grekas

ResolvedFormType.php

@@ -205,7 +205,7 @@ public function getOptionsResolver()
      * Override this method if you want to customize the builder class.
      *
      * @param string               $name      The name of the builder
-     * @param string               $dataClass The data class
+     * @param string|null          $dataClass The data class
      * @param FormFactoryInterface $factory   The current form factory
      * @param array                $options   The builder options
      *

Test/TypeTestCase.php

@@ -32,7 +32,7 @@ protected function setUp()
         parent::setUp();
 
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
-        $this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
+        $this->builder = new FormBuilder('', null, $this->dispatcher, $this->factory);
     }
 
     protected function tearDown()

Tests/AbstractFormTest.php

@@ -55,7 +55,7 @@ abstract protected function createForm();
     /**
      * @param string                   $name
      * @param EventDispatcherInterface $dispatcher
-     * @param string                   $dataClass
+     * @param string|null              $dataClass
      * @param array                    $options
      *
      * @return FormBuilder

Tests/ButtonTest.php

@@ -41,15 +41,15 @@ public function testSetParentOnSubmittedButton()
 
         $button->submit('');
 
-        $button->setParent($this->getFormBuilder('form')->getForm());
+        $button->setParent($this->getFormBuilder()->getForm());
     }
 
     /**
      * @dataProvider getDisabledStates
      */
     public function testDisabledIfParentIsDisabled($parentDisabled, $buttonDisabled, $result)
     {
-        $form = $this->getFormBuilder('form')
+        $form = $this->getFormBuilder()
             ->setDisabled($parentDisabled)
             ->getForm()
         ;
@@ -80,8 +80,8 @@ private function getButtonBuilder($name)
         return new ButtonBuilder($name);
     }
 
-    private function getFormBuilder($name)
+    private function getFormBuilder()
     {
-        return new FormBuilder($name, null, $this->dispatcher, $this->factory);
+        return new FormBuilder('form', null, $this->dispatcher, $this->factory);
     }
 }

Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php

@@ -28,7 +28,7 @@ protected function setUp()
         $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
         $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
         $this->tokenManager = $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock();
-        $this->form = $this->getBuilder('post')
+        $this->form = $this->getBuilder()
             ->setDataMapper($this->getDataMapper())
             ->getForm();
     }
@@ -41,14 +41,9 @@ protected function tearDown()
         $this->form = null;
     }
 
-    protected function getBuilder($name = 'name')
+    protected function getBuilder()
     {
-        return new FormBuilder($name, null, $this->dispatcher, $this->factory, ['compound' => true]);
-    }
-
-    protected function getForm($name = 'name')
-    {
-        return $this->getBuilder($name)->getForm();
+        return new FormBuilder('post', null, $this->dispatcher, $this->factory, ['compound' => true]);
     }
 
     protected function getDataMapper()

Tests/ResolvedFormTypeTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Form\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormTypeExtensionInterface;
 use Symfony\Component\Form\FormTypeInterface;
 use Symfony\Component\Form\ResolvedFormType;
@@ -380,15 +379,4 @@ private function getMockFormFactory()
     {
         return $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
     }
-
-    /**
-     * @param string $name
-     * @param array  $options
-     *
-     * @return FormBuilder
-     */
-    protected function getBuilder($name = 'name', array $options = [])
-    {
-        return new FormBuilder($name, null, $this->dispatcher, $this->factory, $options);
-    }
 }