RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixed lifecycle callback mapping.

Browse source
This commit is contained in:
romanb 2009-08-25 09:14:08 +00:00
parent 356887c893
commit 8523648a27
5 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doctrine-mapping.xsd
View file

@ -33,7 +33,7 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="lifecycle-listener-type"> <xs:simpleType name="lifecycle-callback-type">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:enumeration value="prePersist"/> <xs:enumeration value="prePersist"/>
<xs:enumeration value="postPersist"/> <xs:enumeration value="postPersist"/>
@ -45,14 +45,14 @@
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:complexType name="lifecycle-listener"> <xs:complexType name="lifecycle-callback">
<xs:attribute name="type" type="orm:lifecycle-listener-type" use="required" /> <xs:attribute name="type" type="orm:lifecycle-callback-type" use="required" />
<xs:attribute name="method" type="xs:NMTOKEN" use="required" /> <xs:attribute name="method" type="xs:NMTOKEN" use="required" />
</xs:complexType> </xs:complexType>
<xs:complexType name="lifecycle-listener"> <xs:complexType name="lifecycle-callbacks">
<xs:sequence> <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:sequence>
</xs:complexType> </xs:complexType>

10
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View file

@ -275,12 +275,12 @@ class XmlDriver extends AbstractFileDriver
} }
} }
// Evaluate <lifecycle-listener...> // Evaluate <lifecycle-callbacks...>
if (isset($xmlRoot->{'lifecycle-listener'})) { if (isset($xmlRoot->{'lifecycle-callbacks'})) {
foreach ($xmlRoot->{'lifecycle-listener'} as $lifecycleListener) { foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
$method = $class->getMethod((string)$lifecycleListener['method']); $method = $class->getMethod((string)$lifecycleCallback['method']);
if ($method->isPublic()) { 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']));
} }
} }
} }

8
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View file

@ -266,12 +266,12 @@ class YamlDriver extends AbstractFileDriver
} }
} }
// Evaluate lifeCycleListener // Evaluate lifeCycleCallbacks
if (isset($element['lifecycleListeners'])) { if (isset($element['lifecycleCallbacks'])) {
foreach ($element['lifecycleListeners'] as $method => $type) { foreach ($element['lifecycleCallbacks'] as $method => $type) {
$method = $class->getMethod($method); $method = $class->getMethod($method);
if ($method->isPublic()) { if ($method->isPublic()) {
$metadata->addLifecycleCallback($method->getName(), constant('\Doctrine\ORM\Events::'.$type)); $metadata->addLifecycleCallback($method->getName(), constant('\Doctrine\ORM\Events::' . $type));
} }
} }
} }

8
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
View file

@ -6,9 +6,11 @@
/Users/robo/dev/php/Doctrine/doctrine-mapping.xsd"> /Users/robo/dev/php/Doctrine/doctrine-mapping.xsd">
<entity name="Doctrine\Tests\ORM\Mapping\User" table="cms_users"> <entity name="Doctrine\Tests\ORM\Mapping\User" table="cms_users">
<lifecycle-listener method="doStuffOnPrePersist" type="prePersist" /> <lifecycle-callbacks>
<lifecycle-listener method="doStuffOnPostPersist" type="postPersist" /> <lifecycle-callback type="prePersist" method="doStuffOnPrePersist"/>
<lifecycle-callback type="postPersist" method="doStuffOnPostPersist"/>
</lifecycle-callbacks>
<id name="id" type="integer" column="id"> <id name="id" type="integer" column="id">
<generator strategy="AUTO"/> <generator strategy="AUTO"/>

2
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml
View file

@ -32,6 +32,6 @@ Doctrine\Tests\ORM\Mapping\User:
inverseJoinColumns: inverseJoinColumns:
group_id: group_id:
referencedColumnName: id referencedColumnName: id
lifecycleListeners: lifecycleCallbacks:
doStuffOnPrePersist: prePersist doStuffOnPrePersist: prePersist
doStuffOnPostPersist: postPersist doStuffOnPostPersist: postPersist