From afe596e16a0e161fce72236f412c97029ae130fc Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 22 Jun 2020 09:47:42 +0200
Subject: [PATCH] Relax tests to unlock change on master

---
 .../DependencyInjection/Compiler/CachePoolClearerPassTest.php | 3 +++
 .../Component/Form/Tests/DependencyInjection/FormPassTest.php | 4 +++-
 .../DependencyInjection/AddConstraintValidatorsPassTest.php   | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
index 728595ae9f..e690aa8651 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
@@ -32,9 +32,11 @@ class CachePoolClearerPassTest extends TestCase
         $container->setParameter('kernel.root_dir', 'foo');
 
         $globalClearer = new Definition(Psr6CacheClearer::class);
+        $globalClearer->setPublic(true);
         $container->setDefinition('cache.global_clearer', $globalClearer);
 
         $publicPool = new Definition();
+        $publicPool->setPublic(true);
         $publicPool->addArgument('namespace');
         $publicPool->addTag('cache.pool', ['clearer' => 'clearer_alias']);
         $container->setDefinition('public.pool', $publicPool);
@@ -46,6 +48,7 @@ class CachePoolClearerPassTest extends TestCase
         $container->setDefinition('private.pool', $privatePool);
 
         $clearer = new Definition();
+        $clearer->setPublic(true);
         $container->setDefinition('clearer', $clearer);
         $container->setAlias('clearer_alias', 'clearer');
 
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
index 64393a0498..d3856a5c57 100644
--- a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
+++ b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -57,12 +57,14 @@ class FormPassTest extends TestCase
 
         $extDefinition = $container->getDefinition('form.extension');
 
+        $locator = $extDefinition->getArgument(0);
+        $this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
         $this->assertEquals(
             (new Definition(ServiceLocator::class, [[
                 __CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),
                 __CLASS__.'_Type2' => new ServiceClosureArgument(new Reference('my.type2')),
             ]]))->addTag('container.service_locator')->setPublic(false),
-            $extDefinition->getArgument(0)
+            $locator->setPublic(false)
         );
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
index 9a2958364d..45e73fc434 100644
--- a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
+++ b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
@@ -35,12 +35,14 @@ class AddConstraintValidatorsPassTest extends TestCase
         $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
         $addConstraintValidatorsPass->process($container);
 
+        $locator = $container->getDefinition((string) $validatorFactory->getArgument(0));
+        $this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
         $expected = (new Definition(ServiceLocator::class, [[
             Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
             'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
             Validator2::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service2')),
         ]]))->addTag('container.service_locator')->setPublic(false);
-        $this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
+        $this->assertEquals($expected, $locator->setPublic(false));
     }
 
     public function testAbstractConstraintValidator()