[2.3] Cleanup deprecations

Author: nicolas-grekas

ButtonBuilder.php

@@ -386,6 +386,9 @@ public function setByReference($byReference)
      * @param bool $virtual
      *
      * @throws BadMethodCallException
+     *
+     * @deprecated since version 2.3, to be removed in 3.0. Use
+     *             {@link setInheritData()} instead.
      */
     public function setVirtual($virtual)
     {
@@ -588,6 +591,9 @@ public function getByReference()
      * Unsupported method.
      *
      * @return bool Always returns false.
+     *
+     * @deprecated since version 2.3, to be removed in 3.0. Use
+     *             {@link getInheritData()} instead.
      */
     public function getVirtual()
     {

Test/DeprecationErrorHandler.php

@@ -13,6 +13,9 @@
 
 use Symfony\Component\Form\FormEvent;
 
+/**
+ * @deprecated since version 2.3, to be removed in 3.0.
+ */
 class DeprecationErrorHandler
 {
     public static function handle($errorNumber, $message, $file, $line, $context)

Tests/AbstractLayoutTest.php

@@ -101,7 +101,10 @@ protected function assertWidgetMatchesXpath(FormView $view, array $vars, $xpath)
 
     abstract protected function renderForm(FormView $view, array $vars = array());
 
-    abstract protected function renderEnctype(FormView $view);
+    protected function renderEnctype(FormView $view)
+    {
+        $this->markTestSkipped(sprintf('Legacy %s::renderEnctype() is not implemented.', get_class($this)));
+    }
 
     abstract protected function renderLabel(FormView $view, $label = null, array $vars = array());
 
@@ -119,17 +122,21 @@ abstract protected function renderEnd(FormView $view, array $vars = array());
 
     abstract protected function setTheme(FormView $view, array $themes);
 
-    public function testEnctype()
+    public function testLegacyEnctype()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $form = $this->factory->createNamedBuilder('name', 'form')
             ->add('file', 'file')
             ->getForm();
 
         $this->assertEquals('enctype="multipart/form-data"', $this->renderEnctype($form->createView()));
     }
 
-    public function testNoEnctype()
+    public function testLegacyNoEnctype()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $form = $this->factory->createNamedBuilder('name', 'form')
             ->add('text', 'text')
             ->getForm();

Tests/Extension/HttpFoundation/EventListener/BindRequestListenerTest.php renamed to Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php

@@ -15,14 +15,13 @@
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormConfigBuilder;
 use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\Test\DeprecationErrorHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * @author Bernhard Schussek <[email protected]>
  */
-class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
+class LegacyBindRequestListenerTest extends \PHPUnit_Framework_TestCase
 {
     private $values;
 
@@ -37,6 +36,8 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $path = tempnam(sys_get_temp_dir(), 'sf2');
         touch($path);
 
@@ -102,7 +103,7 @@ public function testSubmitRequest($method)
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         $this->assertEquals(array(
             'name' => 'Bernhard',
@@ -129,7 +130,7 @@ public function testSubmitRequestWithEmptyName($method)
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         $this->assertEquals(array(
             'name' => 'Bernhard',
@@ -158,7 +159,7 @@ public function testSubmitEmptyRequestToCompoundForm($method)
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         // Default to empty array
         $this->assertEquals(array(), $event->getData());
@@ -184,7 +185,7 @@ public function testSubmitEmptyRequestToSimpleForm($method)
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         // Default to null
         $this->assertNull($event->getData());
@@ -207,7 +208,7 @@ public function testSubmitGetRequest()
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         $this->assertEquals(array(
             'name' => 'Bernhard',
@@ -231,7 +232,7 @@ public function testSubmitGetRequestWithEmptyName()
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         $this->assertEquals(array(
             'name' => 'Bernhard',
@@ -257,7 +258,7 @@ public function testSubmitEmptyGetRequestToCompoundForm()
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         $this->assertEquals(array(), $event->getData());
     }
@@ -279,7 +280,7 @@ public function testSubmitEmptyGetRequestToSimpleForm()
         $event = new FormEvent($form, $request);
 
         $listener = new BindRequestListener();
-        DeprecationErrorHandler::preBind($listener, $event);
+        $listener->preBind($event);
 
         $this->assertNull($event->getData());
     }