Merge pull request doctrine#1563 from rawkode/bugfix/incorrect-rollba…

…ck-method-name Fixing method name 'rollBack', which was documented as 'rollback'
Deltachaos · Jan 6, 2016 · 1697293 · 1697293
2 parents 22b9574 + 3c7d92e
commit 1697293
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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;
     }
 

diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
@@ -238,7 +238,7 @@ public function transactional($func)
             return $return ?: true;
         } catch (Exception $e) {
             $this->close();
-            $this->conn->rollback();
+            $this->conn->rollBack();
 
             throw $e;
         }
@@ -257,7 +257,7 @@ public function commit()
      */
     public function rollback()
     {
-        $this->conn->rollback();
+        $this->conn->rollBack();
     }
 
     /**

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -402,7 +402,7 @@ public function commit($entity = null)
             $conn->commit();
         } catch (Exception $e) {
             $this->em->close();
-            $conn->rollback();
+            $conn->rollBack();
 
             $this->afterTransactionRolledBack();