From 8523648a27dfb36c471f394de7fb7de00b6f7fb5 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 25 Aug 2009 09:14:08 +0000
Subject: [PATCH] [2.0] Fixed lifecycle callback mapping.

---
 doctrine-mapping.xsd                                   | 10 +++++-----
 lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php          | 10 +++++-----
 lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php         |  8 ++++----
 .../xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml        |  8 +++++---
 .../yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml       |  2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd
index 9a8a2f876..359acd128 100644
--- a/doctrine-mapping.xsd
+++ b/doctrine-mapping.xsd
@@ -33,7 +33,7 @@
     </xs:sequence>
   </xs:complexType>
   
-  <xs:simpleType name="lifecycle-listener-type">
+  <xs:simpleType name="lifecycle-callback-type">
     <xs:restriction base="xs:token">
       <xs:enumeration value="prePersist"/>
       <xs:enumeration value="postPersist"/>
@@ -45,14 +45,14 @@
     </xs:restriction>
   </xs:simpleType>
   
-  <xs:complexType name="lifecycle-listener">
-    <xs:attribute name="type" type="orm:lifecycle-listener-type" use="required" />
+  <xs:complexType name="lifecycle-callback">
+    <xs:attribute name="type" type="orm:lifecycle-callback-type" use="required" />
     <xs:attribute name="method" type="xs:NMTOKEN" use="required" />
   </xs:complexType>
   
-  <xs:complexType name="lifecycle-listener">
+  <xs:complexType name="lifecycle-callbacks">
     <xs:sequence>
-      <xs:element name="lifecycle-listener" type="orm:lifecycle-listener" minOccurs="1" maxOccurs="unbounded" />
+      <xs:element name="lifecycle-callback" type="orm:lifecycle-callback" minOccurs="1" maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
 
diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
index c0251c0ee..cb519523e 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -275,12 +275,12 @@ class XmlDriver extends AbstractFileDriver
             }
         }
 
-        // Evaluate <lifecycle-listener...>
-        if (isset($xmlRoot->{'lifecycle-listener'})) {
-            foreach ($xmlRoot->{'lifecycle-listener'} as $lifecycleListener) {
-                $method = $class->getMethod((string)$lifecycleListener['method']);
+        // Evaluate <lifecycle-callbacks...>
+        if (isset($xmlRoot->{'lifecycle-callbacks'})) {
+            foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
+                $method = $class->getMethod((string)$lifecycleCallback['method']);
                 if ($method->isPublic()) {
-                    $metadata->addLifecycleCallback($method->getName(), constant('\Doctrine\ORM\Events::' . (string)$lifecycleListener['type']));
+                    $metadata->addLifecycleCallback($method->getName(), constant('\Doctrine\ORM\Events::' . (string)$lifecycleCallback['type']));
                 }
             }
         }
diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
index e5c7bde7c..0220ee42f 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -266,12 +266,12 @@ class YamlDriver extends AbstractFileDriver
             }
         }
 
-        // Evaluate lifeCycleListener
-        if (isset($element['lifecycleListeners'])) {
-            foreach ($element['lifecycleListeners'] as $method => $type) {
+        // Evaluate lifeCycleCallbacks
+        if (isset($element['lifecycleCallbacks'])) {
+            foreach ($element['lifecycleCallbacks'] as $method => $type) {
                 $method = $class->getMethod($method);
                 if ($method->isPublic()) {
-                    $metadata->addLifecycleCallback($method->getName(), constant('\Doctrine\ORM\Events::'.$type));
+                    $metadata->addLifecycleCallback($method->getName(), constant('\Doctrine\ORM\Events::' . $type));
                 }
             }
         }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
index c8f32fe70..1568ba917 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
+++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
@@ -6,9 +6,11 @@
                           /Users/robo/dev/php/Doctrine/doctrine-mapping.xsd">
                               
     <entity name="Doctrine\Tests\ORM\Mapping\User" table="cms_users">
-    
-        <lifecycle-listener method="doStuffOnPrePersist" type="prePersist" />
-        <lifecycle-listener method="doStuffOnPostPersist" type="postPersist" />
+        
+        <lifecycle-callbacks>
+            <lifecycle-callback type="prePersist" method="doStuffOnPrePersist"/>
+            <lifecycle-callback type="postPersist" method="doStuffOnPostPersist"/>
+        </lifecycle-callbacks>
 
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml
index 09bc20cc4..8302f30cb 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml
+++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml
@@ -32,6 +32,6 @@ Doctrine\Tests\ORM\Mapping\User:
         inverseJoinColumns:
           group_id:
             referencedColumnName: id
-  lifecycleListeners:
+  lifecycleCallbacks:
     doStuffOnPrePersist: prePersist
     doStuffOnPostPersist: postPersist
\ No newline at end of file