Disallow nested commits

doctrine · Jan 7, 2018 · 5597221 · 5597221
1 parent f078de3
commit 5597221
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/Doctrine/ODM/MongoDB/MongoDBException.php b/lib/Doctrine/ODM/MongoDB/MongoDBException.php
@@ -159,4 +159,9 @@ public static function failedToEnsureDocumentSharding($className, $errorMessage)
             $errorMessage
         ));
     }
+
+    public static function commitInProgress()
+    {
+        return new self('There is already a commit operation in progress');
+    }
 }
diff --git a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
@@ -394,7 +394,7 @@ public function commit($document = null, array $options = array())
 
         $this->commitsInProgress++;
         if ($this->commitsInProgress > 1) {
-            @trigger_error('There is already a commit operation in progress. Calling flush in an event subscriber is deprecated and will be forbidden in 2.0.', E_USER_DEPRECATED);
+            throw MongoDBException::commitInProgress();
         }
         try {
             if ($this->orphanRemovals) {