From 64225778e6ef49ec3f5a09a22ef04d4c2924efa7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Nov 2017 18:56:40 +0200
Subject: [PATCH] fix merge

---
 .../Compiler/AddSessionDomainConstraintPassTest.php             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
index f476b5ef73..dfb9c702b2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSessionDomainConstraintPassTest.php
@@ -99,10 +99,12 @@ class AddSessionDomainConstraintPassTest extends TestCase
     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) {