From f0330e9ae34ba2a8ff6d670c9179106b70694bd6 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 24 Nov 2018 13:24:43 +0100
Subject: [PATCH] Ensured CloseDbConnectionMiddleware clears the entity manager

---
 module/Common/src/Middleware/CloseDbConnectionMiddleware.php   | 1 +
 .../Common/test/Middleware/CloseDbConnectionMiddlewareTest.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/module/Common/src/Middleware/CloseDbConnectionMiddleware.php b/module/Common/src/Middleware/CloseDbConnectionMiddleware.php
index 867ffe02..c365da51 100644
--- a/module/Common/src/Middleware/CloseDbConnectionMiddleware.php
+++ b/module/Common/src/Middleware/CloseDbConnectionMiddleware.php
@@ -27,6 +27,7 @@ class CloseDbConnectionMiddleware implements MiddlewareInterface
     {
         $handledRequest =  $handler->handle($request);
         $this->em->getConnection()->close();
+        $this->em->clear();
 
         return $handledRequest;
     }
diff --git a/module/Common/test/Middleware/CloseDbConnectionMiddlewareTest.php b/module/Common/test/Middleware/CloseDbConnectionMiddlewareTest.php
index dc45bde8..36bdff87 100644
--- a/module/Common/test/Middleware/CloseDbConnectionMiddlewareTest.php
+++ b/module/Common/test/Middleware/CloseDbConnectionMiddlewareTest.php
@@ -41,6 +41,8 @@ class CloseDbConnectionMiddlewareTest extends TestCase
         $closeConn = $conn->close()->will(function () {
         });
         $getConn = $this->em->getConnection()->willReturn($conn->reveal());
+        $clear = $this->em->clear()->will(function () {
+        });
         $handle = $this->handler->handle($req)->willReturn($resp);
 
         $result = $this->middleware->process($req, $this->handler->reveal());
@@ -48,6 +50,7 @@ class CloseDbConnectionMiddlewareTest extends TestCase
         $this->assertSame($result, $resp);
         $getConn->shouldHaveBeenCalledOnce();
         $closeConn->shouldHaveBeenCalledOnce();
+        $clear->shouldHaveBeenCalledOnce();
         $handle->shouldHaveBeenCalledOnce();
     }
 }