[Form] Renamed 'filter' listeners to 'on' to match naming conventions across the framework

src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php

@@ -27,10 +27,10 @@ class MergeCollectionListener implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-        return Events::filterBoundNormData;
+        return Events::onBindNormData;
     }
 
-    public function filterBoundNormData(FilterDataEvent $event)
+    public function onBindNormData(FilterDataEvent $event)
     {
         $collection = $event->getForm()->getData();
         $data = $event->getData();

src/Symfony/Component/Form/EventListener/FixFileUploadListener.php

@@ -35,10 +35,10 @@ class FixFileUploadListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return Events::filterBoundClientData;
+        return Events::onBindClientData;
     }
 
-    public function filterBoundClientData(FilterDataEvent $event)
+    public function onBindClientData(FilterDataEvent $event)
     {
         $form = $event->getForm();
 

src/Symfony/Component/Form/EventListener/FixRadioInputListener.php

@@ -24,7 +24,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class FixRadioInputListener implements EventSubscriberInterface
 {
-    public function filterBoundClientData(FilterDataEvent $event)
+    public function onBindClientData(FilterDataEvent $event)
     {
         $data = $event->getData();
 
@@ -33,6 +33,6 @@ class FixRadioInputListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return Events::filterBoundClientData;
+        return Events::onBindClientData;
     }
 }

src/Symfony/Component/Form/EventListener/FixUrlProtocolListener.php

@@ -30,7 +30,7 @@ class FixUrlProtocolListener implements EventSubscriberInterface
         $this->defaultProtocol = $defaultProtocol;
     }
 
-    public function filterBoundNormData(FilterDataEvent $event)
+    public function onBindNormData(FilterDataEvent $event)
     {
         $data = $event->getData();
 
@@ -41,6 +41,6 @@ class FixUrlProtocolListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return Events::filterBoundNormData;
+        return Events::onBindNormData;
     }
 }

src/Symfony/Component/Form/EventListener/ResizeFormListener.php

@@ -53,7 +53,7 @@ class ResizeFormListener implements EventSubscriberInterface
         return array(
             Events::preSetData,
             Events::preBind,
-            Events::filterBoundNormData,
+            Events::onBindNormData,
         );
     }
 
@@ -111,7 +111,7 @@ class ResizeFormListener implements EventSubscriberInterface
         }
     }
 
-    public function filterBoundNormData(FilterDataEvent $event)
+    public function onBindNormData(FilterDataEvent $event)
     {
         if (!$this->resizeOnBind) {
             return;

src/Symfony/Component/Form/EventListener/StripTagsListener.php

@@ -22,13 +22,13 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class StripTagsListener implements EventSubscriberInterface
 {
-    public function filterBoundClientData(FilterDataEvent $event)
+    public function onBindClientData(FilterDataEvent $event)
     {
         $event->setData(strip_tags($event->getData()));
     }
 
     public static function getSubscribedEvents()
     {
-        return Events::filterBoundDataFromClient;
+        return Events::onBindDataFromClient;
     }
 }

src/Symfony/Component/Form/EventListener/TrimListener.php

@@ -22,7 +22,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class TrimListener implements EventSubscriberInterface
 {
-    public function filterBoundClientData(FilterDataEvent $event)
+    public function onBindClientData(FilterDataEvent $event)
     {
         $data = $event->getData();
 
@@ -33,6 +33,6 @@ class TrimListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return Events::filterBoundClientData;
+        return Events::onBindClientData;
     }
 }

src/Symfony/Component/Form/Events.php

@@ -24,9 +24,9 @@ final class Events
 
     const postSetData = 'postSetData';
 
-    const filterBoundClientData = 'filterBoundClientData';
+    const onBindClientData = 'onBindClientData';
 
-    const filterBoundNormData = 'filterBoundNormData';
+    const onBindNormData = 'onBindNormData';
 
-    const filterSetData = 'filterSetData';
+    const onSetData = 'onSetData';
 }

src/Symfony/Component/Form/Form.php

@@ -361,7 +361,7 @@ class Form implements \IteratorAggregate, FormInterface
 
         // Hook to change content of the data
         $event = new FilterDataEvent($this, $appData);
-        $this->dispatcher->dispatch(Events::filterSetData, $event);
+        $this->dispatcher->dispatch(Events::onSetData, $event);
         $appData = $event->getData();
 
         // Treat data as strings unless a value transformer exists
@@ -418,7 +418,7 @@ class Form implements \IteratorAggregate, FormInterface
 
         // Hook to change content of the data bound by the browser
         $event = new FilterDataEvent($this, $clientData);
-        $this->dispatcher->dispatch(Events::filterBoundClientData, $event);
+        $this->dispatcher->dispatch(Events::onBindClientData, $event);
         $clientData = $event->getData();
 
         if (count($this->children) > 0) {
@@ -475,7 +475,7 @@ class Form implements \IteratorAggregate, FormInterface
             // Hook to change content of the data in the normalized
             // representation
             $event = new FilterDataEvent($this, $normData);
-            $this->dispatcher->dispatch(Events::filterBoundNormData, $event);
+            $this->dispatcher->dispatch(Events::onBindNormData, $event);
             $normData = $event->getData();
 
             // Synchronize representations - must not change the content!

tests/Symfony/Tests/Component/Form/EventListener/FixUrlProtocolListenerTest.php

@@ -23,7 +23,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
         $event = new FilterDataEvent($form, $data);
 
         $filter = new FixUrlProtocolListener('http');
-        $filter->filterBoundNormData($event);
+        $filter->onBindNormData($event);
 
         $this->assertEquals('http://www.symfony.com', $event->getData());
     }
@@ -35,7 +35,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
         $event = new FilterDataEvent($form, $data);
 
         $filter = new FixUrlProtocolListener('http');
-        $filter->filterBoundNormData($event);
+        $filter->onBindNormData($event);
 
         $this->assertEquals('http://www.symfony.com', $event->getData());
     }
