do not mock the ContainerInterface

Author: xabbuh

Tests/Config/ContainerParametersResourceCheckerTest.php

@@ -11,22 +11,21 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Config;
 
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
 use Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 
 class ContainerParametersResourceCheckerTest extends TestCase
 {
     private ContainerParametersResource $resource;
     private ContainerParametersResourceChecker $resourceChecker;
-    private MockObject&ContainerInterface $container;
+    private Container $container;
 
     protected function setUp(): void
     {
         $this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);
-        $this->container = $this->createMock(ContainerInterface::class);
+        $this->container = new Container();
         $this->resourceChecker = new ContainerParametersResourceChecker($this->container);
     }
 
@@ -47,29 +46,16 @@ public function testIsFresh(callable $mockContainer, $expected)
 
     public static function isFreshProvider()
     {
-        yield 'not fresh on missing parameter' => [function (MockObject $container) {
-            $container->method('hasParameter')->with('locales')->willReturn(false);
+        yield 'not fresh on missing parameter' => [function (Container $container) {
         }, false];
 
-        yield 'not fresh on different value' => [function (MockObject $container) {
-            $container->method('getParameter')->with('locales')->willReturn(['nl', 'es']);
+        yield 'not fresh on different value' => [function (Container $container) {
+            $container->setParameter('locales', ['nl', 'es']);
         }, false];
 
-        yield 'fresh on every identical parameters' => [function (MockObject $container) {
-            $container->expects(self::exactly(2))->method('hasParameter')->willReturn(true);
-            $container->expects(self::exactly(2))->method('getParameter')
-                ->willReturnCallback(function (...$args) {
-                    static $series = [
-                        [['locales'], ['fr', 'en']],
-                        [['default_locale'], 'fr'],
-                    ];
-
-                    [$expectedArgs, $return] = array_shift($series);
-                    self::assertSame($expectedArgs, $args);
-
-                    return $return;
-                })
-            ;
+        yield 'fresh on every identical parameters' => [function (Container $container) {
+            $container->setParameter('locales', ['fr', 'en']);
+            $container->setParameter('default_locale', 'fr');
         }, true];
     }
 }

Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\LazyProxy\Instantiator;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
 
@@ -27,9 +27,8 @@ public function testInstantiateProxy()
     {
         $instantiator = new RealServiceInstantiator();
         $instance = new \stdClass();
-        $container = $this->createMock(ContainerInterface::class);
         $callback = fn () => $instance;
 
-        $this->assertSame($instance, $instantiator->instantiateProxy($container, new Definition(), 'foo', $callback));
+        $this->assertSame($instance, $instantiator->instantiateProxy(new Container(), new Definition(), 'foo', $callback));
     }
 }