Merge branch '2.3' into 2.5

fabpot · fabpot · commit 2298f1db5abc · 2014-12-30T10:03:46.000+01:00
* 2.3:
  Updated generateSql tool
  Fix the implementation of deprecated Locale classes
  Fix phpdoc and coding standards
  Replace usages of the deprecated TypeTestCase by the new one
  Remove usages of deprecated constants
  Update functional tests to use the PSR NullLogger
  Make fabbot happy
  Clean up testing
  [DomCrawler] fixed bug #12143

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
	src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
	src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
diff --git a/Extension/HttpFoundation/EventListener/BindRequestListener.php b/Extension/HttpFoundation/EventListener/BindRequestListener.php
@@ -27,7 +27,7 @@ class BindRequestListener implements EventSubscriberInterface
     public static function getSubscribedEvents()
     {
         // High priority in order to supersede other listeners
-        return array(FormEvents::PRE_BIND => array('preBind', 128));
+        return array(FormEvents::PRE_SUBMIT => array('preBind', 128));
     }
 
     public function preBind(FormEvent $event)
diff --git a/Tests/CompoundFormPerformanceTest.php b/Tests/CompoundFormPerformanceTest.php
@@ -14,7 +14,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class CompoundFormPerformanceTest extends \Symfony\Component\Form\Tests\FormPerformanceTestCase
+class CompoundFormPerformanceTest extends \Symfony\Component\Form\Test\FormPerformanceTestCase
 {
     /**
      * Create a compound form multiple times, as happens in a collection form.
diff --git a/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php
@@ -18,7 +18,7 @@ class BooleanToStringTransformerTest extends \PHPUnit_Framework_TestCase
     const TRUE_VALUE = '1';
 
     /**
-     * @var boolToStringTransformer
+     * @var BooleanToStringTransformer
      */
     protected $transformer;
 
diff --git a/Tests/Extension/Core/Type/CountryTypeTest.php b/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class CountryTypeTest extends TypeTestCase
+class CountryTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/CurrencyTypeTest.php b/Tests/Extension/Core/Type/CurrencyTypeTest.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class CurrencyTypeTest extends TypeTestCase
+class CurrencyTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/DateTimeTypeTest.php b/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class DateTimeTypeTest extends TypeTestCase
+class DateTimeTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/DateTypeTest.php b/Tests/Extension/Core/Type/DateTypeTest.php
@@ -13,9 +13,10 @@
 
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class DateTypeTest extends TypeTestCase
+class DateTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/FormTypeTest.php b/Tests/Extension/Core/Type/FormTypeTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\PropertyAccess\PropertyPath;
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Tests\Fixtures\Author;
 use Symfony\Component\Form\Tests\Fixtures\FixedDataTransformer;
diff --git a/Tests/Extension/Core/Type/IntegerTypeTest.php b/Tests/Extension/Core/Type/IntegerTypeTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class IntegerTypeTest extends TypeTestCase
+class IntegerTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/LanguageTypeTest.php b/Tests/Extension/Core/Type/LanguageTypeTest.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class LanguageTypeTest extends TypeTestCase
+class LanguageTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/LocaleTypeTest.php b/Tests/Extension/Core/Type/LocaleTypeTest.php
@@ -12,9 +12,10 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class LocaleTypeTest extends TypeTestCase
+class LocaleTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/MoneyTypeTest.php b/Tests/Extension/Core/Type/MoneyTypeTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class MoneyTypeTest extends TypeTestCase
+class MoneyTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/NumberTypeTest.php b/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class NumberTypeTest extends TypeTestCase
+class NumberTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/SubmitTypeTest.php b/Tests/Extension/Core/Type/SubmitTypeTest.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
+
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class SubmitTypeTest extends TypeTestCase
+class SubmitTypeTest extends TestCase
 {
     public function testCreateSubmitButtonInstances()
     {
diff --git a/Tests/Extension/Core/Type/TimeTypeTest.php b/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -13,9 +13,10 @@
 
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class TimeTypeTest extends TypeTestCase
+class TimeTypeTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Extension/Core/Type/UrlTypeTest.php b/Tests/Extension/Core/Type/UrlTypeTest.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-class UrlTypeTest extends TypeTestCase
+use Symfony\Component\Form\Test\TypeTestCase as TestCase;
+
+class UrlTypeTest extends TestCase
 {
     public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()
     {
diff --git a/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
@@ -279,6 +279,37 @@ public function testValidateTokenOnSubmitIfRootAndCompoundUsesTypeClassAsIntenti
         $this->assertSame($valid, $form->isValid());
     }
 
+    /**
+     * @dataProvider provideBoolean
+     */
+    public function testValidateTokenOnBindIfRootAndCompoundUsesTypeClassAsIntentionIfEmptyFormName($valid)
+    {
+        $this->csrfProvider->expects($this->once())
+            ->method('isCsrfTokenValid')
+            ->with('Symfony\Component\Form\Extension\Core\Type\FormType', 'token')
+            ->will($this->returnValue($valid));
+
+        $form = $this->factory
+            ->createNamedBuilder('', 'form', null, array(
+                'csrf_field_name' => 'csrf',
+                'csrf_provider' => $this->csrfProvider,
+                '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())
diff --git a/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Form\Extension\Validator\Constraints\Form;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\Form\SubmitButtonBuilder;
-use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
diff --git a/Tests/Fixtures/FooSubType.php b/Tests/Fixtures/FooSubType.php
@@ -12,11 +12,6 @@
 namespace Symfony\Component\Form\Tests\Fixtures;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class FooSubType extends AbstractType
 {
diff --git a/Tests/Fixtures/FooSubTypeWithParentInstance.php b/Tests/Fixtures/FooSubTypeWithParentInstance.php
@@ -12,11 +12,6 @@
 namespace Symfony\Component\Form\Tests\Fixtures;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class FooSubTypeWithParentInstance extends AbstractType
 {
diff --git a/Tests/Fixtures/FooType.php b/Tests/Fixtures/FooType.php
@@ -12,11 +12,6 @@
 namespace Symfony\Component\Form\Tests\Fixtures;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class FooType extends AbstractType
 {
diff --git a/Tests/FormFactoryTest.php b/Tests/FormFactoryTest.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Form\Guess\Guess;
 use Symfony\Component\Form\Guess\ValueGuess;
 use Symfony\Component\Form\Guess\TypeGuess;
-use Symfony\Component\Form\Tests\Fixtures\Author;
 use Symfony\Component\Form\Tests\Fixtures\FooType;
 use Symfony\Component\Form\Tests\Fixtures\FooSubType;
 use Symfony\Component\Form\Tests\Fixtures\FooSubTypeWithParentInstance;
diff --git a/Tests/ResolvedFormTypeTest.php b/Tests/ResolvedFormTypeTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Form\ResolvedFormType;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormBuilder;
-use Symfony\Component\Form\Form;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
diff --git a/Tests/SimpleFormTest.php b/Tests/SimpleFormTest.php
@@ -109,10 +109,10 @@ public function testFalseIsConvertedToNull()
             }));
 
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
-        $config->addEventListener(FormEvents::PRE_BIND, array($mock, 'preBind'));
+        $config->addEventListener(FormEvents::PRE_SUBMIT, array($mock, 'preBind'));
         $form = new Form($config);
 
-        $form->bind(false);
+        $form->submit(false);
 
         $this->assertTrue($form->isValid());
         $this->assertNull($form->getData());

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class BindRequestListener implements EventSubscriberInterface`
`27`	`27`	`public static function getSubscribedEvents()`
`28`	`28`	`{`
`29`	`29`	`// High priority in order to supersede other listeners`
`30`		`- return array(FormEvents::PRE_BIND => array('preBind', 128));`
	`30`	`+ return array(FormEvents::PRE_SUBMIT => array('preBind', 128));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function preBind(FormEvent $event)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/**`
`15`	`15`	`* @author Bernhard Schussek <[email protected]>`
`16`	`16`	`*/`
`17`		`-class CompoundFormPerformanceTest extends \Symfony\Component\Form\Tests\FormPerformanceTestCase`
	`17`	`+class CompoundFormPerformanceTest extends \Symfony\Component\Form\Test\FormPerformanceTestCase`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`	`20`	`* Create a compound form multiple times, as happens in a collection form.`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,10 @@`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\Extension\Core\View\ChoiceView;`
	`15`	`+use Symfony\Component\Form\Test\TypeTestCase as TestCase;`
`15`	`16`	`use Symfony\Component\Intl\Util\IntlTestHelper;`
`16`	`17`
`17`		`-class CountryTypeTest extends TypeTestCase`
	`18`	`+class CountryTypeTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`protected function setUp()`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\Extension\Core\View\ChoiceView;`
`15`	`15`	`use Symfony\Component\Form\FormError;`
	`16`	`+use Symfony\Component\Form\Test\TypeTestCase as TestCase;`
`16`	`17`	`use Symfony\Component\Intl\Util\IntlTestHelper;`
`17`	`18`
`18`		`-class DateTypeTest extends TypeTestCase`
	`19`	`+class DateTypeTest extends TestCase`
`19`	`20`	`{`
`20`	`21`	`protected function setUp()`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
	`14`	`+use Symfony\Component\Form\Test\TypeTestCase as TestCase;`
`14`	`15`	`use Symfony\Component\Intl\Util\IntlTestHelper;`
`15`	`16`
`16`		`-class IntegerTypeTest extends TypeTestCase`
	`17`	`+class IntegerTypeTest extends TestCase`
`17`	`18`	`{`
`18`	`19`	`protected function setUp()`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
	`14`	`+use Symfony\Component\Form\Test\TypeTestCase as TestCase;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* @author Bernhard Schussek <[email protected]>`
`16`	`18`	`*/`
`17`		`-class SubmitTypeTest extends TypeTestCase`
	`19`	`+class SubmitTypeTest extends TestCase`
`18`	`20`	`{`
`19`	`21`	`public function testCreateSubmitButtonInstances()`
`20`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
`14`		`-class UrlTypeTest extends TypeTestCase`
	`14`	`+use Symfony\Component\Form\Test\TypeTestCase as TestCase;`
	`15`	`+`
	`16`	`+class UrlTypeTest extends TestCase`
`15`	`17`	`{`
`16`	`18`	`public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()`
`17`	`19`	`{`