[Form] catch deprecated errors in tests
This commit is contained in:
parent
800a032f07
commit
fc2be6ddc8
@ -118,12 +118,16 @@ class CompoundFormTest extends AbstractFormTest
|
|||||||
{
|
{
|
||||||
$this->form->add($this->getBuilder()->getForm());
|
$this->form->add($this->getBuilder()->getForm());
|
||||||
|
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->assertTrue($this->form->hasChildren());
|
$this->assertTrue($this->form->hasChildren());
|
||||||
|
restore_error_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testHasNoChildren()
|
public function testHasNoChildren()
|
||||||
{
|
{
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->assertFalse($this->form->hasChildren());
|
$this->assertFalse($this->form->hasChildren());
|
||||||
|
restore_error_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testAdd()
|
public function testAdd()
|
||||||
@ -151,7 +155,9 @@ class CompoundFormTest extends AbstractFormTest
|
|||||||
$this->form->remove('foo');
|
$this->form->remove('foo');
|
||||||
|
|
||||||
$this->assertNull($child->getParent());
|
$this->assertNull($child->getParent());
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->assertFalse($this->form->hasChildren());
|
$this->assertFalse($this->form->hasChildren());
|
||||||
|
restore_error_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
36
src/Symfony/Component/Form/Tests/DeprecationErrorHandler.php
Normal file
36
src/Symfony/Component/Form/Tests/DeprecationErrorHandler.php
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Symfony\Component\Form\Tests;
|
||||||
|
|
||||||
|
use Symfony\Component\Form\FormInterface as NonTestFormInterface;
|
||||||
|
use Symfony\Component\Form\FormEvent;
|
||||||
|
|
||||||
|
class DeprecationErrorHandler
|
||||||
|
{
|
||||||
|
public static function handle($errorNumber, $message, $file, $line, $context)
|
||||||
|
{
|
||||||
|
if ($errorNumber & E_USER_DEPRECATED) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return \PHPUnit_Util_ErrorHandler::handleError($errorNumber, $message, $file, $line);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function handleBC($errorNumber, $message, $file, $line, $context)
|
||||||
|
{
|
||||||
|
if ($errorNumber & E_USER_DEPRECATED) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getFormEvent(NonTestFormInterface $form, $data)
|
||||||
|
{
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
|
$event = new FormEvent($form, $data);
|
||||||
|
restore_error_handler();
|
||||||
|
|
||||||
|
return $event;
|
||||||
|
}
|
||||||
|
}
|
@ -11,9 +11,9 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\Form\Extension\Core\EventListener\FixRadioInputListener;
|
use Symfony\Component\Form\Extension\Core\EventListener\FixRadioInputListener;
|
||||||
use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
|
use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase
|
class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -42,7 +42,7 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = '1';
|
$data = '1';
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$this->listener->preBind($event);
|
$this->listener->preBind($event);
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = '0';
|
$data = '0';
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$this->listener->preBind($event);
|
$this->listener->preBind($event);
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = '';
|
$data = '';
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$this->listener->preBind($event);
|
$this->listener->preBind($event);
|
||||||
|
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\Form\Extension\Core\EventListener\FixUrlProtocolListener;
|
use Symfony\Component\Form\Extension\Core\EventListener\FixUrlProtocolListener;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
|
class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -27,7 +27,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = "www.symfony.com";
|
$data = "www.symfony.com";
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$filter = new FixUrlProtocolListener('http');
|
$filter = new FixUrlProtocolListener('http');
|
||||||
$filter->onBind($event);
|
$filter->onBind($event);
|
||||||
@ -39,7 +39,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = "http://www.symfony.com";
|
$data = "http://www.symfony.com";
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$filter = new FixUrlProtocolListener('http');
|
$filter = new FixUrlProtocolListener('http');
|
||||||
$filter->onBind($event);
|
$filter->onBind($event);
|
||||||
@ -51,7 +51,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = "ftp://www.symfony.com";
|
$data = "ftp://www.symfony.com";
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$filter = new FixUrlProtocolListener('http');
|
$filter = new FixUrlProtocolListener('http');
|
||||||
$filter->onBind($event);
|
$filter->onBind($event);
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener;
|
use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -84,7 +84,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
// The original object was modified
|
// The original object was modified
|
||||||
@ -108,7 +108,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
// The original object was modified
|
// The original object was modified
|
||||||
@ -133,7 +133,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
// We still have the original object
|
// We still have the original object
|
||||||
@ -157,7 +157,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
// The original object was modified
|
// The original object was modified
|
||||||
@ -182,7 +182,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
// We still have the original object
|
// We still have the original object
|
||||||
@ -201,7 +201,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testRequireArrayOrTraversable($allowAdd, $allowDelete)
|
public function testRequireArrayOrTraversable($allowAdd, $allowDelete)
|
||||||
{
|
{
|
||||||
$newData = 'no array or traversable';
|
$newData = 'no array or traversable';
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener = new MergeCollectionListener($allowAdd, $allowDelete);
|
$listener = new MergeCollectionListener($allowAdd, $allowDelete);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
}
|
}
|
||||||
@ -215,7 +215,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
$this->assertSame($originalData, $event->getData());
|
$this->assertSame($originalData, $event->getData());
|
||||||
@ -233,7 +233,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
$this->assertSame($newData, $event->getData());
|
$this->assertSame($newData, $event->getData());
|
||||||
@ -251,7 +251,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->form->setData($originalData);
|
$this->form->setData($originalData);
|
||||||
|
|
||||||
$event = new FormEvent($this->form, $newData);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $newData);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
$this->assertNull($event->getData());
|
$this->assertNull($event->getData());
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener;
|
use Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener;
|
||||||
use Symfony\Component\Form\FormBuilder;
|
use Symfony\Component\Form\FormBuilder;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -80,7 +80,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
->will($this->returnValue($this->getForm('2')));
|
->will($this->returnValue($this->getForm('2')));
|
||||||
|
|
||||||
$data = array(1 => 'string', 2 => 'string');
|
$data = array(1 => 'string', 2 => 'string');
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array('max_length' => '10'), false, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array('max_length' => '10'), false, false);
|
||||||
$listener->preSetData($event);
|
$listener->preSetData($event);
|
||||||
|
|
||||||
@ -95,7 +95,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testPreSetDataRequiresArrayOrTraversable()
|
public function testPreSetDataRequiresArrayOrTraversable()
|
||||||
{
|
{
|
||||||
$data = 'no array or traversable';
|
$data = 'no array or traversable';
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
||||||
$listener->preSetData($event);
|
$listener->preSetData($event);
|
||||||
}
|
}
|
||||||
@ -105,7 +105,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->factory->expects($this->never())->method('createNamed');
|
$this->factory->expects($this->never())->method('createNamed');
|
||||||
|
|
||||||
$data = null;
|
$data = null;
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
||||||
$listener->preSetData($event);
|
$listener->preSetData($event);
|
||||||
}
|
}
|
||||||
@ -120,7 +120,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
->will($this->returnValue($this->getForm('1')));
|
->will($this->returnValue($this->getForm('1')));
|
||||||
|
|
||||||
$data = array(0 => 'string', 1 => 'string');
|
$data = array(0 => 'string', 1 => 'string');
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array('max_length' => 10), true, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array('max_length' => 10), true, false);
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
|
|
||||||
@ -134,7 +134,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('1'));
|
$this->form->add($this->getForm('1'));
|
||||||
|
|
||||||
$data = array(0 => 'string');
|
$data = array(0 => 'string');
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
|
|
||||||
@ -148,7 +148,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('0'));
|
$this->form->add($this->getForm('0'));
|
||||||
|
|
||||||
$data = array();
|
$data = array();
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
|
|
||||||
@ -161,7 +161,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('1'));
|
$this->form->add($this->getForm('1'));
|
||||||
|
|
||||||
$data = array(0 => 'string', 2 => 'string');
|
$data = array(0 => 'string', 2 => 'string');
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
|
|
||||||
@ -176,7 +176,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testPreBindRequiresArrayOrTraversable()
|
public function testPreBindRequiresArrayOrTraversable()
|
||||||
{
|
{
|
||||||
$data = 'no array or traversable';
|
$data = 'no array or traversable';
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
}
|
}
|
||||||
@ -186,7 +186,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('1'));
|
$this->form->add($this->getForm('1'));
|
||||||
|
|
||||||
$data = null;
|
$data = null;
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
|
|
||||||
@ -199,7 +199,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('1'));
|
$this->form->add($this->getForm('1'));
|
||||||
|
|
||||||
$data = '';
|
$data = '';
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
|
|
||||||
@ -211,7 +211,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('1'));
|
$this->form->add($this->getForm('1'));
|
||||||
|
|
||||||
$data = array(0 => 'first', 1 => 'second', 2 => 'third');
|
$data = array(0 => 'first', 1 => 'second', 2 => 'third');
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
@ -223,7 +223,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('1'));
|
$this->form->add($this->getForm('1'));
|
||||||
|
|
||||||
$data = array(0 => 'first', 1 => 'second', 2 => 'third');
|
$data = array(0 => 'first', 1 => 'second', 2 => 'third');
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
@ -236,7 +236,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testOnBindNormDataRequiresArrayOrTraversable()
|
public function testOnBindNormDataRequiresArrayOrTraversable()
|
||||||
{
|
{
|
||||||
$data = 'no array or traversable';
|
$data = 'no array or traversable';
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, false);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
}
|
}
|
||||||
@ -246,7 +246,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->form->add($this->getForm('1'));
|
$this->form->add($this->getForm('1'));
|
||||||
|
|
||||||
$data = null;
|
$data = null;
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
$listener = new ResizeFormListener($this->factory, 'text', array(), false, true);
|
||||||
$listener->onBind($event);
|
$listener->onBind($event);
|
||||||
|
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
namespace Symfony\Component\Form\Tests\Extension\Core\EventListener;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\Form\Extension\Core\EventListener\TrimListener;
|
use Symfony\Component\Form\Extension\Core\EventListener\TrimListener;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
class TrimListenerTest extends \PHPUnit_Framework_TestCase
|
class TrimListenerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -27,7 +27,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = " Foo! ";
|
$data = " Foo! ";
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$filter = new TrimListener();
|
$filter = new TrimListener();
|
||||||
$filter->preBind($event);
|
$filter->preBind($event);
|
||||||
@ -39,7 +39,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$data = 1234;
|
$data = 1234;
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$filter = new TrimListener();
|
$filter = new TrimListener();
|
||||||
$filter->preBind($event);
|
$filter->preBind($event);
|
||||||
@ -60,7 +60,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$data = $data."ab\ncd".$data;
|
$data = $data."ab\ncd".$data;
|
||||||
|
|
||||||
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
$form = $this->getMock('Symfony\Component\Form\Tests\FormInterface');
|
||||||
$event = new FormEvent($form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($form, $data);
|
||||||
|
|
||||||
$filter = new TrimListener();
|
$filter = new TrimListener();
|
||||||
$filter->preBind($event);
|
$filter->preBind($event);
|
||||||
|
@ -33,6 +33,14 @@ abstract class TypeTestCase extends FormIntegrationTestCase
|
|||||||
|
|
||||||
$this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
$this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
||||||
$this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
|
$this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
|
||||||
|
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function tearDown()
|
||||||
|
{
|
||||||
|
restore_error_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
|
public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Csrf\EventListener;
|
namespace Symfony\Component\Form\Tests\Extension\Csrf\EventListener;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\Form\FormBuilder;
|
use Symfony\Component\Form\FormBuilder;
|
||||||
use Symfony\Component\Form\Extension\Csrf\EventListener\CsrfValidationListener;
|
use Symfony\Component\Form\Extension\Csrf\EventListener\CsrfValidationListener;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
class CsrfValidationListenerTest extends \PHPUnit_Framework_TestCase
|
class CsrfValidationListenerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -67,7 +67,7 @@ class CsrfValidationListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testStringFormData()
|
public function testStringFormData()
|
||||||
{
|
{
|
||||||
$data = "XP4HUzmHPi";
|
$data = "XP4HUzmHPi";
|
||||||
$event = new FormEvent($this->form, $data);
|
$event = DeprecationErrorHandler::getFormEvent($this->form, $data);
|
||||||
|
|
||||||
$validation = new CsrfValidationListener('csrf', $this->csrfProvider, 'unknown');
|
$validation = new CsrfValidationListener('csrf', $this->csrfProvider, 'unknown');
|
||||||
$validation->preBind($event);
|
$validation->preBind($event);
|
||||||
|
@ -14,9 +14,9 @@ namespace Symfony\Component\Form\Tests\Extension\HttpFoundation\EventListener;
|
|||||||
use Symfony\Component\Form\Extension\HttpFoundation\EventListener\BindRequestListener;
|
use Symfony\Component\Form\Extension\HttpFoundation\EventListener\BindRequestListener;
|
||||||
use Symfony\Component\Form\Form;
|
use Symfony\Component\Form\Form;
|
||||||
use Symfony\Component\Form\FormConfigBuilder;
|
use Symfony\Component\Form\FormConfigBuilder;
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
@ -98,7 +98,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
||||||
$config = new FormConfigBuilder('author', null, $dispatcher);
|
$config = new FormConfigBuilder('author', null, $dispatcher);
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
@ -125,7 +125,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
||||||
$config = new FormConfigBuilder('', null, $dispatcher);
|
$config = new FormConfigBuilder('', null, $dispatcher);
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
@ -154,7 +154,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$config->setCompound(true);
|
$config->setCompound(true);
|
||||||
$config->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'));
|
$config->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'));
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
@ -180,7 +180,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$config = new FormConfigBuilder('author', null, $dispatcher);
|
$config = new FormConfigBuilder('author', null, $dispatcher);
|
||||||
$config->setCompound(false);
|
$config->setCompound(false);
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
@ -203,7 +203,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
||||||
$config = new FormConfigBuilder('author', null, $dispatcher);
|
$config = new FormConfigBuilder('author', null, $dispatcher);
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
@ -227,7 +227,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
$dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
|
||||||
$config = new FormConfigBuilder('', null, $dispatcher);
|
$config = new FormConfigBuilder('', null, $dispatcher);
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
@ -253,7 +253,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$config->setCompound(true);
|
$config->setCompound(true);
|
||||||
$config->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'));
|
$config->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'));
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
@ -275,7 +275,7 @@ class BindRequestListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$config = new FormConfigBuilder('author', null, $dispatcher);
|
$config = new FormConfigBuilder('author', null, $dispatcher);
|
||||||
$config->setCompound(false);
|
$config->setCompound(false);
|
||||||
$form = new Form($config);
|
$form = new Form($config);
|
||||||
$event = new FormEvent($form, $request);
|
$event = DeprecationErrorHandler::getFormEvent($form, $request);
|
||||||
|
|
||||||
$listener = new BindRequestListener();
|
$listener = new BindRequestListener();
|
||||||
$listener->preBind($event);
|
$listener->preBind($event);
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Form\Tests\Extension\Validator\EventListener;
|
namespace Symfony\Component\Form\Tests\Extension\Validator\EventListener;
|
||||||
|
|
||||||
use Symfony\Component\Form\FormEvent;
|
|
||||||
use Symfony\Component\Form\FormInterface;
|
use Symfony\Component\Form\FormInterface;
|
||||||
use Symfony\Component\Form\FormBuilder;
|
use Symfony\Component\Form\FormBuilder;
|
||||||
use Symfony\Component\Form\FormError;
|
use Symfony\Component\Form\FormError;
|
||||||
@ -19,6 +18,7 @@ use Symfony\Component\Form\Util\PropertyPath;
|
|||||||
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
|
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
|
||||||
use Symfony\Component\Form\Extension\Validator\EventListener\ValidationListener;
|
use Symfony\Component\Form\Extension\Validator\EventListener\ValidationListener;
|
||||||
use Symfony\Component\Validator\ConstraintViolation;
|
use Symfony\Component\Validator\ConstraintViolation;
|
||||||
|
use Symfony\Component\Form\Tests\DeprecationErrorHandler;
|
||||||
|
|
||||||
class ValidationListenerTest extends \PHPUnit_Framework_TestCase
|
class ValidationListenerTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -111,7 +111,7 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
->method('mapViolation')
|
->method('mapViolation')
|
||||||
->with($violation, $form, false);
|
->with($violation, $form, false);
|
||||||
|
|
||||||
$this->listener->validateForm(new FormEvent($form, null));
|
$this->listener->validateForm(DeprecationErrorHandler::getFormEvent($form, null));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testMapViolationAllowsNonSyncIfInvalid()
|
public function testMapViolationAllowsNonSyncIfInvalid()
|
||||||
@ -128,7 +128,7 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
// pass true now
|
// pass true now
|
||||||
->with($violation, $form, true);
|
->with($violation, $form, true);
|
||||||
|
|
||||||
$this->listener->validateForm(new FormEvent($form, null));
|
$this->listener->validateForm(DeprecationErrorHandler::getFormEvent($form, null));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testValidateIgnoresNonRoot()
|
public function testValidateIgnoresNonRoot()
|
||||||
@ -144,6 +144,6 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->violationMapper->expects($this->never())
|
$this->violationMapper->expects($this->never())
|
||||||
->method('mapViolation');
|
->method('mapViolation');
|
||||||
|
|
||||||
$this->listener->validateForm(new FormEvent($form, null));
|
$this->listener->validateForm(DeprecationErrorHandler::getFormEvent($form, null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -85,7 +85,9 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
->method('addType')
|
->method('addType')
|
||||||
->with($resolvedType);
|
->with($resolvedType);
|
||||||
|
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->factory->addType($type);
|
$this->factory->addType($type);
|
||||||
|
restore_error_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testHasType()
|
public function testHasType()
|
||||||
@ -95,7 +97,9 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
->with('name')
|
->with('name')
|
||||||
->will($this->returnValue('RESULT'));
|
->will($this->returnValue('RESULT'));
|
||||||
|
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->assertSame('RESULT', $this->factory->hasType('name'));
|
$this->assertSame('RESULT', $this->factory->hasType('name'));
|
||||||
|
restore_error_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testGetType()
|
public function testGetType()
|
||||||
@ -112,7 +116,9 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
|
|||||||
->with('name')
|
->with('name')
|
||||||
->will($this->returnValue($resolvedType));
|
->will($this->returnValue($resolvedType));
|
||||||
|
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->assertEquals($type, $this->factory->getType('name'));
|
$this->assertEquals($type, $this->factory->getType('name'));
|
||||||
|
restore_error_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testCreateNamedBuilderWithTypeName()
|
public function testCreateNamedBuilderWithTypeName()
|
||||||
|
@ -76,7 +76,9 @@ class FormRegistryTest extends \PHPUnit_Framework_TestCase
|
|||||||
->method('getName')
|
->method('getName')
|
||||||
->will($this->returnValue('foo'));
|
->will($this->returnValue('foo'));
|
||||||
|
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->registry->addType($resolvedType);
|
$this->registry->addType($resolvedType);
|
||||||
|
restore_error_handler();
|
||||||
|
|
||||||
$this->assertSame($resolvedType, $this->registry->getType('foo'));
|
$this->assertSame($resolvedType, $this->registry->getType('foo'));
|
||||||
}
|
}
|
||||||
@ -223,7 +225,9 @@ class FormRegistryTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->assertFalse($this->registry->hasType('foo'));
|
$this->assertFalse($this->registry->hasType('foo'));
|
||||||
|
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$this->registry->addType($resolvedType);
|
$this->registry->addType($resolvedType);
|
||||||
|
restore_error_handler();
|
||||||
|
|
||||||
$this->assertTrue($this->registry->hasType('foo'));
|
$this->assertTrue($this->registry->hasType('foo'));
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,6 @@ use Symfony\Component\Form\FormEvent;
|
|||||||
use Symfony\Component\Form\FormEvents;
|
use Symfony\Component\Form\FormEvents;
|
||||||
use Symfony\Component\Form\Util\PropertyPath;
|
use Symfony\Component\Form\Util\PropertyPath;
|
||||||
use Symfony\Component\Form\FormConfigBuilder;
|
use Symfony\Component\Form\FormConfigBuilder;
|
||||||
use Symfony\Component\Form\FormView;
|
|
||||||
use Symfony\Component\Form\FormError;
|
use Symfony\Component\Form\FormError;
|
||||||
use Symfony\Component\Form\Exception\TransformationFailedException;
|
use Symfony\Component\Form\Exception\TransformationFailedException;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcher;
|
use Symfony\Component\EventDispatcher\EventDispatcher;
|
||||||
@ -579,9 +578,11 @@ class SimpleFormTest extends AbstractFormTest
|
|||||||
{
|
{
|
||||||
$test = $this;
|
$test = $this;
|
||||||
$validator = $this->getFormValidator();
|
$validator = $this->getFormValidator();
|
||||||
|
set_error_handler(array('Symfony\Component\Form\Tests\DeprecationErrorHandler', 'handle'));
|
||||||
$form = $this->getBuilder()
|
$form = $this->getBuilder()
|
||||||
->addValidator($validator)
|
->addValidator($validator)
|
||||||
->getForm();
|
->getForm();
|
||||||
|
restore_error_handler();
|
||||||
|
|
||||||
$validator->expects($this->once())
|
$validator->expects($this->once())
|
||||||
->method('validate')
|
->method('validate')
|
||||||
|
Reference in New Issue
Block a user