forked from doctrine/orm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for BC break doctrine#7366 when calling EM::find() with LockMode:…
…:OPTIMISTIC outside of a TX
- Loading branch information
Showing
2 changed files
with
78 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Doctrine\Tests\ORM\Functional\Ticket; | ||
|
||
use Doctrine\DBAL\LockMode; | ||
use Doctrine\ORM\TransactionRequiredException; | ||
use Doctrine\Tests\OrmFunctionalTestCase; | ||
|
||
final class GH7366Test extends OrmFunctionalTestCase | ||
{ | ||
/** | ||
* {@inheritDoc} | ||
*/ | ||
protected function setUp() : void | ||
{ | ||
parent::setUp(); | ||
|
||
$this->setUpEntitySchema( | ||
[ | ||
GH7366Entity::class, | ||
] | ||
); | ||
|
||
$this->_em->persist(new GH7366Entity('baz')); | ||
$this->_em->flush(); | ||
$this->_em->clear(); | ||
} | ||
|
||
public function testOptimisticLockNoExceptionOnFind() : void | ||
{ | ||
try { | ||
$entity = $this->_em->find(GH7366Entity::class, 1, LockMode::OPTIMISTIC); | ||
} catch (TransactionRequiredException $e) { | ||
self::fail('EntityManager::find() threw TransactionRequiredException with LockMode::OPTIMISTIC'); | ||
} | ||
self::assertEquals('baz', $entity->getName()); | ||
} | ||
} | ||
|
||
/** | ||
* @Entity | ||
*/ | ||
class GH7366Entity | ||
{ | ||
/** | ||
* @Id | ||
* @Column(type="integer") | ||
* @GeneratedValue | ||
* @var int | ||
*/ | ||
public $id; | ||
|
||
/** | ||
* @Column(type="integer") | ||
* @Version | ||
*/ | ||
protected $lockVersion = 1; | ||
|
||
/** | ||
* @Column(length=32) | ||
* @var string | ||
*/ | ||
protected $name; | ||
|
||
|
||
public function __construct(string $name) | ||
{ | ||
$this->name = $name; | ||
} | ||
|
||
public function getName() : string | ||
{ | ||
return $this->name; | ||
} | ||
} |