From eaee924180f4ed869f3cb07fb7c55bafe584fd8b Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sun, 18 Dec 2016 14:36:39 +0100
Subject: [PATCH] #6174 #5570 flattened nested conditionals

---
 lib/Doctrine/ORM/UnitOfWork.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 9e213199a..3867b1b14 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1902,16 +1902,20 @@ class UnitOfWork implements PropertyChangedListener
      */
     private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
     {
-        if ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity)) {
-            $reflField          = $class->reflFields[$class->versionField];
-            $managedCopyVersion = $reflField->getValue($managedCopy);
-            $entityVersion      = $reflField->getValue($entity);
-
-            // Throw exception if versions don't match.
-            if ($managedCopyVersion != $entityVersion) {
-                throw OptimisticLockException::lockFailedVersionMismatch($entity, $entityVersion, $managedCopyVersion);
-            }
+        if (! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
+            return;
         }
+
+        $reflField          = $class->reflFields[$class->versionField];
+        $managedCopyVersion = $reflField->getValue($managedCopy);
+        $entityVersion      = $reflField->getValue($entity);
+
+        // Throw exception if versions don't match.
+        if ($managedCopyVersion == $entityVersion) {
+            return;
+        }
+
+        throw OptimisticLockException::lockFailedVersionMismatch($entity, $entityVersion, $managedCopyVersion);
     }
 
     /**