[Form] Renamed events to match terminology in Field

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

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

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

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

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

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

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

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

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

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

src/Symfony/Component/Form/Events.php

@@ -24,9 +24,9 @@ final class Events
 
     const postSetData = 'postSetData';
 
-    const filterBoundDataFromClient = 'filterBoundDataFromClient';
+    const filterBoundClientData = 'filterBoundClientData';
 
-    const filterBoundData = 'filterBoundData';
+    const filterBoundNormData = 'filterBoundNormData';
 
     const filterSetData = 'filterSetData';
 }

src/Symfony/Component/Form/Field.php

@@ -244,7 +244,7 @@ class Field implements FieldInterface
 
         // Hook to change content of the data bound by the browser
         $event = new FilterDataEvent($this, $clientData);
-        $this->dispatcher->dispatch(Events::filterBoundDataFromClient, $event);
+        $this->dispatcher->dispatch(Events::filterBoundClientData, $event);
         $clientData = $event->getData();
 
         try {
@@ -259,7 +259,7 @@ class Field implements FieldInterface
             // Hook to change content of the data in the normalized
             // representation
             $event = new FilterDataEvent($this, $normData);
-            $this->dispatcher->dispatch(Events::filterBoundData, $event);
+            $this->dispatcher->dispatch(Events::filterBoundNormData, $event);
             $normData = $event->getData();
 
             // Synchronize representations - must not change the content!

src/Symfony/Component/Form/Form.php

@@ -71,7 +71,7 @@ class Form extends Field implements \IteratorAggregate, FormInterface
             Events::postSetData,
             Events::preBind,
             Events::filterSetData,
-            Events::filterBoundDataFromClient,
+            Events::filterBoundClientData,
         ), $this);
 
         $this->dataMapper = $dataMapper;
@@ -160,7 +160,7 @@ class Form extends Field implements \IteratorAggregate, FormInterface
         }
     }
 
-    public function filterBoundDataFromClient(FilterDataEvent $event)
+    public function filterBoundClientData(FilterDataEvent $event)
     {
         $data = $event->getData();
 

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

@@ -214,12 +214,12 @@ class FieldTest extends TestCase
     public function testBoundDataIsTransformedCorrectly()
     {
         $filter = new FixedFilterListener(array(
-            'filterBoundDataFromClient' => array(
+            'filterBoundClientData' => array(
                 // 1. The value is converted to a string and passed to the
                 //    first filter
                 '0' => 'filter1[0]',
             ),
-            'filterBoundData' => array(
+            'filterBoundNormData' => array(
                 // 3. The normalized value is passed to the second filter
                 'norm[filter1[0]]' => 'filter2[norm[filter1[0]]]',
             ),

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

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