Merge pull request #2335 from kadala/master

Fixing method name 'rollBack'
doctrine · Jun 3, 2016 · 7dd848b · 7dd848b
2 parents b4e15f2 + 93af1de
commit 7dd848b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/tests/Doctrine/Tests/DBAL/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/ConnectionTest.php
@@ -48,7 +48,7 @@ public function testCommitWithNoActiveTransaction_ThrowsException()
     public function testRollbackWithNoActiveTransaction_ThrowsException()
     {
         $this->setExpectedException('Doctrine\DBAL\ConnectionException');
-        $this->_conn->rollback();
+        $this->_conn->rollBack();
     }
 
     public function testSetRollbackOnlyNoActiveTransaction_ThrowsException()

diff --git a/tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
@@ -45,7 +45,7 @@ public function testTransactionNestingBehavior()
                 throw new \Exception;
                 $this->_conn->commit(); // never reached
             } catch (\Exception $e) {
-                $this->_conn->rollback();
+                $this->_conn->rollBack();
                 $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
                 //no rethrow
             }
@@ -55,7 +55,7 @@ public function testTransactionNestingBehavior()
             $this->fail('Transaction commit after failed nested transaction should fail.');
         } catch (ConnectionException $e) {
             $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
-            $this->_conn->rollback();
+            $this->_conn->rollBack();
             $this->assertEquals(0, $this->_conn->getTransactionNestingLevel());
         }
     }
@@ -81,7 +81,7 @@ public function testTransactionNestingBehaviorWithSavepoints()
                 throw new \Exception;
                 $this->_conn->commit(); // never reached
             } catch (\Exception $e) {
-                $this->_conn->rollback();
+                $this->_conn->rollBack();
                 $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
                 //no rethrow
             }
@@ -95,7 +95,7 @@ public function testTransactionNestingBehaviorWithSavepoints()
             $this->_conn->commit(); // should not throw exception
         } catch (ConnectionException $e) {
             $this->fail('Transaction commit after failed nested transaction should not fail when using savepoints.');
-            $this->_conn->rollback();
+            $this->_conn->rollBack();
         }
     }
 
@@ -169,7 +169,7 @@ public function testTransactionBehaviorWithRollback()
             $this->_conn->commit(); // never reached
         } catch (\Exception $e) {
             $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
-            $this->_conn->rollback();
+            $this->_conn->rollBack();
             $this->assertEquals(0, $this->_conn->getTransactionNestingLevel());
         }
     }
@@ -181,7 +181,7 @@ public function testTransactionBehaviour()
             $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
             $this->_conn->commit();
         } catch (\Exception $e) {
-            $this->_conn->rollback();
+            $this->_conn->rollBack();
             $this->assertEquals(0, $this->_conn->getTransactionNestingLevel());
         }
 

diff --git a/tests/Doctrine/Tests/DBAL/Functional/TemporaryTableTest.php b/tests/Doctrine/Tests/DBAL/Functional/TemporaryTableTest.php
@@ -59,7 +59,7 @@ public function testDropTemporaryTableNotAutoCommitTransaction()
         $this->_conn->exec($platform->getDropTemporaryTableSQL($tempTable));
         $this->_conn->insert("nontemporary", array("id" => 2));
 
-        $this->_conn->rollback();
+        $this->_conn->rollBack();
 
         $rows = $this->_conn->fetchAll('SELECT * FROM nontemporary');
         $this->assertEquals(array(), $rows, "In an event of an error this result has one row, because of an implicit commit.");
@@ -97,7 +97,7 @@ public function testCreateTemporaryTableNotAutoCommitTransaction()
         $this->_conn->exec($createTempTableSQL);
         $this->_conn->insert("nontemporary", array("id" => 2));
 
-        $this->_conn->rollback();
+        $this->_conn->rollBack();
 
         try {
             $this->_conn->exec($platform->getDropTemporaryTableSQL($tempTable));

diff --git a/tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL202Test.php b/tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL202Test.php
@@ -31,7 +31,7 @@ public function testStatementRollback()
         $stmt = $this->_conn->prepare('INSERT INTO DBAL202 VALUES (8)');
         $this->_conn->beginTransaction();
         $stmt->execute();
-        $this->_conn->rollback();
+        $this->_conn->rollBack();
 
         $this->assertEquals(0, $this->_conn->query('SELECT COUNT(1) FROM DBAL202')->fetchColumn());
     }