Merge pull request #1722 from malarzm/nested-commit-exception

[2.0] Disallow nested commits
doctrine · Jan 9, 2018 · adf0b7e · adf0b7e
2 parents f3468b7 + 324d84b
commit adf0b7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/Doctrine/ODM/MongoDB/MongoDBException.php b/lib/Doctrine/ODM/MongoDB/MongoDBException.php
@@ -139,4 +139,12 @@ public static function failedToEnsureDocumentSharding($className, $errorMessage)
             $errorMessage
         ));
     }
+
+    /**
+     * @return MongoDBException
+     */
+    public static function commitInProgress()
+    {
+        return new self('There is already a commit operation in progress. Did you call flush from an event listener?');
+    }
 }
diff --git a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
@@ -385,7 +385,7 @@ public function commit(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) {