Merge pull request #3 from LordWeedlle/2.5.1

Better handle it in UOW::commit()
rgsystemes · Oct 16, 2018 · 6cc5d43 · 6cc5d43
2 parents dfbadfd + 2a0c47b
commit 6cc5d43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
@@ -348,14 +348,9 @@ public function createQueryBuilder()
      *
      * @throws \Doctrine\ORM\OptimisticLockException If a version check on an entity that
      *         makes use of optimistic locking fails.
-     *
-     * @throws Exception
      */
     public function flush($entity = null)
     {
-        if (!is_null($entity))
-            throw new Exception('You shall not use single entity flush!');
-
         $this->errorIfClosed();
 
         $this->unitOfWork->commit($entity);

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -339,6 +339,9 @@ public function __construct(EntityManagerInterface $em)
      */
     public function commit($entity = null)
     {
+        if (!is_null($entity))
+            throw new Exception('You shall not use single entity flush!');
+
         // Raise preFlush
         if ($this->evm->hasListeners(Events::preFlush)) {
             $this->evm->dispatchEvent(Events::preFlush, new PreFlushEventArgs($this->em));