RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-1984'

Browse Source
This commit is contained in:
Benjamin Eberlei 2013-05-01 19:39:30 +02:00
commit 7d53cb2aeb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2270,6 +2270,10 @@ class UnitOfWork implements PropertyChangedListener
*/ */
public function lock($entity, $lockMode, $lockVersion = null) public function lock($entity, $lockMode, $lockVersion = null)
{ {
if ($entity === null) {
throw new \InvalidArgumentException("No entity passed to UnitOfWork#lock().");
}
if ($this->getEntityState($entity, self::STATE_DETACHED) != self::STATE_MANAGED) { if ($this->getEntityState($entity, self::STATE_DETACHED) != self::STATE_MANAGED) {
throw ORMInvalidArgumentException::entityNotManaged($entity); throw ORMInvalidArgumentException::entityNotManaged($entity);
} }

9
tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
View File

@ -220,6 +220,15 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase
// This commit should not raise an E_NOTICE // This commit should not raise an E_NOTICE
$this->_unitOfWork->commit(); $this->_unitOfWork->commit();
} }
/**
* @group DDC-1984
*/
public function testLockWithoutEntityThrowsException()
{
$this->setExpectedException('InvalidArgumentException');
$this->_unitOfWork->lock(null, null, null);
}
} }
/** /**