symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
+5-4Lines changed: 5 additions & 4 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
+12-4Lines changed: 12 additions & 4 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
+12-4Lines changed: 12 additions & 4 deletions
@@ -55,11 +55,12 @@ public function testProcess()
             'Test\private_used_shared_service' => new ServiceClosureArgument(new Reference('Test\private_used_shared_service')),
             'Test\private_used_non_shared_service' => new ServiceClosureArgument(new Reference('Test\private_used_non_shared_service')),
             'Test\soon_private_service' => new ServiceClosureArgument(new Reference('.container.private.Test\soon_private_service')),
-            'Psr\Container\ContainerInterface' => new ServiceClosureArgument(new Reference('service_container')),
-            'Symfony\Component\DependencyInjection\ContainerInterface' => new ServiceClosureArgument(new Reference('service_container')),
         ];
-        $this->assertEquals($expected, $container->getDefinition('test.private_services_locator')->getArgument(0));
-        $this->assertSame($container, $container->get('test.private_services_locator')->get('Psr\Container\ContainerInterface'));
+
+        $privateServices = $container->getDefinition('test.private_services_locator')->getArgument(0);
+        unset($privateServices['Symfony\Component\DependencyInjection\ContainerInterface'], $privateServices['Psr\Container\ContainerInterface']);
+
+        $this->assertEquals($expected, $privateServices);
         $this->assertFalse($container->getDefinition('Test\private_used_non_shared_service')->isShared());
     }
 }
@@ -410,16 +410,24 @@ public function testExceptionOnNonStringParameter()
 
     public function testExceptionOnNonStringParameterWithSfContainer()
     {
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type "stdClass".');
         $routes = new RouteCollection();
 
         $routes->add('foo', new Route('/%object%'));
 
         $sc = $this->getServiceContainer($routes);
-        $sc->setParameter('object', new \stdClass());
 
-        $router = new Router($sc, 'foo');
+        $pc = $this->createMock(ContainerInterface::class);
+        $pc
+            ->expects($this->once())
+            ->method('get')
+            ->willReturn(new \stdClass())
+        ;
+
+        $router = new Router($sc, 'foo', [], null, $pc);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type "stdClass".');
+
         $router->getRouteCollection()->get('foo');
     }