From 33fecca210c386b39259d69d25fa3488d087b8da Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Wed, 23 May 2012 20:58:42 +0200 Subject: [PATCH] [Form] Merged various form events and added class FormEvent --- UPGRADE-2.1.md | 29 +++++ .../MergeDoctrineCollectionListener.php | 6 +- .../Form/UserLoginFormType.php | 4 +- src/Symfony/Component/Form/CHANGELOG.md | 7 ++ .../Component/Form/Event/DataEvent.php | 16 +++ .../Component/Form/Event/FilterDataEvent.php | 15 ++- .../FixCheckboxInputListener.php | 6 +- .../EventListener/FixRadioInputListener.php | 6 +- .../EventListener/FixUrlProtocolListener.php | 6 +- .../EventListener/MergeCollectionListener.php | 8 +- .../Core/EventListener/ResizeFormListener.php | 11 +- .../Core/EventListener/TrimListener.php | 6 +- .../EventListener/CsrfValidationListener.php | 6 +- src/Symfony/Component/Form/Form.php | 25 +++-- src/Symfony/Component/Form/FormEvent.php | 21 ++++ src/Symfony/Component/Form/FormEvents.php | 18 ++++ .../FixRadioInputListenerTest.php | 14 +-- .../FixUrlProtocolListenerTest.php | 14 +-- .../MergeCollectionListenerTest.php | 38 +++---- .../EventListener/ResizeFormListenerTest.php | 39 ++++--- .../Core/EventListener/TrimListenerTest.php | 10 +- .../Extension/Core/Type/CheckboxTypeTest.php | 10 +- .../Extension/Core/Type/ChoiceTypeTest.php | 102 +++++++++--------- .../Extension/Core/Type/DateTimeTypeTest.php | 6 +- .../Extension/Core/Type/DateTypeTest.php | 28 ++--- .../Extension/Core/Type/FormTypeTest.php | 4 +- .../Extension/Core/Type/IntegerTypeTest.php | 2 +- .../Extension/Core/Type/RepeatedTypeTest.php | 12 +-- .../Extension/Core/Type/TimeTypeTest.php | 22 ++-- .../Tests/Extension/Core/Type/UrlTypeTest.php | 8 +- .../Tests/Fixtures/FixedFilterListener.php | 32 +++--- src/Symfony/Component/Form/Tests/FormTest.php | 58 +++++----- 32 files changed, 336 insertions(+), 253 deletions(-) create mode 100644 src/Symfony/Component/Form/FormEvent.php diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md index edffe5d44e..509e8f503f 100644 --- a/UPGRADE-2.1.md +++ b/UPGRADE-2.1.md @@ -671,6 +671,35 @@ $builder->addViewTransformer(new MyTransformer()); ``` + * The following events were deprecated and have a new equivalent: + + * `FormEvents::SET_DATA`: `FormEvents::PRE_SET_DATA` + * `FormEvents::BIND_CLIENT_DATA`: `FormEvents::PRE_BIND` + * `FormEvents::BIND_NORM_DATA`: `FormEvents::BIND` + + The deprecated events will be removed in Symfony 2.3. + + Furthermore, the event classes `DataEvent` and `FilterDataEvent` were + deprecated and replaced by the generic `FormEvent`. You are advised to + code your listeners against the new event now. The deprecated events will + be removed in Symfony 2.3. + + Before: + + ``` + $builder->addListener(FormEvents::BIND_CLIENT_DATA, function (FilterDataEvent $event) { + // ... + }); + ``` + + After: + + ``` + $builder->addListener(FormEvents::PRE_BIND, function (FormEvent $event) { + // ... + }); + ``` + ### Validator * The methods `setMessage()`, `getMessageTemplate()` and diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php index d3e567d69a..d3201d210b 100644 --- a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php +++ b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\Doctrine\Form\EventListener; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** @@ -30,10 +30,10 @@ class MergeDoctrineCollectionListener implements EventSubscriberInterface { // Higher priority than core MergeCollectionListener so that this one // is called before - return array(FormEvents::BIND_NORM_DATA => array('onBindNormData', 10)); + return array(FormEvents::BIND => array('onBind', 10)); } - public function onBindNormData(FilterDataEvent $event) + public function onBind(FormEvent $event) { $collection = $event->getForm()->getData(); $data = $event->getData(); diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php index e5c02133f8..21389efd07 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php @@ -15,7 +15,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; @@ -57,7 +57,7 @@ class UserLoginFormType extends AbstractType * request; however, we can match the expected behavior by checking the * session for an authentication error and last username. */ - $builder->addEventListener(FormEvents::SET_DATA, function (FilterDataEvent $event) use ($request) { + $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($request) { if ($request->attributes->has(SecurityContextInterface::AUTHENTICATION_ERROR)) { $error = $request->attributes->get(SecurityContextInterface::AUTHENTICATION_ERROR); } else { diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md index 64ef100bcf..9aded3a847 100644 --- a/src/Symfony/Component/Form/CHANGELOG.md +++ b/src/Symfony/Component/Form/CHANGELOG.md @@ -124,3 +124,10 @@ CHANGELOG * `finishView` in FormTypeInterface and FormTypeExtensionInterface * [BC BREAK] no options are passed to `getParent` of FormTypeInterface anymore + * deprecated DataEvent and FilterDataEvent in favor of the new FormEvent which is + now passed to all events thrown by the component + * FormEvents::BIND now replaces FormEvents::BIND_NORM_DATA + * FormEvents::PRE_SET_DATA now replaces FormEvents::SET_DATA + * FormEvents::PRE_BIND now replaces FormEvents::BIND_CLIENT_DATA + * deprecated FormEvents::SET_DATA, FormEvents::BIND_CLIENT_DATA and + FormEvents::BIND_NORM_DATA diff --git a/src/Symfony/Component/Form/Event/DataEvent.php b/src/Symfony/Component/Form/Event/DataEvent.php index d9a7de9251..7bdc053edd 100644 --- a/src/Symfony/Component/Form/Event/DataEvent.php +++ b/src/Symfony/Component/Form/Event/DataEvent.php @@ -14,6 +14,12 @@ namespace Symfony\Component\Form\Event; use Symfony\Component\EventDispatcher\Event; use Symfony\Component\Form\FormInterface; +/** + * @author Bernhard Schussek + * + * @deprecated Deprecated since version 2.1, to be removed in 2.3. Code against + * {@link \Symfony\Component\Form\FormEvent} instead. + */ class DataEvent extends Event { private $form; @@ -50,4 +56,14 @@ class DataEvent extends Event { return $this->data; } + + /** + * Allows updating with some filtered data + * + * @param mixed $data + */ + public function setData($data) + { + $this->data = $data; + } } diff --git a/src/Symfony/Component/Form/Event/FilterDataEvent.php b/src/Symfony/Component/Form/Event/FilterDataEvent.php index bc152dbae1..d20f483c69 100644 --- a/src/Symfony/Component/Form/Event/FilterDataEvent.php +++ b/src/Symfony/Component/Form/Event/FilterDataEvent.php @@ -11,15 +11,12 @@ namespace Symfony\Component\Form\Event; +/** + * @author Bernhard Schussek + * + * @deprecated Deprecated since version 2.1, to be removed in 2.3. Code against + * {@link \Symfony\Component\Form\FormEvent} instead. + */ class FilterDataEvent extends DataEvent { - /** - * Allows updating with some filtered data - * - * @param mixed $data - */ - public function setData($data) - { - $this->data = $data; - } } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php index f7302e33dc..4ddec0db97 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\EventListener; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface; @@ -36,7 +36,7 @@ class FixCheckboxInputListener implements EventSubscriberInterface $this->choiceList = $choiceList; } - public function onBindClientData(FilterDataEvent $event) + public function preBind(FormEvent $event) { $values = (array) $event->getData(); $indices = $this->choiceList->getIndicesForValues($values); @@ -46,6 +46,6 @@ class FixCheckboxInputListener implements EventSubscriberInterface static public function getSubscribedEvents() { - return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData'); + return array(FormEvents::PRE_BIND => 'preBind'); } } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php index 1378b2e2f7..43e8a3b73a 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\EventListener; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface; @@ -36,7 +36,7 @@ class FixRadioInputListener implements EventSubscriberInterface $this->choiceList = $choiceList; } - public function onBindClientData(FilterDataEvent $event) + public function preBind(FormEvent $event) { $value = $event->getData(); $index = current($this->choiceList->getIndicesForValues(array($value))); @@ -46,6 +46,6 @@ class FixRadioInputListener implements EventSubscriberInterface static public function getSubscribedEvents() { - return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData'); + return array(FormEvents::PRE_BIND => 'preBind'); } } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php index b0d532cdf6..ee2cd95ac4 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\EventListener; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** @@ -29,7 +29,7 @@ class FixUrlProtocolListener implements EventSubscriberInterface $this->defaultProtocol = $defaultProtocol; } - public function onBindNormData(FilterDataEvent $event) + public function onBind(FormEvent $event) { $data = $event->getData(); @@ -40,6 +40,6 @@ class FixUrlProtocolListener implements EventSubscriberInterface static public function getSubscribedEvents() { - return array(FormEvents::BIND_NORM_DATA => 'onBindNormData'); + return array(FormEvents::BIND => 'onBind'); } } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php index ff4ed80d34..5d76a78904 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php @@ -13,7 +13,7 @@ namespace Symfony\Component\Form\Extension\Core\EventListener; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\Exception\UnexpectedTypeException; /** @@ -50,15 +50,13 @@ class MergeCollectionListener implements EventSubscriberInterface static public function getSubscribedEvents() { return array( - FormEvents::BIND_NORM_DATA => 'onBindNormData', + FormEvents::BIND => 'onBind', ); } - public function onBindNormData(FilterDataEvent $event) + public function onBind(FormEvent $event) { $dataToMergeInto = $event->getForm()->getNormData(); - - $form = $event->getForm(); $data = $event->getData(); if (null === $data) { diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php index d934680c9c..97eddcf341 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php @@ -12,8 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\EventListener; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\DataEvent; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -67,11 +66,11 @@ class ResizeFormListener implements EventSubscriberInterface FormEvents::PRE_SET_DATA => 'preSetData', FormEvents::PRE_BIND => 'preBind', // (MergeCollectionListener, MergeDoctrineCollectionListener) - FormEvents::BIND_NORM_DATA => array('onBindNormData', 50), + FormEvents::BIND => array('onBind', 50), ); } - public function preSetData(DataEvent $event) + public function preSetData(FormEvent $event) { $form = $event->getForm(); $data = $event->getData(); @@ -97,7 +96,7 @@ class ResizeFormListener implements EventSubscriberInterface } } - public function preBind(DataEvent $event) + public function preBind(FormEvent $event) { $form = $event->getForm(); $data = $event->getData(); @@ -131,7 +130,7 @@ class ResizeFormListener implements EventSubscriberInterface } } - public function onBindNormData(FilterDataEvent $event) + public function onBind(FormEvent $event) { $form = $event->getForm(); $data = $event->getData(); diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php index 220ad24781..4ee3249054 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Form\Extension\Core\EventListener; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** @@ -22,7 +22,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ class TrimListener implements EventSubscriberInterface { - public function onBindClientData(FilterDataEvent $event) + public function preBind(FormEvent $event) { $data = $event->getData(); @@ -33,6 +33,6 @@ class TrimListener implements EventSubscriberInterface static public function getSubscribedEvents() { - return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData'); + return array(FormEvents::PRE_BIND => 'preBind'); } } diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php index 7177f99981..6c9df41392 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php +++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Form\Extension\Csrf\EventListener; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormError; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface; /** @@ -47,7 +47,7 @@ class CsrfValidationListener implements EventSubscriberInterface static public function getSubscribedEvents() { return array( - FormEvents::BIND_CLIENT_DATA => 'onBindClientData', + FormEvents::PRE_BIND => 'preBind', ); } @@ -58,7 +58,7 @@ class CsrfValidationListener implements EventSubscriberInterface $this->intention = $intention; } - public function onBindClientData(FilterDataEvent $event) + public function preBind(FormEvent $event) { $form = $event->getForm(); $data = $event->getData(); diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 28c1495158..4e0d354ba8 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Form; -use Symfony\Component\Form\Event\DataEvent; -use Symfony\Component\Form\Event\FilterDataEvent; use Symfony\Component\Form\Exception\FormException; use Symfony\Component\Form\Exception\AlreadyBoundException; use Symfony\Component\Form\Exception\UnexpectedTypeException; @@ -329,11 +327,10 @@ class Form implements \IteratorAggregate, FormInterface $modelData = clone $modelData; } - $event = new DataEvent($this, $modelData); - $this->config->getEventDispatcher()->dispatch(FormEvents::PRE_SET_DATA, $event); - // Hook to change content of the data - $event = new FilterDataEvent($this, $modelData); + $event = new FormEvent($this, $modelData); + $this->config->getEventDispatcher()->dispatch(FormEvents::PRE_SET_DATA, $event); + // BC until 2.3 $this->config->getEventDispatcher()->dispatch(FormEvents::SET_DATA, $event); $modelData = $event->getData(); @@ -383,7 +380,7 @@ class Form implements \IteratorAggregate, FormInterface $this->config->getDataMapper()->mapDataToForms($viewData, $this->children); } - $event = new DataEvent($this, $modelData); + $event = new FormEvent($this, $modelData); $this->config->getEventDispatcher()->dispatch(FormEvents::POST_SET_DATA, $event); return $this; @@ -465,16 +462,15 @@ class Form implements \IteratorAggregate, FormInterface // errors added during listeners $this->errors = array(); - $event = new DataEvent($this, $submittedData); - $this->config->getEventDispatcher()->dispatch(FormEvents::PRE_BIND, $event); - $modelData = null; $normData = null; $extraData = array(); $synchronized = false; // Hook to change content of the data bound by the browser - $event = new FilterDataEvent($this, $submittedData); + $event = new FormEvent($this, $submittedData); + $this->config->getEventDispatcher()->dispatch(FormEvents::PRE_BIND, $event); + // BC until 2.3 $this->config->getEventDispatcher()->dispatch(FormEvents::BIND_CLIENT_DATA, $event); $submittedData = $event->getData(); @@ -537,10 +533,13 @@ class Form implements \IteratorAggregate, FormInterface if ($synchronized) { // Hook to change content of the data into the normalized // representation - $event = new FilterDataEvent($this, $normData); + $event = new FormEvent($this, $normData); + $this->config->getEventDispatcher()->dispatch(FormEvents::BIND, $event); + // BC until 2.3 $this->config->getEventDispatcher()->dispatch(FormEvents::BIND_NORM_DATA, $event); $normData = $event->getData(); + // Synchronize representations - must not change the content! $modelData = $this->normToModel($normData); $viewData = $this->normToView($normData); @@ -553,7 +552,7 @@ class Form implements \IteratorAggregate, FormInterface $this->extraData = $extraData; $this->synchronized = $synchronized; - $event = new DataEvent($this, $viewData); + $event = new FormEvent($this, $viewData); $this->config->getEventDispatcher()->dispatch(FormEvents::POST_BIND, $event); foreach ($this->config->getValidators() as $validator) { diff --git a/src/Symfony/Component/Form/FormEvent.php b/src/Symfony/Component/Form/FormEvent.php new file mode 100644 index 0000000000..ed3fc77006 --- /dev/null +++ b/src/Symfony/Component/Form/FormEvent.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Form; + +use Symfony\Component\Form\Event\FilterDataEvent; + +/** + * @author Bernhard Schussek + */ +class FormEvent extends FilterDataEvent +{ +} diff --git a/src/Symfony/Component/Form/FormEvents.php b/src/Symfony/Component/Form/FormEvents.php index 08f10c4a43..430ea08560 100644 --- a/src/Symfony/Component/Form/FormEvents.php +++ b/src/Symfony/Component/Form/FormEvents.php @@ -18,15 +18,33 @@ final class FormEvents { const PRE_BIND = 'form.pre_bind'; + const BIND = 'form.bind'; + const POST_BIND = 'form.post_bind'; const PRE_SET_DATA = 'form.pre_set_data'; const POST_SET_DATA = 'form.post_set_data'; + /** + * @deprecated Deprecated since version 2.1, to be removed in 2.3. + * Use {@link PRE_BIND} instead. + */ const BIND_CLIENT_DATA = 'form.bind_client_data'; + /** + * @deprecated Deprecated since version 2.1, to be removed in 2.3. + * Use {@link BIND} instead. + */ const BIND_NORM_DATA = 'form.bind_norm_data'; + /** + * @deprecated Deprecated since version 2.1, to be removed in 2.3. + * Use {@link PRE_SET_DATA} instead. + */ const SET_DATA = 'form.set_data'; + + private function __construct() + { + } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixRadioInputListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixRadioInputListenerTest.php index 3d9b26551d..9f2d0d21a6 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixRadioInputListenerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixRadioInputListenerTest.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\EventListener; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\Extension\Core\EventListener\FixRadioInputListener; use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList; @@ -42,9 +42,9 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase { $data = '1'; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); - $this->listener->onBindClientData($event); + $this->listener->preBind($event); $this->assertEquals(array(1 => '1'), $event->getData()); } @@ -53,9 +53,9 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase { $data = '0'; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); - $this->listener->onBindClientData($event); + $this->listener->preBind($event); $this->assertEquals(array(0 => '0'), $event->getData()); } @@ -64,9 +64,9 @@ class FixRadioInputListenerTest extends \PHPUnit_Framework_TestCase { $data = ''; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); - $this->listener->onBindClientData($event); + $this->listener->preBind($event); $this->assertEquals(array(), $event->getData()); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php index 9a2341dd22..ab0bdf3a44 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\EventListener; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\Extension\Core\EventListener\FixUrlProtocolListener; class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase @@ -27,10 +27,10 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase { $data = "www.symfony.com"; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); $filter = new FixUrlProtocolListener('http'); - $filter->onBindNormData($event); + $filter->onBind($event); $this->assertEquals('http://www.symfony.com', $event->getData()); } @@ -39,10 +39,10 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase { $data = "http://www.symfony.com"; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); $filter = new FixUrlProtocolListener('http'); - $filter->onBindNormData($event); + $filter->onBind($event); $this->assertEquals('http://www.symfony.com', $event->getData()); } @@ -51,10 +51,10 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase { $data = "ftp://www.symfony.com"; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); $filter = new FixUrlProtocolListener('http'); - $filter->onBindNormData($event); + $filter->onBind($event); $this->assertEquals('ftp://www.symfony.com', $event->getData()); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php index 81982169c9..c156b9ec2a 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\EventListener; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener; use Symfony\Component\Form\FormBuilder; @@ -85,8 +85,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); // The original object was modified if (is_object($originalData)) { @@ -109,8 +109,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); // The original object was modified if (is_object($originalData)) { @@ -134,8 +134,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); // We still have the original object if (is_object($originalData)) { @@ -158,8 +158,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); // The original object was modified if (is_object($originalData)) { @@ -183,8 +183,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); // We still have the original object if (is_object($originalData)) { @@ -202,9 +202,9 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase public function testRequireArrayOrTraversable($allowAdd, $allowDelete) { $newData = 'no array or traversable'; - $event = new FilterDataEvent($this->form, $newData); + $event = new FormEvent($this->form, $newData); $listener = new MergeCollectionListener($allowAdd, $allowDelete); - $listener->onBindNormData($event); + $listener->onBind($event); } public function testDealWithNullData() @@ -216,8 +216,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); $this->assertSame($originalData, $event->getData()); } @@ -234,8 +234,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); $this->assertSame($newData, $event->getData()); } @@ -252,8 +252,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase $this->form->setData($originalData); - $event = new FilterDataEvent($this->form, $newData); - $listener->onBindNormData($event); + $event = new FormEvent($this->form, $newData); + $listener->onBind($event); $this->assertNull($event->getData()); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php index d6a306f5cb..0213f1af31 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php @@ -11,8 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\EventListener; -use Symfony\Component\Form\Event\DataEvent; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener; use Symfony\Component\Form\FormBuilder; @@ -70,7 +69,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->getForm('2'))); $data = array(1 => 'string', 2 => 'string'); - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array('max_length' => '10'), false, false); $listener->preSetData($event); @@ -85,7 +84,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase public function testPreSetDataRequiresArrayOrTraversable() { $data = 'no array or traversable'; - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, false); $listener->preSetData($event); } @@ -95,7 +94,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->factory->expects($this->never())->method('createNamed'); $data = null; - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, false); $listener->preSetData($event); } @@ -110,7 +109,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($this->getForm('1'))); $data = array(0 => 'string', 1 => 'string'); - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array('max_length' => 10), true, false); $listener->preBind($event); @@ -124,7 +123,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('1')); $data = array(0 => 'string'); - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, true); $listener->preBind($event); @@ -138,7 +137,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('0')); $data = array(); - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, true); $listener->preBind($event); @@ -151,7 +150,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('1')); $data = array(0 => 'string', 2 => 'string'); - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, false); $listener->preBind($event); @@ -166,7 +165,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase public function testPreBindRequiresArrayOrTraversable() { $data = 'no array or traversable'; - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, false); $listener->preBind($event); } @@ -176,7 +175,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('1')); $data = null; - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, true); $listener->preBind($event); @@ -189,7 +188,7 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('1')); $data = ''; - $event = new DataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, true); $listener->preBind($event); @@ -201,9 +200,9 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('1')); $data = array(0 => 'first', 1 => 'second', 2 => 'third'); - $event = new FilterDataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, true); - $listener->onBindNormData($event); + $listener->onBind($event); $this->assertEquals(array(1 => 'second'), $event->getData()); } @@ -213,9 +212,9 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('1')); $data = array(0 => 'first', 1 => 'second', 2 => 'third'); - $event = new FilterDataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, false); - $listener->onBindNormData($event); + $listener->onBind($event); $this->assertEquals($data, $event->getData()); } @@ -226,9 +225,9 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase public function testOnBindNormDataRequiresArrayOrTraversable() { $data = 'no array or traversable'; - $event = new FilterDataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, false); - $listener->onBindNormData($event); + $listener->onBind($event); } public function testOnBindNormDataDealsWithNullData() @@ -236,9 +235,9 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase $this->form->add($this->getForm('1')); $data = null; - $event = new FilterDataEvent($this->form, $data); + $event = new FormEvent($this->form, $data); $listener = new ResizeFormListener($this->factory, 'text', array(), false, true); - $listener->onBindNormData($event); + $listener->onBind($event); $this->assertEquals(array(), $event->getData()); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php index 7f70a061c0..e5c3f96ef4 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\EventListener; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\Extension\Core\EventListener\TrimListener; class TrimListenerTest extends \PHPUnit_Framework_TestCase @@ -27,10 +27,10 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase { $data = " Foo! "; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); $filter = new TrimListener(); - $filter->onBindClientData($event); + $filter->preBind($event); $this->assertEquals('Foo!', $event->getData()); } @@ -39,10 +39,10 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase { $data = 1234; $form = $this->getMock('Symfony\Component\Form\Tests\FormInterface'); - $event = new FilterDataEvent($form, $data); + $event = new FormEvent($form, $data); $filter = new TrimListener(); - $filter->onBindClientData($event); + $filter->preBind($event); $this->assertSame(1234, $event->getData()); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php index 5240b5e105..b9a01cb945 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php @@ -58,7 +58,7 @@ class CheckboxTypeTest extends TypeTestCase $form->bind('foobar'); $this->assertTrue($form->getData()); - $this->assertEquals('foobar', $form->getClientData()); + $this->assertEquals('foobar', $form->getViewData()); } public function testBindWithRandomValueChecked() @@ -69,7 +69,7 @@ class CheckboxTypeTest extends TypeTestCase $form->bind('krixikraxi'); $this->assertTrue($form->getData()); - $this->assertEquals('foobar', $form->getClientData()); + $this->assertEquals('foobar', $form->getViewData()); } public function testBindWithValueUnchecked() @@ -80,7 +80,7 @@ class CheckboxTypeTest extends TypeTestCase $form->bind(null); $this->assertFalse($form->getData()); - $this->assertNull($form->getClientData()); + $this->assertNull($form->getViewData()); } public function testBindWithEmptyValueChecked() @@ -91,7 +91,7 @@ class CheckboxTypeTest extends TypeTestCase $form->bind(''); $this->assertTrue($form->getData()); - $this->assertSame('', $form->getClientData()); + $this->assertSame('', $form->getViewData()); } public function testBindWithEmptyValueUnchecked() @@ -102,7 +102,7 @@ class CheckboxTypeTest extends TypeTestCase $form->bind(null); $this->assertFalse($form->getData()); - $this->assertNull($form->getClientData()); + $this->assertNull($form->getViewData()); } /** diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php index a639cc79fc..3c879fe4d8 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php @@ -180,7 +180,7 @@ class ChoiceTypeTest extends TypeTestCase $form->bind('b'); $this->assertEquals('b', $form->getData()); - $this->assertEquals('b', $form->getClientData()); + $this->assertEquals('b', $form->getViewData()); } public function testBindSingleNonExpandedObjectChoices() @@ -203,7 +203,7 @@ class ChoiceTypeTest extends TypeTestCase $form->bind('2'); $this->assertEquals($this->objectChoices[1], $form->getData()); - $this->assertEquals('2', $form->getClientData()); + $this->assertEquals('2', $form->getViewData()); } public function testBindMultipleNonExpanded() @@ -217,7 +217,7 @@ class ChoiceTypeTest extends TypeTestCase $form->bind(array('a', 'b')); $this->assertEquals(array('a', 'b'), $form->getData()); - $this->assertEquals(array('a', 'b'), $form->getClientData()); + $this->assertEquals(array('a', 'b'), $form->getViewData()); } public function testBindMultipleNonExpandedObjectChoices() @@ -239,7 +239,7 @@ class ChoiceTypeTest extends TypeTestCase $form->bind(array('2', '3')); $this->assertEquals(array($this->objectChoices[1], $this->objectChoices[2]), $form->getData()); - $this->assertEquals(array('2', '3'), $form->getClientData()); + $this->assertEquals(array('2', '3'), $form->getViewData()); } public function testBindSingleExpanded() @@ -258,11 +258,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertFalse($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertNull($form[0]->getClientData()); - $this->assertSame('b', $form[1]->getClientData()); - $this->assertNull($form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertNull($form[0]->getViewData()); + $this->assertSame('b', $form[1]->getViewData()); + $this->assertNull($form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } public function testBindSingleExpandedNothingChecked() @@ -281,11 +281,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertFalse($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertNull($form[0]->getClientData()); - $this->assertNull($form[1]->getClientData()); - $this->assertNull($form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertNull($form[0]->getViewData()); + $this->assertNull($form[1]->getViewData()); + $this->assertNull($form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } public function testBindSingleExpandedWithFalseDoesNotHaveExtraChildren() @@ -318,8 +318,8 @@ class ChoiceTypeTest extends TypeTestCase $this->assertNull($form->getData()); $this->assertTrue($form[0]->getData()); $this->assertFalse($form[1]->getData()); - $this->assertSame('', $form[0]->getClientData()); - $this->assertNull($form[1]->getClientData()); + $this->assertSame('', $form[0]->getViewData()); + $this->assertNull($form[1]->getViewData()); } public function testBindSingleExpandedObjectChoices() @@ -346,11 +346,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertFalse($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertNull($form[0]->getClientData()); - $this->assertSame('2', $form[1]->getClientData()); - $this->assertNull($form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertNull($form[0]->getViewData()); + $this->assertSame('2', $form[1]->getViewData()); + $this->assertNull($form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } public function testBindSingleExpandedNumericChoices() @@ -369,11 +369,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertFalse($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertNull($form[0]->getClientData()); - $this->assertSame('1', $form[1]->getClientData()); - $this->assertNull($form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertNull($form[0]->getViewData()); + $this->assertSame('1', $form[1]->getViewData()); + $this->assertNull($form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } public function testBindMultipleExpanded() @@ -392,11 +392,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertTrue($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertSame('a', $form[0]->getClientData()); - $this->assertNull($form[1]->getClientData()); - $this->assertSame('c', $form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertSame('a', $form[0]->getViewData()); + $this->assertNull($form[1]->getViewData()); + $this->assertSame('c', $form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } public function testBindMultipleExpandedEmpty() @@ -415,11 +415,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertFalse($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertNull($form[0]->getClientData()); - $this->assertNull($form[1]->getClientData()); - $this->assertNull($form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertNull($form[0]->getViewData()); + $this->assertNull($form[1]->getViewData()); + $this->assertNull($form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } public function testBindMultipleExpandedWithEmptyChild() @@ -440,9 +440,9 @@ class ChoiceTypeTest extends TypeTestCase $this->assertTrue($form[0]->getData()); $this->assertFalse($form[1]->getData()); $this->assertTrue($form[2]->getData()); - $this->assertSame('', $form[0]->getClientData()); - $this->assertNull($form[1]->getClientData()); - $this->assertSame('2', $form[2]->getClientData()); + $this->assertSame('', $form[0]->getViewData()); + $this->assertNull($form[1]->getViewData()); + $this->assertSame('2', $form[2]->getViewData()); } public function testBindMultipleExpandedObjectChoices() @@ -469,11 +469,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertFalse($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertSame('1', $form[0]->getClientData()); - $this->assertSame('2', $form[1]->getClientData()); - $this->assertNull($form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertSame('1', $form[0]->getViewData()); + $this->assertSame('2', $form[1]->getViewData()); + $this->assertNull($form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } public function testBindMultipleExpandedNumericChoices() @@ -492,11 +492,11 @@ class ChoiceTypeTest extends TypeTestCase $this->assertTrue($form[2]->getData()); $this->assertFalse($form[3]->getData()); $this->assertFalse($form[4]->getData()); - $this->assertNull($form[0]->getClientData()); - $this->assertSame('1', $form[1]->getClientData()); - $this->assertSame('2', $form[2]->getClientData()); - $this->assertNull($form[3]->getClientData()); - $this->assertNull($form[4]->getClientData()); + $this->assertNull($form[0]->getViewData()); + $this->assertSame('1', $form[1]->getViewData()); + $this->assertSame('2', $form[2]->getViewData()); + $this->assertNull($form[3]->getViewData()); + $this->assertNull($form[4]->getViewData()); } /* @@ -514,7 +514,7 @@ class ChoiceTypeTest extends TypeTestCase $form->setData(false); $this->assertFalse($form->getData()); - $this->assertEquals('0', $form->getClientData()); + $this->assertEquals('0', $form->getViewData()); } public function testSetDataMultipleNonExpandedAcceptsBoolean() @@ -528,7 +528,7 @@ class ChoiceTypeTest extends TypeTestCase $form->setData(array(false, true)); $this->assertEquals(array(false, true), $form->getData()); - $this->assertEquals(array('0', '1'), $form->getClientData()); + $this->assertEquals(array('0', '1'), $form->getViewData()); } public function testPassRequiredToView() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php index a075d55868..0d87e5da92 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -173,7 +173,7 @@ class DateTimeTypeTest extends LocalizedTestCase $outputTime->setTimezone(new \DateTimeZone('America/New_York')); $this->assertDateTimeEquals($outputTime, $form->getData()); - $this->assertEquals('2010-06-02 03:04', $form->getClientData()); + $this->assertEquals('2010-06-02 03:04', $form->getViewData()); } public function testSubmit_stringSingleText() @@ -188,7 +188,7 @@ class DateTimeTypeTest extends LocalizedTestCase $form->bind('2010-06-02 03:04:05'); $this->assertEquals('2010-06-02 03:04:00', $form->getData()); - $this->assertEquals('2010-06-02 03:04', $form->getClientData()); + $this->assertEquals('2010-06-02 03:04', $form->getViewData()); } public function testSubmit_stringSingleText_withSeconds() @@ -204,7 +204,7 @@ class DateTimeTypeTest extends LocalizedTestCase $form->bind('2010-06-02 03:04:05'); $this->assertEquals('2010-06-02 03:04:05', $form->getData()); - $this->assertEquals('2010-06-02 03:04:05', $form->getClientData()); + $this->assertEquals('2010-06-02 03:04:05', $form->getViewData()); } public function testSubmit_differentPattern() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php index 41aaf6b953..01c8d41fce 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php @@ -54,7 +54,7 @@ class DateTypeTest extends LocalizedTestCase $form->bind('2.6.2010'); $this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData()); - $this->assertEquals('02.06.2010', $form->getClientData()); + $this->assertEquals('02.06.2010', $form->getViewData()); } public function testSubmitFromSingleTextString() @@ -69,7 +69,7 @@ class DateTypeTest extends LocalizedTestCase $form->bind('2.6.2010'); $this->assertEquals('2010-06-02', $form->getData()); - $this->assertEquals('02.06.2010', $form->getClientData()); + $this->assertEquals('02.06.2010', $form->getViewData()); } public function testSubmitFromSingleTextTimestamp() @@ -86,7 +86,7 @@ class DateTypeTest extends LocalizedTestCase $dateTime = new \DateTime('2010-06-02 UTC'); $this->assertEquals($dateTime->format('U'), $form->getData()); - $this->assertEquals('02.06.2010', $form->getClientData()); + $this->assertEquals('02.06.2010', $form->getViewData()); } public function testSubmitFromSingleTextRaw() @@ -107,7 +107,7 @@ class DateTypeTest extends LocalizedTestCase ); $this->assertEquals($output, $form->getData()); - $this->assertEquals('02.06.2010', $form->getClientData()); + $this->assertEquals('02.06.2010', $form->getViewData()); } public function testSubmitFromText() @@ -129,7 +129,7 @@ class DateTypeTest extends LocalizedTestCase $dateTime = new \DateTime('2010-06-02 UTC'); $this->assertDateTimeEquals($dateTime, $form->getData()); - $this->assertEquals($text, $form->getClientData()); + $this->assertEquals($text, $form->getViewData()); } public function testSubmitFromChoice() @@ -151,7 +151,7 @@ class DateTypeTest extends LocalizedTestCase $dateTime = new \DateTime('2010-06-02 UTC'); $this->assertDateTimeEquals($dateTime, $form->getData()); - $this->assertEquals($text, $form->getClientData()); + $this->assertEquals($text, $form->getViewData()); } public function testSubmitFromChoiceEmpty() @@ -172,7 +172,7 @@ class DateTypeTest extends LocalizedTestCase $form->bind($text); $this->assertNull($form->getData()); - $this->assertEquals($text, $form->getClientData()); + $this->assertEquals($text, $form->getViewData()); } public function testSubmitFromInputDateTimeDifferentPattern() @@ -188,7 +188,7 @@ class DateTypeTest extends LocalizedTestCase $form->bind('06*2010*02'); $this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData()); - $this->assertEquals('06*2010*02', $form->getClientData()); + $this->assertEquals('06*2010*02', $form->getViewData()); } public function testSubmitFromInputStringDifferentPattern() @@ -204,7 +204,7 @@ class DateTypeTest extends LocalizedTestCase $form->bind('06*2010*02'); $this->assertEquals('2010-06-02', $form->getData()); - $this->assertEquals('06*2010*02', $form->getClientData()); + $this->assertEquals('06*2010*02', $form->getViewData()); } public function testSubmitFromInputTimestampDifferentPattern() @@ -222,7 +222,7 @@ class DateTypeTest extends LocalizedTestCase $dateTime = new \DateTime('2010-06-02 UTC'); $this->assertEquals($dateTime->format('U'), $form->getData()); - $this->assertEquals('06*2010*02', $form->getClientData()); + $this->assertEquals('06*2010*02', $form->getViewData()); } public function testSubmitFromInputRawDifferentPattern() @@ -244,7 +244,7 @@ class DateTypeTest extends LocalizedTestCase ); $this->assertEquals($output, $form->getData()); - $this->assertEquals('06*2010*02', $form->getClientData()); + $this->assertEquals('06*2010*02', $form->getViewData()); } /** @@ -262,7 +262,7 @@ class DateTypeTest extends LocalizedTestCase $form->setData('2010-06-02'); // This would be what would be outputed if '0' was mistaken for \IntlDateFormatter::FULL - $this->assertNotEquals('Mittwoch, 02. Juni 2010', $form->getClientData()); + $this->assertNotEquals('Mittwoch, 02. Juni 2010', $form->getViewData()); } /** @@ -296,7 +296,7 @@ class DateTypeTest extends LocalizedTestCase $form->setData('2010-06-02'); - $this->assertEquals('01.06.2010', $form->getClientData()); + $this->assertEquals('01.06.2010', $form->getViewData()); } public function testSetData_differentTimezonesDateTime() @@ -313,7 +313,7 @@ class DateTypeTest extends LocalizedTestCase $form->setData($dateTime); $this->assertDateTimeEquals($dateTime, $form->getData()); - $this->assertEquals('01.06.2010', $form->getClientData()); + $this->assertEquals('01.06.2010', $form->getViewData()); } public function testYearsOption() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php index a4b9a01b74..19fc86f534 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php @@ -81,7 +81,7 @@ class FormTypeTest extends TypeTestCase $form->bind(' a '); - $this->assertEquals('a', $form->getClientData()); + $this->assertEquals('a', $form->getViewData()); $this->assertEquals('reverse[a]', $form->getData()); } @@ -96,7 +96,7 @@ class FormTypeTest extends TypeTestCase $form->bind(' a '); - $this->assertEquals(' a ', $form->getClientData()); + $this->assertEquals(' a ', $form->getViewData()); $this->assertEquals('reverse[ a ]', $form->getData()); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php index 705d4d104a..435749a16b 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php @@ -20,6 +20,6 @@ class IntegerTypeTest extends LocalizedTestCase $form->bind('1.678'); $this->assertSame(1, $form->getData()); - $this->assertSame('1', $form->getClientData()); + $this->assertSame('1', $form->getViewData()); } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php index eeb1c6b0ba..b324a49150 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php @@ -93,10 +93,10 @@ class RepeatedTypeTest extends TypeTestCase $this->form->bind($input); - $this->assertEquals('foo', $this->form['first']->getClientData()); - $this->assertEquals('bar', $this->form['second']->getClientData()); + $this->assertEquals('foo', $this->form['first']->getViewData()); + $this->assertEquals('bar', $this->form['second']->getViewData()); $this->assertFalse($this->form->isSynchronized()); - $this->assertEquals($input, $this->form->getClientData()); + $this->assertEquals($input, $this->form->getViewData()); $this->assertNull($this->form->getData()); } @@ -106,10 +106,10 @@ class RepeatedTypeTest extends TypeTestCase $this->form->bind($input); - $this->assertEquals('foo', $this->form['first']->getClientData()); - $this->assertEquals('foo', $this->form['second']->getClientData()); + $this->assertEquals('foo', $this->form['first']->getViewData()); + $this->assertEquals('foo', $this->form['second']->getViewData()); $this->assertTrue($this->form->isSynchronized()); - $this->assertEquals($input, $this->form->getClientData()); + $this->assertEquals($input, $this->form->getViewData()); $this->assertEquals('foo', $this->form->getData()); } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php index a686cc3bc3..68cb8cfd7c 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php @@ -33,7 +33,7 @@ class TimeTypeTest extends LocalizedTestCase $dateTime = new \DateTime('1970-01-01 03:04:00 UTC'); $this->assertEquals($dateTime, $form->getData()); - $this->assertEquals($input, $form->getClientData()); + $this->assertEquals($input, $form->getViewData()); } public function testSubmit_string() @@ -52,7 +52,7 @@ class TimeTypeTest extends LocalizedTestCase $form->bind($input); $this->assertEquals('03:04:00', $form->getData()); - $this->assertEquals($input, $form->getClientData()); + $this->assertEquals($input, $form->getViewData()); } public function testSubmit_timestamp() @@ -73,7 +73,7 @@ class TimeTypeTest extends LocalizedTestCase $dateTime = new \DateTime('1970-01-01 03:04:00 UTC'); $this->assertEquals($dateTime->format('U'), $form->getData()); - $this->assertEquals($input, $form->getClientData()); + $this->assertEquals($input, $form->getViewData()); } public function testSubmit_array() @@ -92,7 +92,7 @@ class TimeTypeTest extends LocalizedTestCase $form->bind($input); $this->assertEquals($input, $form->getData()); - $this->assertEquals($input, $form->getClientData()); + $this->assertEquals($input, $form->getViewData()); } public function testSubmit_datetimeSingleText() @@ -107,7 +107,7 @@ class TimeTypeTest extends LocalizedTestCase $form->bind('03:04:05'); $this->assertEquals(new \DateTime('03:04:00 UTC'), $form->getData()); - $this->assertEquals('03:04', $form->getClientData()); + $this->assertEquals('03:04', $form->getViewData()); } public function testSubmit_arraySingleText() @@ -127,7 +127,7 @@ class TimeTypeTest extends LocalizedTestCase $form->bind('03:04'); $this->assertEquals($data, $form->getData()); - $this->assertEquals('03:04', $form->getClientData()); + $this->assertEquals('03:04', $form->getViewData()); } public function testSubmit_arraySingleTextWithSeconds() @@ -149,7 +149,7 @@ class TimeTypeTest extends LocalizedTestCase $form->bind('03:04:05'); $this->assertEquals($data, $form->getData()); - $this->assertEquals('03:04:05', $form->getClientData()); + $this->assertEquals('03:04:05', $form->getViewData()); } public function testSubmit_stringSingleText() @@ -164,7 +164,7 @@ class TimeTypeTest extends LocalizedTestCase $form->bind('03:04:05'); $this->assertEquals('03:04:00', $form->getData()); - $this->assertEquals('03:04', $form->getClientData()); + $this->assertEquals('03:04', $form->getViewData()); } public function testSetData_withSeconds() @@ -178,7 +178,7 @@ class TimeTypeTest extends LocalizedTestCase $form->setData(new \DateTime('03:04:05 UTC')); - $this->assertEquals(array('hour' => 3, 'minute' => 4, 'second' => 5), $form->getClientData()); + $this->assertEquals(array('hour' => 3, 'minute' => 4, 'second' => 5), $form->getViewData()); } public function testSetData_differentTimezones() @@ -204,7 +204,7 @@ class TimeTypeTest extends LocalizedTestCase 'second' => (int)$outputTime->format('s') ); - $this->assertEquals($displayedData, $form->getClientData()); + $this->assertEquals($displayedData, $form->getViewData()); } public function testSetData_differentTimezonesDateTime() @@ -231,7 +231,7 @@ class TimeTypeTest extends LocalizedTestCase ); $this->assertDateTimeEquals($dateTime, $form->getData()); - $this->assertEquals($displayedData, $form->getClientData()); + $this->assertEquals($displayedData, $form->getViewData()); } public function testHoursOption() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php index 28730d5a44..a2b107f90c 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php @@ -20,7 +20,7 @@ class UrlTypeTest extends LocalizedTestCase $form->bind('www.domain.com'); $this->assertSame('http://www.domain.com', $form->getData()); - $this->assertSame('http://www.domain.com', $form->getClientData()); + $this->assertSame('http://www.domain.com', $form->getViewData()); } public function testSubmitAddsNoDefaultProtocolIfAlreadyIncluded() @@ -32,7 +32,7 @@ class UrlTypeTest extends LocalizedTestCase $form->bind('ftp://www.domain.com'); $this->assertSame('ftp://www.domain.com', $form->getData()); - $this->assertSame('ftp://www.domain.com', $form->getClientData()); + $this->assertSame('ftp://www.domain.com', $form->getViewData()); } public function testSubmitAddsNoDefaultProtocolIfEmpty() @@ -44,7 +44,7 @@ class UrlTypeTest extends LocalizedTestCase $form->bind(''); $this->assertSame('', $form->getData()); - $this->assertSame('', $form->getClientData()); + $this->assertSame('', $form->getViewData()); } public function testSubmitAddsNoDefaultProtocolIfSetToNull() @@ -56,6 +56,6 @@ class UrlTypeTest extends LocalizedTestCase $form->bind('www.domain.com'); $this->assertSame('www.domain.com', $form->getData()); - $this->assertSame('www.domain.com', $form->getClientData()); + $this->assertSame('www.domain.com', $form->getViewData()); } } diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php b/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php index 545d7283bd..60f9ffdfb6 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php +++ b/src/Symfony/Component/Form/Tests/Fixtures/FixedFilterListener.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Form\Tests\Fixtures; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Form\Event\FilterDataEvent; +use Symfony\Component\Form\FormEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class FixedFilterListener implements EventSubscriberInterface @@ -22,45 +22,45 @@ class FixedFilterListener implements EventSubscriberInterface public function __construct(array $mapping) { $this->mapping = array_merge(array( - 'onBindClientData' => array(), - 'onBindNormData' => array(), - 'onSetData' => array(), + 'preBind' => array(), + 'onBind' => array(), + 'preSetData' => array(), ), $mapping); } - public function onBindClientData(FilterDataEvent $event) + public function preBind(FormEvent $event) { $data = $event->getData(); - if (isset($this->mapping['onBindClientData'][$data])) { - $event->setData($this->mapping['onBindClientData'][$data]); + if (isset($this->mapping['preBind'][$data])) { + $event->setData($this->mapping['preBind'][$data]); } } - public function onBindNormData(FilterDataEvent $event) + public function onBind(FormEvent $event) { $data = $event->getData(); - if (isset($this->mapping['onBindNormData'][$data])) { - $event->setData($this->mapping['onBindNormData'][$data]); + if (isset($this->mapping['onBind'][$data])) { + $event->setData($this->mapping['onBind'][$data]); } } - public function onSetData(FilterDataEvent $event) + public function preSetData(FormEvent $event) { $data = $event->getData(); - if (isset($this->mapping['onSetData'][$data])) { - $event->setData($this->mapping['onSetData'][$data]); + if (isset($this->mapping['preSetData'][$data])) { + $event->setData($this->mapping['preSetData'][$data]); } } public static function getSubscribedEvents() { return array( - FormEvents::BIND_CLIENT_DATA => 'onBindClientData', - FormEvents::BIND_NORM_DATA => 'onBindNormData', - FormEvents::SET_DATA => 'onSetData', + FormEvents::PRE_BIND => 'preBind', + FormEvents::BIND => 'onBind', + FormEvents::PRE_SET_DATA => 'preSetData', ); } } diff --git a/src/Symfony/Component/Form/Tests/FormTest.php b/src/Symfony/Component/Form/Tests/FormTest.php index 4956728aeb..f0fb10e2b0 100644 --- a/src/Symfony/Component/Form/Tests/FormTest.php +++ b/src/Symfony/Component/Form/Tests/FormTest.php @@ -55,16 +55,16 @@ class FormTest extends \PHPUnit_Framework_TestCase public function testDataIsInitializedEmpty() { - $norm = new FixedDataTransformer(array( + $model = new FixedDataTransformer(array( '' => 'foo', )); - $client = new FixedDataTransformer(array( + $view = new FixedDataTransformer(array( 'foo' => 'bar', )); $config = new FormConfig('name', null, $this->dispatcher); - $config->addViewTransformer($client); - $config->appendNormTransformer($norm); + $config->addViewTransformer($view); + $config->addModelTransformer($model); $form = new Form($config); $this->assertNull($form->getData()); @@ -488,11 +488,11 @@ class FormTest extends \PHPUnit_Framework_TestCase // use real event dispatcher now $form = $this->getBuilder('name', new EventDispatcher()) ->addEventSubscriber(new FixedFilterListener(array( - 'onSetData' => array( + 'preSetData' => array( 'app' => 'filtered', ), ))) - ->appendNormTransformer(new FixedDataTransformer(array( + ->addModelTransformer(new FixedDataTransformer(array( '' => '', 'filtered' => 'norm', ))) @@ -506,10 +506,10 @@ class FormTest extends \PHPUnit_Framework_TestCase $this->assertEquals('filtered', $form->getData()); $this->assertEquals('norm', $form->getNormData()); - $this->assertEquals('client', $form->getClientData()); + $this->assertEquals('client', $form->getViewData()); } - public function testSetDataExecutesClientTransformersInOrder() + public function testSetDataExecutesViewTransformersInOrder() { $form = $this->getBuilder() ->addViewTransformer(new FixedDataTransformer(array( @@ -524,20 +524,20 @@ class FormTest extends \PHPUnit_Framework_TestCase $form->setData('first'); - $this->assertEquals('third', $form->getClientData()); + $this->assertEquals('third', $form->getViewData()); } - public function testSetDataExecutesNormTransformersInOrder() + public function testSetDataExecutesModelTransformersInReverseOrder() { $form = $this->getBuilder() - ->appendNormTransformer(new FixedDataTransformer(array( - '' => '', - 'first' => 'second', - ))) - ->appendNormTransformer(new FixedDataTransformer(array( + ->addModelTransformer(new FixedDataTransformer(array( '' => '', 'second' => 'third', ))) + ->addModelTransformer(new FixedDataTransformer(array( + '' => '', + 'first' => 'second', + ))) ->getForm(); $form->setData('first'); @@ -564,10 +564,10 @@ class FormTest extends \PHPUnit_Framework_TestCase * Data in client format should, if possible, always be a string to * facilitate differentiation between '0' and '' */ - public function testSetDataConvertsScalarToStringIfOnlyNormTransformer() + public function testSetDataConvertsScalarToStringIfOnlyModelTransformer() { $form = $this->getBuilder() - ->appendNormTransformer(new FixedDataTransformer(array( + ->addModelTransformer(new FixedDataTransformer(array( '' => '', 1 => 23, ))) @@ -577,7 +577,7 @@ class FormTest extends \PHPUnit_Framework_TestCase $this->assertSame(1, $form->getData()); $this->assertSame(23, $form->getNormData()); - $this->assertSame('23', $form->getClientData()); + $this->assertSame('23', $form->getViewData()); } /* @@ -611,10 +611,10 @@ class FormTest extends \PHPUnit_Framework_TestCase // use real event dispatcher now $form = $this->getBuilder('name', new EventDispatcher()) ->addEventSubscriber(new FixedFilterListener(array( - 'onBindClientData' => array( + 'preBind' => array( 'client' => 'filteredclient', ), - 'onBindNormData' => array( + 'onBind' => array( 'norm' => 'filterednorm', ), ))) @@ -624,7 +624,7 @@ class FormTest extends \PHPUnit_Framework_TestCase 'norm' => 'filteredclient', 'filterednorm' => 'cleanedclient' ))) - ->appendNormTransformer(new FixedDataTransformer(array( + ->addModelTransformer(new FixedDataTransformer(array( '' => '', // direction is reversed! 'app' => 'filterednorm', @@ -635,10 +635,10 @@ class FormTest extends \PHPUnit_Framework_TestCase $this->assertEquals('app', $form->getData()); $this->assertEquals('filterednorm', $form->getNormData()); - $this->assertEquals('cleanedclient', $form->getClientData()); + $this->assertEquals('cleanedclient', $form->getViewData()); } - public function testBindExecutesClientTransformersInReverseOrder() + public function testBindExecutesViewTransformersInReverseOrder() { $form = $this->getBuilder() ->addViewTransformer(new FixedDataTransformer(array( @@ -656,17 +656,17 @@ class FormTest extends \PHPUnit_Framework_TestCase $this->assertEquals('third', $form->getNormData()); } - public function testBindExecutesNormTransformersInReverseOrder() + public function testBindExecutesModelTransformersInOrder() { $form = $this->getBuilder() - ->appendNormTransformer(new FixedDataTransformer(array( - '' => '', - 'third' => 'second', - ))) - ->appendNormTransformer(new FixedDataTransformer(array( + ->addModelTransformer(new FixedDataTransformer(array( '' => '', 'second' => 'first', ))) + ->addModelTransformer(new FixedDataTransformer(array( + '' => '', + 'third' => 'second', + ))) ->getForm(); $form->bind('first');