[DDC-3287] Change parent classes of some Events

lib/Doctrine/ORM/Event/OnClearEventArgs.php

@@ -30,7 +30,7 @@
  * @author      Roman Borschel <[email protected]>
  * @author      Benjamin Eberlei <[email protected]>
  */
-class OnClearEventArgs extends \Doctrine\Common\EventArgs
+class OnClearEventArgs extends \Doctrine\Common\Persistence\Event\OnClearEventArgs
 {
     /**
      * @var \Doctrine\ORM\EntityManager

lib/Doctrine/ORM/Event/PreUpdateEventArgs.php

@@ -29,109 +29,25 @@
  * @author Benjamin Eberlei <[email protected]>
  * @since  2.0
  */
-class PreUpdateEventArgs extends LifecycleEventArgs
+class PreUpdateEventArgs extends \Doctrine\Common\Persistence\Event\PreUpdateEventArgs
 {
     /**
-     * @var array
-     */
-    private $entityChangeSet;
-
-    /**
-     * Constructor.
-     *
-     * @param object        $entity
-     * @param EntityManager $em
-     * @param array         $changeSet
-     */
-    public function __construct($entity, EntityManager $em, array &$changeSet)
-    {
-        parent::__construct($entity, $em);
-
-        $this->entityChangeSet = &$changeSet;
-    }
-
-    /**
-     * Retrieves entity changeset.
-     *
-     * @return array
-     */
-    public function getEntityChangeSet()
-    {
-        return $this->entityChangeSet;
-    }
-
-    /**
-     * Checks if field has a changeset.
-     *
-     * @param string $field
+     * Retrieves associated Entity.
      *
-     * @return boolean
+     * @return object
      */
-    public function hasChangedField($field)
+    public function getEntity()
     {
-        return isset($this->entityChangeSet[$field]);
+    	return $this->getObject();
     }
 
     /**
-     * Gets the old value of the changeset of the changed field.
-     *
-     * @param string $field
-     *
-     * @return mixed
-     */
-    public function getOldValue($field)
-    {
-        $this->assertValidField($field);
-
-        return $this->entityChangeSet[$field][0];
-    }
-
-    /**
-     * Gets the new value of the changeset of the changed field.
-     *
-     * @param string $field
-     *
-     * @return mixed
-     */
-    public function getNewValue($field)
-    {
-        $this->assertValidField($field);
-
-        return $this->entityChangeSet[$field][1];
-    }
-
-    /**
-     * Sets the new value of this field.
-     *
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return void
-     */
-    public function setNewValue($field, $value)
-    {
-        $this->assertValidField($field);
-
-        $this->entityChangeSet[$field][1] = $value;
-    }
-
-    /**
-     * Asserts the field exists in changeset.
-     *
-     * @param string $field
-     *
-     * @return void
+     * Retrieves associated EntityManager.
      *
-     * @throws \InvalidArgumentException
+     * @return \Doctrine\ORM\EntityManager
      */
-    private function assertValidField($field)
+    public function getEntityManager()
     {
-        if ( ! isset($this->entityChangeSet[$field])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.',
-                $field,
-                get_class($this->getEntity())
-            ));
-        }
+    	return $this->getObjectManager();
     }
 }