RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #569 from Ocramius/hotfix/pre-flush-event-args-params

Browse Source 
Hotfix/pre flush event args params
This commit is contained in:
Fabio B. Silva 2013-02-12 15:39:40 -08:00
commit 719031f2ef
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Event/OnClearEventArgs.php
View File

@ -19,6 +19,8 @@
namespace Doctrine\ORM\Event;
use Doctrine\ORM\EntityManager;
/**
* Provides event arguments for the onClear event.
*
@ -46,7 +48,7 @@ class OnClearEventArgs extends \Doctrine\Common\EventArgs
* @param \Doctrine\ORM\EntityManager $em
* @param string|null $entityClass Optional entity class.
*/
public function __construct($em, $entityClass = null)
public function __construct(EntityManager $em, $entityClass = null)
{
$this->em = $em;
$this->entityClass = $entityClass;

3
lib/Doctrine/ORM/Event/OnFlushEventArgs.php
View File

@ -19,6 +19,7 @@
namespace Doctrine\ORM\Event;
use Doctrine\Common\EventArgs;
use Doctrine\ORM\EntityManager;
/**
@ -30,7 +31,7 @@ use Doctrine\ORM\EntityManager;
* @author Roman Borschel <roman@code-factory.de>
* @author Benjamin Eberlei <kontakt@beberlei.de>
*/
class OnFlushEventArgs extends \Doctrine\Common\EventArgs
class OnFlushEventArgs extends EventArgs
{
/**
* @var \Doctrine\ORM\EntityManager

13
lib/Doctrine/ORM/Event/PreFlushEventArgs.php
View File

@ -19,6 +19,9 @@
namespace Doctrine\ORM\Event;
use Doctrine\Common\EventArgs;
use Doctrine\ORM\EntityManager;
/**
* Provides event arguments for the preFlush event.
*
@ -28,21 +31,21 @@ namespace Doctrine\ORM\Event;
* @author Roman Borschel <roman@code-factory.de>
* @author Benjamin Eberlei <kontakt@beberlei.de>
*/
class PreFlushEventArgs extends \Doctrine\Common\EventArgs
class PreFlushEventArgs extends EventArgs
{
/**
* @var \Doctrine\ORM\EntityManager
*/
private $_em;
private $em;
/**
* Constructor.
*
* @param \Doctrine\ORM\EntityManager $em
*/
public function __construct($em)
public function __construct(EntityManager $em)
{
$this->_em = $em;
$this->em = $em;
}
/**
@ -50,6 +53,6 @@ class PreFlushEventArgs extends \Doctrine\Common\EventArgs
*/
public function getEntityManager()
{
return $this->_em;
return $this->em;
}
}

2
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -524,7 +524,7 @@ class UnitOfWork implements PropertyChangedListener
$invoke = $this->listenersInvoker->getSubscribedSystems($class, Events::preFlush);
if ($invoke !== ListenersInvoker::INVOKE_NONE) {
$this->listenersInvoker->invoke($class, Events::preFlush, $entity, new PreFlushEventArgs($entity, $this->em), $invoke);
$this->listenersInvoker->invoke($class, Events::preFlush, $entity, new PreFlushEventArgs($this->em), $invoke);
}
$actualData = array();