Merge branch '1.4' into 1.5

Author: eigan

src/EntityManagerFactory.php

@@ -3,6 +3,7 @@
 namespace LaravelDoctrine\ORM;
 
 use Doctrine\Common\Cache\Cache;
+use Doctrine\Common\EventManager;
 use Doctrine\ORM\Cache\DefaultCacheFactory;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
@@ -104,6 +105,8 @@ public function create(array $settings = [])
 
         $this->setMetadataDriver($settings, $configuration);
 
+        $eventManager = $this->createEventManager($settings);
+
         $driver = $this->getConnectionDriver($settings);
 
         $connection = $this->connection->driver(
@@ -133,7 +136,8 @@ public function create(array $settings = [])
 
         $manager = EntityManager::create(
             $connection,
-            $configuration
+            $configuration,
+            $eventManager
         );
 
         $manager = $this->decorateManager($settings, $manager);
@@ -460,6 +464,23 @@ protected function registerMappingTypes(array $settings = [], EntityManagerInter
         }
     }
 
+    /**
+     * @param array $settings
+     *
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     * @return null|EventManager
+     */
+    private function createEventManager(array $settings = [])
+    {
+        $customEventManager = Arr::get($settings, 'event_manager');
+
+        if (!$customEventManager) {
+            return null;
+        }
+
+        return $this->container->make($customEventManager);
+    }
+
     /**
      * Check if master slave connection was being configured.
      *

tests/EntityManagerFactoryTest.php

@@ -529,6 +529,52 @@ public function test_wrapper_connection()
         $this->assertInstanceOf(FakeConnection::class, $manager->getConnection());
     }
 
+    public function test_custom_event_manager()
+    {
+        m::resetContainer();
+
+        $config = new ConfigRepository([
+            'database.connections.mysql' => [
+                'driver'       => 'mysql'
+            ],
+            'doctrine' => [
+                'meta'       => 'annotations',
+                'connection' => 'mysql',
+                'paths'      => ['Entities'],
+                'proxies'    => [
+                    'path'          => 'dir',
+                    'auto_generate' => false,
+                    'namespace'     => 'namespace'
+                ],
+                'event_manager' => 'my_event_manager'
+            ],
+            'doctrine.custom_datetime_functions' => [],
+            'doctrine.custom_numeric_functions'  => [],
+            'doctrine.custom_string_functions'   => []
+        ]);
+
+        $container = new \Illuminate\Container\Container();
+        $container->singleton(Repository::class, function () use ($config) {
+            return $config;
+        });
+
+        $container->alias(FakeEventManager::class, 'my_event_manager');
+
+        $factory = new EntityManagerFactory(
+            $container,
+            new Setup(),
+            new MetaDataManager($container),
+            new ConnectionManager($container),
+            new CacheManager($container),
+            $config,
+            new EntityListenerResolver($container)
+        );
+
+        $manager = $factory->create($config->get('doctrine'));
+
+        $this->assertInstanceOf(FakeEventManager::class, $manager->getEventManager());
+    }
+
     /**
      * MOCKS
      *
@@ -921,6 +967,10 @@ private function getDummyBaseInputConfig()
     }
 }
 
+class FakeEventManager extends \Doctrine\Common\EventManager
+{
+}
+
 class FakeConnection extends Connection
 {
 }