[Form] fixed deprecation triggers, removed usage of deprecated features

Author: fabpot

Exception/AlreadyBoundException.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Form\Exception;
 
-trigger_error('The '.__NAMESPACE__.'\AlreadyBoundException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Exception\AlreadySubmittedException class instead.', E_USER_DEPRECATED);
-
 /**
  * Alias of {@link AlreadySubmittedException}.
  *
@@ -21,4 +19,12 @@
  */
 class AlreadyBoundException extends LogicException
 {
+    public function __construct($message = '', $code = 0, \Exception $previous = null)
+    {
+        if (__CLASS__ === get_class($this)) {
+            trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Exception\AlreadySubmittedException class instead.', E_USER_DEPRECATED);
+        }
+
+        parent::__construct($message, $code, $previous);
+    }
 }

Extension/Validator/ViolationMapper/ViolationMapper.php

@@ -127,8 +127,8 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
             $scope->addError(new FormError(
                 $violation->getMessage(),
                 $violation->getMessageTemplate(),
-                $violation->getMessageParameters(),
-                $violation->getMessagePluralization(),
+                $violation->getParameters(),
+                $violation->getPlural(),
                 $violation
             ));
         }

Tests/CompoundFormTest.php

@@ -791,8 +791,10 @@ public function testSubmitGetRequestWithEmptyRootFormName()
         $this->assertEquals(array('extra' => 'data'), $form->getExtraData());
     }
 
-    public function testGetErrorsAsStringDeep()
+    public function testLegacyGetErrorsAsStringDeep()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $parent = $this->getBuilder()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
@@ -810,8 +812,10 @@ public function testGetErrorsAsStringDeep()
         );
     }
 
-    public function testGetErrorsAsStringDeepWithIndentation()
+    public function testLegacyGetErrorsAsStringDeepWithIndentation()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $parent = $this->getBuilder()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())

Tests/Extension/Core/Type/FormTypeTest.php

@@ -637,8 +637,10 @@ public function testPassZeroLabelToView()
         $this->assertSame('0', $view->vars['label']);
     }
 
-    public function testCanGetErrorsWhenButtonInForm()
+    public function testLegacyCanGetErrorsWhenButtonInForm()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $builder = $this->factory->createBuilder('form', null, array(
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
             'required' => false,

Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -575,7 +575,7 @@ public function testNoViolationIfAllowExtraData()
             ->add($this->getBuilder('child'))
             ->getForm();
 
-        $form->bind(array('foo' => 'bar'));
+        $form->submit(array('foo' => 'bar'));
 
         $context->expects($this->never())
             ->method('addViolation');

Tests/SimpleFormTest.php

@@ -733,8 +733,10 @@ public function testCreateViewWithExplicitParent()
         $this->assertSame($view, $form->createView($parentView));
     }
 
-    public function testGetErrorsAsString()
+    public function testLegacyGetErrorsAsString()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $this->form->addError(new FormError('Error!'));
 
         $this->assertEquals("ERROR: Error!\n", $this->form->getErrorsAsString());