Kaynağa Gözat

removed the ON_ prefix for Form event names

Fabien Potencier 14 yıl önce
ebeveyn
işleme
79e709cdc9

+ 4 - 4
UPDATE.md

@@ -32,9 +32,9 @@ beta3 to beta4
             +FormEvents::POST_BIND = 'form.post_bind'
             +FormEvents::PRE_SET_DATA = 'form.pre_set_data'
             +FormEvents::POST_SET_DATA = 'form.post_set_data'
-            +FormEvents::ON_BIND_CLIENT_DATA = 'form.on_bind_client_data'
-            +FormEvents::ON_BIND_NORM_DATA = 'form.on_bind_norm_data'
-            +FormEvents::ON_SET_DATA = 'form.on_set_data'
+            +FormEvents::BIND_CLIENT_DATA = 'form.bind_client_data'
+            +FormEvents::BIND_NORM_DATA = 'form.bind_norm_data'
+            +FormEvents::SET_DATA = 'form.set_data'
 
         * `Symfony\Component\HttpKernel\Events` to `Symfony\Component\HttpKernel\CoreEvents`
 
@@ -71,7 +71,7 @@ beta3 to beta4
          public static function getSubscribedEvents()
          {
         -    return Events::onBindNormData;
-        +    return array(FormEvents::ON_BIND_NORM_DATA => 'onBindNormData');
+        +    return array(FormEvents::BIND_NORM_DATA => 'onBindNormData');
          }
 
 * Form DateType parameter single-text changed to single_text

+ 1 - 1
src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php

@@ -27,7 +27,7 @@ class MergeCollectionListener implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::ON_BIND_NORM_DATA => 'onBindNormData');
+        return array(FormEvents::BIND_NORM_DATA => 'onBindNormData');
     }
 
     public function onBindNormData(FilterDataEvent $event)

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/FixFileUploadListener.php

@@ -34,7 +34,7 @@ class FixFileUploadListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::ON_BIND_CLIENT_DATA => 'onBindClientData');
+        return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData');
     }
 
     public function onBindClientData(FilterDataEvent $event)

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php

@@ -32,6 +32,6 @@ class FixRadioInputListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::ON_BIND_CLIENT_DATA => 'onBindClientData');
+        return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData');
     }
 }

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php

@@ -40,6 +40,6 @@ class FixUrlProtocolListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::ON_BIND_NORM_DATA => 'onBindNormData');
+        return array(FormEvents::BIND_NORM_DATA => 'onBindNormData');
     }
 }

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php

@@ -66,7 +66,7 @@ class ResizeFormListener implements EventSubscriberInterface
         return array(
             FormEvents::PRE_SET_DATA => 'preSetData',
             FormEvents::PRE_BIND => 'preBind',
-            FormEvents::ON_BIND_NORM_DATA => 'onBindNormData',
+            FormEvents::BIND_NORM_DATA => 'onBindNormData',
         );
     }
 

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php

@@ -33,6 +33,6 @@ class TrimListener implements EventSubscriberInterface
 
     public static function getSubscribedEvents()
     {
-        return array(FormEvents::ON_BIND_CLIENT_DATA => 'onBindClientData');
+        return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData');
     }
 }

+ 3 - 3
src/Symfony/Component/Form/Form.php

@@ -382,7 +382,7 @@ class Form implements \IteratorAggregate, FormInterface
 
         // Hook to change content of the data
         $event = new FilterDataEvent($this, $appData);
-        $this->dispatcher->dispatch(FormEvents::ON_SET_DATA, $event);
+        $this->dispatcher->dispatch(FormEvents::SET_DATA, $event);
         $appData = $event->getData();
 
         // Treat data as strings unless a value transformer exists
@@ -475,7 +475,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(FormEvents::ON_BIND_CLIENT_DATA, $event);
+        $this->dispatcher->dispatch(FormEvents::BIND_CLIENT_DATA, $event);
         $clientData = $event->getData();
 
         if (count($this->children) > 0) {
@@ -532,7 +532,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(FormEvents::ON_BIND_NORM_DATA, $event);
+            $this->dispatcher->dispatch(FormEvents::BIND_NORM_DATA, $event);
             $normData = $event->getData();
 
             // Synchronize representations - must not change the content!

+ 3 - 3
src/Symfony/Component/Form/FormEvents.php

@@ -24,9 +24,9 @@ final class FormEvents
 
     const POST_SET_DATA = 'form.post_set_data';
 
-    const ON_BIND_CLIENT_DATA = 'form.on_bind_client_data';
+    const BIND_CLIENT_DATA = 'form.bind_client_data';
 
-    const ON_BIND_NORM_DATA = 'form.on_bind_norm_data';
+    const BIND_NORM_DATA = 'form.bind_norm_data';
 
-    const ON_SET_DATA = 'form.on_set_data';
+    const SET_DATA = 'form.set_data';
 }

+ 3 - 3
tests/Symfony/Tests/Component/Form/Fixtures/FixedFilterListener.php

@@ -49,9 +49,9 @@ class FixedFilterListener implements EventSubscriberInterface
     public static function getSubscribedEvents()
     {
         return array(
-            FormEvents::ON_BIND_CLIENT_DATA => 'onBindClientData',
-            FormEvents::ON_BIND_NORM_DATA => 'onBindNormData',
-            FormEvents::ON_SET_DATA => 'onSetData',
+            FormEvents::BIND_CLIENT_DATA => 'onBindClientData',
+            FormEvents::BIND_NORM_DATA => 'onBindNormData',
+            FormEvents::SET_DATA => 'onSetData',
         );
     }
 }