Merge branch '3.4' into 4.4

* 3.4:
  Relax tests to unlock change on master

Author: nicolas-grekas

Tests/DependencyInjection/FormPassTest.php

@@ -58,12 +58,14 @@ public function testAddTaggedTypes()
 
         $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)
         );
     }