Inject EventManager when using a custom platform

doctrine · Mar 11, 2022 · f41b9cb · f41b9cb
1 parent 82331b8
commit f41b9cb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -182,14 +182,6 @@ public function __construct(
         $this->_driver = $driver;
         $this->params  = $params;
 
-        if (isset($params['platform'])) {
-            if (! $params['platform'] instanceof Platforms\AbstractPlatform) {
-                throw Exception::invalidPlatformType($params['platform']);
-            }
-
-            $this->platform = $params['platform'];
-        }
-
         // Create default config and event manager if none given
         if ($config === null) {
             $config = new Configuration();
@@ -202,6 +194,15 @@ public function __construct(
         $this->_config       = $config;
         $this->_eventManager = $eventManager;
 
+        if (isset($params['platform'])) {
+            if (! $params['platform'] instanceof Platforms\AbstractPlatform) {
+                throw Exception::invalidPlatformType($params['platform']);
+            }
+
+            $this->platform = $params['platform'];
+            $this->platform->setEventManager($this->_eventManager);
+        }
+
         $this->_expr = $this->createExpressionBuilder();
 
         $this->autoCommit = $config->getAutoCommit();

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -138,6 +138,20 @@ public function testConnectDispatchEvent(): void
         $conn->connect();
     }
 
+    public function testEventDispatcherIsSetForCustomPlatform(): void
+    {
+        $eventManager = new EventManager();
+
+        $driverMock = $this->createMock(Driver::class);
+
+        $platformMock = $this->createMock(AbstractPlatform::class);
+        $platformMock->expects(self::once())
+                     ->method('setEventManager')
+                     ->with($eventManager);
+
+        new Connection(['platform' => $platformMock], $driverMock, new Configuration(), $eventManager);
+    }
+
     public function testTransactionBeginDispatchEvent(): void
     {
         $eventManager = new EventManager();