Merge pull request #8 from autorusltd/release/v1.14.0

v1.14.0

Author: fenric

src/ManagerRegistry.php

@@ -21,8 +21,8 @@
 /**
  * Import functions
  */
-use function DI\factory;
 use function key;
+use function reset;
 use function sprintf;
 use function sys_get_temp_dir;
 
@@ -37,6 +37,16 @@ class ManagerRegistry extends AbstractManagerRegistry
      */
     private $container;
 
+    /**
+     * @var \Closure[]
+     */
+    private $factories = [];
+
+    /**
+     * @var object[]
+     */
+    private $services = [];
+
     /**
      * Constructor of the class
      *
@@ -51,23 +61,29 @@ public function __construct(Container $container)
         $managers = [];
         $types = [];
 
-        foreach ($configuration as $name => $params) {
-            $connections[$name] = sprintf('doctrine.connection.%s', $name);
-            $managers[$name] = sprintf('doctrine.manager.%s', $name);
+        foreach ($configuration as $serviceName => $params) {
+            $connectionName = sprintf('connection:%s', $serviceName);
+            $managerName = sprintf('manager:%s', $serviceName);
+
+            $connections[$serviceName] = $connectionName;
+            $managers[$serviceName] = $managerName;
 
-            $this->container->set($connections[$name], factory(function ($name) {
-                return $this->getManager($name)->getConnection();
-            })->parameter('name', $name));
+            $this->factories[$connectionName] = function () use ($serviceName) {
+                return $this->getManager($serviceName)->getConnection();
+            };
 
-            $this->container->set($managers[$name], factory(function ($params) {
+            $this->factories[$managerName] = function () use ($params) {
                 return $this->createManager($params);
-            })->parameter('params', $params));
+            };
 
             if (!empty($params['types'])) {
                 $types += $params['types'];
             }
         }
 
+        reset($connections);
+        reset($managers);
+
         parent::__construct('ORM', $connections, $managers, key($connections), key($managers), Proxy::class);
 
         $this->registerUserTypes($types);
@@ -161,18 +177,32 @@ public function getHydrator(string $name = null) : ArrayHydrator
 
     /**
      * {@inheritDoc}
+     *
+     * @throws \RuntimeException If the registry doesn't contain the named service.
      */
     protected function getService($name)
     {
-        return $this->container->get($name);
+        if (isset($this->services[$name])) {
+            return $this->services[$name];
+        }
+
+        if (!isset($this->factories[$name])) {
+            throw new \RuntimeException(
+                sprintf('Doctrine Manager registry does not contain named service "%s"', $name)
+            );
+        }
+
+        $this->services[$name] = $this->factories[$name]();
+
+        return $this->services[$name];
     }
 
     /**
      * {@inheritDoc}
      */
     protected function resetService($name)
     {
-        $this->container->set($name, $this->container->make($name));
+        unset($this->services[$name]);
     }
 
     /**

tests/ManagerRegistryTest.php

@@ -69,18 +69,6 @@ public function testCreatedManagersAndConnections() : void
 
         $doctrine = $container->get('doctrine');
 
-        $this->assertTrue($container->has('doctrine.connection.foo'));
-        $this->assertTrue($container->has('doctrine.connection.bar'));
-
-        $this->assertTrue($container->has('doctrine.manager.foo'));
-        $this->assertTrue($container->has('doctrine.manager.bar'));
-
-        $this->assertSame($container->get('doctrine.connection.foo'), $doctrine->getConnection('foo'));
-        $this->assertSame($container->get('doctrine.connection.bar'), $doctrine->getConnection('bar'));
-
-        $this->assertSame($container->get('doctrine.manager.foo'), $doctrine->getManager('foo'));
-        $this->assertSame($container->get('doctrine.manager.bar'), $doctrine->getManager('bar'));
-
         $this->assertInstanceOf(Connection::class, $doctrine->getConnection('foo'));
         $this->assertInstanceOf(Connection::class, $doctrine->getConnection('bar'));