Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit e70c1f8d1a6c · 2017-11-16T18:56:55.000+02:00
* 3.3:
  fix merge
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
@@ -99,10 +99,12 @@ public function testNoSession()
     private function createContainer($sessionStorageOptions)
     {
         $container = new ContainerBuilder();
+        $container->setParameter('kernel.bundles_metadata', array());
         $container->setParameter('kernel.cache_dir', __DIR__);
         $container->setParameter('kernel.charset', 'UTF-8');
         $container->setParameter('kernel.container_class', 'cc');
         $container->setParameter('kernel.debug', true);
+        $container->setParameter('kernel.project_dir', __DIR__);
         $container->setParameter('kernel.root_dir', __DIR__);
         $container->setParameter('kernel.secret', __DIR__);
         if (null !== $sessionStorageOptions) {
