From 8cec92a1e7e3549972dfa75f7c36ca5710975ce1 Mon Sep 17 00:00:00 2001
From: Tim Lieberman <tim@timdev.com>
Date: Wed, 22 Aug 2018 11:49:47 -0700
Subject: [PATCH] Fix for BC break #7366 when calling EM::find() with
 LockMode::OPTIMISTIC outside of a TX

---
 lib/Doctrine/ORM/EntityManager.php            |  2 +-
 .../ORM/Functional/Ticket/GH7366Test.php      | 77 +++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH7366Test.php

diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
index 1754032ae2f..c06db61a7d7 100644
--- a/lib/Doctrine/ORM/EntityManager.php
+++ b/lib/Doctrine/ORM/EntityManager.php
@@ -904,7 +904,7 @@ private function checkLockRequirements(int $lockMode, ClassMetadata $class) : vo
                 if (! $class->isVersioned()) {
                     throw OptimisticLockException::notVersioned($class->getClassName());
                 }
-            // Intentional fallthrough
+                break;
             case LockMode::PESSIMISTIC_READ:
             case LockMode::PESSIMISTIC_WRITE:
                 if (! $this->getConnection()->isTransactionActive()) {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7366Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7366Test.php
new file mode 100644
index 00000000000..68357a3052d
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7366Test.php
@@ -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;
+    }
+}