Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for BC break in 2.6.2 when calling EM::find() with LockMode::OPTIMISTIC outside of a TX #7367

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/EntityManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ private function checkLockRequirements(int $lockMode, ClassMetadata $class): voi
if (!$class->isVersioned) {
throw OptimisticLockException::notVersioned($class->name);
}
// Intentional fallthrough
break;
case LockMode::PESSIMISTIC_READ:
case LockMode::PESSIMISTIC_WRITE:
if (!$this->getConnection()->isTransactionActive()) {
Expand Down
75 changes: 75 additions & 0 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/GH7366Test.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?php

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;
}
}