From f8ba3a3434a6a6503800becab13f3fcfe7d9d96c Mon Sep 17 00:00:00 2001
From: David McKay <david@rawkode.com>
Date: Sat, 21 Nov 2015 18:18:56 +0000
Subject: [PATCH 1/2] Fixing method name 'rollBack', which was documented as
 'rollback'

---
 docs/en/reference/transactions-and-concurrency.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/reference/transactions-and-concurrency.rst b/docs/en/reference/transactions-and-concurrency.rst
index f9c988dec..3c8cfe33b 100644
--- a/docs/en/reference/transactions-and-concurrency.rst
+++ b/docs/en/reference/transactions-and-concurrency.rst
@@ -75,7 +75,7 @@ looks like this:
         $em->flush();
         $em->getConnection()->commit();
     } catch (Exception $e) {
-        $em->getConnection()->rollback();
+        $em->getConnection()->rollBack();
         throw $e;
     }
 

From 3c7d92e4cc1d4c62cf628ef839a91c479c291875 Mon Sep 17 00:00:00 2001
From: David McKay <david@teamrock.com>
Date: Mon, 30 Nov 2015 16:53:31 +0000
Subject: [PATCH 2/2] Fixed incorrect case of another two references of
 rollback

---
 lib/Doctrine/ORM/EntityManager.php | 4 ++--
 lib/Doctrine/ORM/UnitOfWork.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
index e9ea2acda..e36dd4047 100644
--- a/lib/Doctrine/ORM/EntityManager.php
+++ b/lib/Doctrine/ORM/EntityManager.php
@@ -238,7 +238,7 @@ use Doctrine\Common\Util\ClassUtils;
             return $return ?: true;
         } catch (Exception $e) {
             $this->close();
-            $this->conn->rollback();
+            $this->conn->rollBack();
 
             throw $e;
         }
@@ -257,7 +257,7 @@ use Doctrine\Common\Util\ClassUtils;
      */
     public function rollback()
     {
-        $this->conn->rollback();
+        $this->conn->rollBack();
     }
 
     /**
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 3ba860b89..2732465a3 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -410,7 +410,7 @@ class UnitOfWork implements PropertyChangedListener
             $conn->commit();
         } catch (Exception $e) {
             $this->em->close();
-            $conn->rollback();
+            $conn->rollBack();
 
             $this->afterTransactionRolledBack();