Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Partially back out commit from Dec 5 #544

Closed
wants to merge 1 commit into from

4 participants

@hexmode

It works in my instance. No getObject() methods anywhere found on head of doctrine.

@hexmode hexmode partial back out of 8443eee to make
it work in my instance.  No getObject() methods anywhere found on head
of doctrine.
8d70626
@doctrinebot
Collaborator

Hello,

thank you for positing this Pull Request. I have automatically opened an issue on our Jira Bug Tracker for you with the details of this Pull-Request. See the Link:

http://doctrine-project.org/jira/browse/DDC-2216

@stof

This is wrong. You are probably using Doctrine Common 2.3 whereas the dev version of the ORM 2.4 (i.e. the master branch) also requires the dev version of Common 2.4 (i.e. the master branch from Common)

@hexmode

Thanks, Shouldn't composer.phar update the dependencies?

@stof

Well, except the fact that the composer.json is wrong. The requirement still allow 2.3

@beberlei
Owner

Updated composer.json, should be fixed now

@beberlei beberlei closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 28, 2012
  1. @hexmode

    partial back out of 8443eee to make

    hexmode authored
    it work in my instance.  No getObject() methods anywhere found on head
    of doctrine.
This page is out of date. Refresh to see the latest.
Showing with 26 additions and 4 deletions.
  1. +26 −4 lib/Doctrine/ORM/Event/LifecycleEventArgs.php
View
30 lib/Doctrine/ORM/Event/LifecycleEventArgs.php
@@ -19,8 +19,8 @@
namespace Doctrine\ORM\Event;
+use Doctrine\Common\EventArgs;
use Doctrine\ORM\EntityManager;
-use Doctrine\Common\Persistence\Event\LifecycleEventArgs as BaseLifecycleEventArgs;
/**
* Lifecycle Events are triggered by the UnitOfWork during lifecycle transitions
@@ -31,16 +31,38 @@
* @author Roman Borschel <roman@code-factory.de>
* @author Benjamin Eberlei <kontakt@beberlei.de>
*/
-class LifecycleEventArgs extends BaseLifecycleEventArgs
+class LifecycleEventArgs extends EventArgs
{
/**
+ * @var \Doctrine\ORM\EntityManager
+ */
+ private $em;
+
+ /**
+ * @var object
+ */
+ private $entity;
+
+ /**
+ * Constructor.
+ *
+ * @param object $entity
+ * @param EntityManager $em
+ */
+ public function __construct($entity, EntityManager $em)
+ {
+ $this->entity = $entity;
+ $this->em = $em;
+ }
+
+ /**
* Retrieves associated Entity.
*
* @return object
*/
public function getEntity()
{
- return $this->getObject();
+ return $this->entity;
}
/**
@@ -50,6 +72,6 @@ public function getEntity()
*/
public function getEntityManager()
{
- return $this->getObjectManager();
+ return $this->em;
}
}
Something went wrong with that request. Please try again.