minor symfony#35396 [DoctrineBridge] [DX] Improve condition for exception text in ManagerRegistry to avoid confusion (guilliamxavier)

nicolas-grekas · nicolas-grekas · commit a1e105ee6ccf · 2020-01-23T11:55:20.000+01:00
This PR was submitted for the 4.4 branch but it was merged into the 4.3 branch instead. Discussion ---------- [DoctrineBridge] [DX] Improve condition for exception text in ManagerRegistry to avoid confusion | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yesish | New feature? | no | Deprecations? | no | Tickets | Fix symfony#31047 (comment) | License | MIT | Doc PR | - (Targetting 4.4 because 4.3 is already almost EOM) Commits ------- 0d47fdf [DoctrineBridge] [DX] Improve condition for exception text in ManagerRegistry to avoid confusion
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -13,6 +13,7 @@
 
 use Doctrine\Persistence\AbstractManagerRegistry;
 use ProxyManager\Proxy\LazyLoadingInterface;
+use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Component\DependencyInjection\Container;
 
 /**
@@ -46,7 +47,7 @@ protected function resetService($name)
         $manager = $this->container->get($name);
 
         if (!$manager instanceof LazyLoadingInterface) {
-            throw new \LogicException('Resetting a non-lazy manager service is not supported. '.(interface_exists(LazyLoadingInterface::class) ? sprintf('Declare the "%s" service as lazy.', $name) : 'Try running "composer require symfony/proxy-manager-bridge".'));
+            throw new \LogicException('Resetting a non-lazy manager service is not supported. '.(interface_exists(LazyLoadingInterface::class) && class_exists(RuntimeInstantiator::class) ? sprintf('Declare the "%s" service as lazy.', $name) : 'Try running "composer require symfony/proxy-manager-bridge".'));
         }
         $manager->setProxyInitializer(\Closure::bind(
             function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
