symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/ManagerRegistry.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/ManagerRegistry.php
+32-1Lines changed: 32 additions & 1 deletion b/‎src/Symfony/Bridge/Doctrine/ManagerRegistry.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/ManagerRegistry.php
+32-1Lines changed: 32 additions & 1 deletion
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
Copy file name to clipboard
+50Lines changed: 50 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
Copy file name to clipboard
+50Lines changed: 50 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bridge/Doctrine/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
+1Lines changed: 1 addition & 0 deletions
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\Doctrine;
 
+use ProxyManager\Proxy\LazyLoadingInterface;
+use ProxyManager\Proxy\ValueHolderInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Doctrine\Common\Persistence\AbstractManagerRegistry;
@@ -37,6 +39,35 @@ protected function getService($name)
      */
     protected function resetService($name)
     {
-        $this->container->set($name, null);
+        if (!$this->container->initialized($name)) {
+            return;
+        }
+        $manager = $this->container->get($name);
+
+        if (!$manager instanceof LazyLoadingInterface) {
+            @trigger_error(sprintf('Resetting a non-lazy manager service is deprecated since Symfony 3.2 and won\'t be supported in version 4.0. Set the "%s" service as lazy instead.', $name));
+
+            $this->container->set($name, null);
+
+            return;
+        }
+        $manager->setProxyInitializer(
+            function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
+                $this->container->set($name, null);
+                $proxy = $this->container->get($name);
+
+                if ($proxy instanceof LazyLoadingInterface && !$proxy->isProxyInitialized() && $proxy instanceof ValueHolderInterface) {
+                    $proxy->initializeProxy();
+                    $wrappedInstance = $proxy->getWrappedValueHolderValue();
+                } else {
+                    $wrappedInstance = $proxy;
+                }
+
+                $manager->setProxyInitializer(null);
+                $this->container->set($name, $manager);
+
+                return true;
+            }
+        );
     }
 }
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests;
+
+use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper\PhpDumperTest;
+use Symfony\Component\DependencyInjection\Container;
+
+class ManagerRegistryTest extends \PHPUnit_Framework_TestCase
+{
+    public static function setUpBeforeClass()
+    {
+        $test = new PhpDumperTest();
+        $test->testDumpContainerWithProxyServiceWillShareProxies();
+    }
+
+    public function testLegacyResetService()
+    {
+        $container = new \LazyServiceProjectServiceContainer();
+
+        $registry = new TestManagerRegistry('name', array(), array('defaultManager' => 'foo'), 'defaultConnection', 'defaultManager', 'proxyInterfaceName');
+        $registry->setContainer($container);
+
+        $foo = $container->get('foo');
+        $foo->bar = 123;
+        $this->assertTrue(isset($foo->bar));
+
+        $registry->resetManager();
+
+        $this->assertSame($foo, $container->get('foo'));
+        $this->assertFalse(isset($foo->bar));
+    }
+}
+
+class TestManagerRegistry extends ManagerRegistry
+{
+    public function getAliasNamespace($alias)
+    {
+        return 'Foo';
+    }
+}
@@ -27,6 +27,7 @@
         "symfony/http-kernel": "~2.8|~3.0",
         "symfony/property-access": "~2.8|~3.0",
         "symfony/property-info": "~2.8|3.0",
+        "symfony/proxy-manager-bridge": "~2.8|~3.0",
         "symfony/security": "~2.8|~3.0",
         "symfony/expression-language": "~2.8|~3.0",
         "symfony/validator": "~2.8|~3.0",