Merge branch '3.4' into 4.4

* 3.4: Relax tests to unlock change on master
symfony · Jun 22, 2020 · bb7d8dd · bb7d8dd
2 parents 2fae337 + 0a923c6
commit bb7d8dd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php b/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
@@ -35,12 +35,14 @@ public function testThatConstraintValidatorServicesAreProcessed()
         $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()