RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-13 10:49:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1563 from rawkode/bugfix/incorrect-rollback-method-name

Browse Source 
Fixing method name 'rollBack', which was documented as 'rollback'
This commit is contained in:
Steve Müller 2016-01-06 11:49:32 +01:00
commit 1697293591
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/reference/transactions-and-concurrency.rst
View File

@ -75,7 +75,7 @@ looks like this:
$em->flush(); $em->flush();
$em->getConnection()->commit(); $em->getConnection()->commit();
} catch (Exception $e) { } catch (Exception $e) {
$em->getConnection()->rollback(); $em->getConnection()->rollBack();
throw $e; throw $e;
} }

4
lib/Doctrine/ORM/EntityManager.php
View File

@ -238,7 +238,7 @@ use Doctrine\Common\Util\ClassUtils;
return $return ?: true; return $return ?: true;
} catch (Exception $e) { } catch (Exception $e) {
$this->close(); $this->close();
$this->conn->rollback(); $this->conn->rollBack();
throw $e; throw $e;
} }
@ -257,7 +257,7 @@ use Doctrine\Common\Util\ClassUtils;
*/ */
public function rollback() public function rollback()
{ {
$this->conn->rollback(); $this->conn->rollBack();
} }
/** /**

2
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -402,7 +402,7 @@ class UnitOfWork implements PropertyChangedListener
$conn->commit(); $conn->commit();
} catch (Exception $e) { } catch (Exception $e) {
$this->em->close(); $this->em->close();
$conn->rollback(); $conn->rollBack();
$this->afterTransactionRolledBack(); $this->afterTransactionRolledBack();