minor #57483 [DoctrineBridge] Test reset with a true manager (MatTheCat)

xabbuh · xabbuh · commit e3af3f1317d6 · 2024-06-21T15:56:32.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [DoctrineBridge] Test reset with a true manager | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | N/A | License | MIT Now that [assertions were added to the `AbstractManagerRegistry`](doctrine/persistence#375), the `ManagerRegistryTest` must register instances of `ObjectManager` to avoid tests failing with ``` assert(): assert($service instanceof ObjectManager) failed ``` Changes mostly come from #48484 but the ProxyManager is still used on 5.4, so beware when merging this in 6.4. Commits ------- 79b03db [DoctrineBridge] Test reset with a true manager
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DummyManager.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DummyManager.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
+
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\ClassMetadataFactory;
+use Doctrine\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectRepository;
+
+class DummyManager implements ObjectManager
+{
+    public $bar;
+
+    public function find($className, $id): ?object
+    {
+    }
+
+    public function persist($object): void
+    {
+    }
+
+    public function remove($object): void
+    {
+    }
+
+    public function merge($object)
+    {
+    }
+
+    public function clear($objectName = null): void
+    {
+    }
+
+    public function detach($object): void
+    {
+    }
+
+    public function refresh($object): void
+    {
+    }
+
+    public function flush(): void
+    {
+    }
+
+    public function getRepository($className): ObjectRepository
+    {
+    }
+
+    public function getClassMetadata($className): ClassMetadata
+    {
+    }
+
+    public function getMetadataFactory(): ClassMetadataFactory
+    {
+    }
+
+    public function initializeObject($obj): void
+    {
+    }
+
+    public function contains($object): bool
+    {
+    }
+
+    public function isUninitializedObject($value): bool
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
@@ -15,8 +15,8 @@
 use ProxyManager\Proxy\LazyLoadingInterface;
 use ProxyManager\Proxy\ValueHolderInterface;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\DummyManager;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
-use Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper\PhpDumperTest;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -26,13 +26,20 @@ class ManagerRegistryTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {
-        $test = new PhpDumperTest();
-        $test->testDumpContainerWithProxyServiceWillShareProxies();
+        $container = new ContainerBuilder();
+
+        $container->register('foo', DummyManager::class)->setPublic(true);
+        $container->getDefinition('foo')->setLazy(true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->setProxyDumper(new ProxyDumper());
+        eval('?>'.$dumper->dump(['class' => 'LazyServiceDoctrineBridgeContainer']));
     }
 
     public function testResetService()
     {
-        $container = new \LazyServiceProjectServiceContainer();
+        $container = new \LazyServiceDoctrineBridgeContainer();
 
         $registry = new TestManagerRegistry('name', [], ['defaultManager' => 'foo'], 'defaultConnection', 'defaultManager', 'proxyInterfaceName');
         $registry->setTestContainer($container);
@@ -44,8 +51,8 @@ public function testResetService()
         $registry->resetManager();
 
         $this->assertSame($foo, $container->get('foo'));
-        $this->assertInstanceOf(\stdClass::class, $foo);
-        $this->assertFalse(property_exists($foo, 'bar'));
+        $this->assertInstanceOf(DummyManager::class, $foo);
+        $this->assertFalse(isset($foo->bar));
     }
 
     /**
@@ -77,7 +84,7 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
 
         $service = $container->get('foo');
 
-        self::assertInstanceOf(\stdClass::class, $service);
+        self::assertInstanceOf(DummyManager::class, $service);
         self::assertInstanceOf(LazyLoadingInterface::class, $service);
         self::assertInstanceOf(ValueHolderInterface::class, $service);
         self::assertFalse($service->isProxyInitialized());
@@ -91,7 +98,7 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
         $service->initializeProxy();
 
         $wrappedValue = $service->getWrappedValueHolderValue();
-        self::assertInstanceOf(\stdClass::class, $wrappedValue);
+        self::assertInstanceOf(DummyManager::class, $wrappedValue);
         self::assertNotInstanceOf(LazyLoadingInterface::class, $wrappedValue);
         self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);
     }
@@ -104,7 +111,7 @@ private function dumpLazyServiceProjectAsFilesServiceContainer()
 
         $container = new ContainerBuilder();
 
-        $container->register('foo', \stdClass::class)
+        $container->register('foo', DummyManager::class)
             ->setPublic(true)
             ->setLazy(true);
         $container->compile();
