[2.0] DDC-412 - Fixed YAML Driver not allowing multiple lifecycle callbacks...

[2.0] DDC-412 - Fixed YAML Driver not allowing multiple lifecycle callbacks per event. Backwards-incompatible change

lib/Doctrine/ORM/Event/PreInsertUpdateEventArgs.php

-<?php
-
-namespace Doctrine\ORM\Event;
-
-use Doctrine\Common\EventArgs;
-
-/**
- * Class that holds event arguments for a preInsert/preUpdate event.
- *
- * @author Roman Borschel <roman@code-factory.org>
- * @since 2.0
- */
-class PreInsertUpdateEventArgs extends EventArgs
-{
-    private $_entity;
-    private $_entityChangeSet;
-
-    public function __construct($entity, array $changeSet)
-    {
-        $this->_entity = $entity;
-        $this->_entityChangeSet = $changeSet;
-    }
-
-    public function getEntity()
-    {
-        return $this->_entity;
-    }
-    
-    public function getEntityChangeSet()
-    {
-    	return $this->_entityChangeSet;
-    }
-}
-

lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php

@@ -380,11 +380,13 @@ class YamlDriver extends AbstractFileDriver
 
         // Evaluate lifeCycleCallbacks
         if (isset($element['lifecycleCallbacks'])) {
-            foreach ($element['lifecycleCallbacks'] as $method => $type) {
+            foreach ($element['lifecycleCallbacks'] as $type => $methods) {
+                foreach ($methods as $method) {
                     $metadata->addLifecycleCallback($method, constant('\Doctrine\ORM\Events::' . $type));
                 }
             }
         }
+    }
 
     /**
      * Constructs a joinColumn mapping array based on the information

tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php

@@ -154,7 +154,18 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
     }
 
     /**
-     * @depends testLifecycleCallbacks
+     * @depends testManyToManyAssociationWithCascadeAll
+     * @param ClassMetadata $class
+     */
+    public function testLifecycleCallbacksSupportMultipleMethodNames($class) {
+        $this->assertEquals(count($class->lifecycleCallbacks['prePersist']), 2);
+        $this->assertEquals($class->lifecycleCallbacks['prePersist'][1], 'doOtherStuffOnPrePersistToo');
+
+        return $class;
+    }
+
+    /**
+     * @depends testLifecycleCallbacksSupportMultipleMethodNames
      * @param ClassMetadata $class
      */
     public function testJoinColumnUniqueAndNullable($class)
@@ -220,6 +231,7 @@ class User
      */
     public $groups;
 
+
     /**
      * @PrePersist
      */
@@ -227,6 +239,12 @@ class User
     {
     }
 
+    /**
+     * @PrePersist
+     */
+    public function doOtherStuffOnPrePersistToo() {
+    }
+
     /**
      * @PostPersist
      */

tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml

@@ -9,6 +9,7 @@
         
         <lifecycle-callbacks>
             <lifecycle-callback type="prePersist" method="doStuffOnPrePersist"/>
+            <lifecycle-callback type="prePersist" method="doOtherStuffOnPrePersistToo"/>
             <lifecycle-callback type="postPersist" method="doStuffOnPostPersist"/>
         </lifecycle-callbacks>
 

tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml

@@ -47,5 +47,5 @@ Doctrine\Tests\ORM\Mapping\User:
       cascade:
         - all
   lifecycleCallbacks:
-    doStuffOnPrePersist: prePersist
-    doStuffOnPostPersist: postPersist
\ No newline at end of file
+    prePersist: [ doStuffOnPrePersist, doOtherStuffOnPrePersistToo ] 
+    postPersist: [ doStuffOnPostPersist ] 
\ No newline at end of file