@@ -47,7 +47,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
         $event = new FilterDataEvent($form, $data);
 
         $filter = new FixUrlProtocolListener('http');
-        $filter->filterBoundNormData($event);
+        $filter->onBindNormData($event);
 
         $this->assertEquals('ftp://www.symfony.com', $event->getData());
     }

tests/Symfony/Tests/Component/Form/EventListener/StripTagsListenerTest.php

@@ -23,7 +23,7 @@ class StripTagsListenerTest extends \PHPUnit_Framework_TestCase
         $event = new FilterDataEvent($form, $data);
 
         $filter = new StripTagsListener();
-        $filter->filterBoundClientData($event);
+        $filter->onBindClientData($event);
 
         $this->assertEquals('Foo!Bar!Baz!', $event->getData());
     }

tests/Symfony/Tests/Component/Form/EventListener/TrimListenerTest.php

@@ -23,7 +23,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
         $event = new FilterDataEvent($form, $data);
 
         $filter = new TrimListener();
-        $filter->filterBoundClientData($event);
+        $filter->onBindClientData($event);
 
         $this->assertEquals('Foo!', $event->getData());
     }
@@ -35,7 +35,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
         $event = new FilterDataEvent($form, $data);
 
         $filter = new TrimListener();
-        $filter->filterBoundClientData($event);
+        $filter->onBindClientData($event);
 
         $this->assertSame(1234, $event->getData());
     }

tests/Symfony/Tests/Component/Form/Fixtures/FixedFilterListener.php

@@ -13,45 +13,45 @@ class FixedFilterListener implements EventSubscriberInterface
     public function __construct(array $mapping)
     {
         $this->mapping = array_merge(array(
-            'filterBoundClientData' => array(),
-            'filterBoundNormData' => array(),
-            'filterSetData' => array(),
+            'onBindClientData' => array(),
+            'onBindNormData' => array(),
+            'onSetData' => array(),
         ), $mapping);
     }
 
-    public function filterBoundClientData(FilterDataEvent $event)
+    public function onBindClientData(FilterDataEvent $event)
     {
         $data = $event->getData();
 
-        if (isset($this->mapping['filterBoundClientData'][$data])) {
-            $event->setData($this->mapping['filterBoundClientData'][$data]);
+        if (isset($this->mapping['onBindClientData'][$data])) {
+            $event->setData($this->mapping['onBindClientData'][$data]);
         }
     }
 
-    public function filterBoundNormData(FilterDataEvent $event)
+    public function onBindNormData(FilterDataEvent $event)
     {
         $data = $event->getData();
 
-        if (isset($this->mapping['filterBoundNormData'][$data])) {
-            $event->setData($this->mapping['filterBoundNormData'][$data]);
+        if (isset($this->mapping['onBindNormData'][$data])) {
+            $event->setData($this->mapping['onBindNormData'][$data]);
         }
     }
 
-    public function filterSetData(FilterDataEvent $event)
+    public function onSetData(FilterDataEvent $event)
     {
         $data = $event->getData();
 
-        if (isset($this->mapping['filterSetData'][$data])) {
-            $event->setData($this->mapping['filterSetData'][$data]);
+        if (isset($this->mapping['onSetData'][$data])) {
+            $event->setData($this->mapping['onSetData'][$data]);
         }
     }
 
     public static function getSubscribedEvents()
     {
         return array(
-            Events::filterBoundClientData,
-            Events::filterBoundNormData,
-            Events::filterSetData,
+            Events::onBindClientData,
+            Events::onBindNormData,
+            Events::onSetData,
         );
     }
 }

tests/Symfony/Tests/Component/Form/FormTest.php

@@ -417,7 +417,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
         // use real event dispatcher now
         $form = $this->getBuilder('name', new EventDispatcher())
             ->addEventSubscriber(new FixedFilterListener(array(
-                'filterSetData' => array(
+                'onSetData' => array(
                     'app' => 'filtered',
                 ),
             )))
@@ -540,10 +540,10 @@ class FormTest extends \PHPUnit_Framework_TestCase
         // use real event dispatcher now
         $form = $this->getBuilder('name', new EventDispatcher())
             ->addEventSubscriber(new FixedFilterListener(array(
-                'filterBoundClientData' => array(
+                'onBindClientData' => array(
                     'client' => 'filteredclient',
                 ),
-                'filterBoundNormData' => array(
+                'onBindNormData' => array(
                     'norm' => 'filterednorm',
                 ),
             )))