Merge branch '3.3' into 3.4

* 3.3:
  fix merge
This commit is contained in:
Nicolas Grekas 2017-11-16 18:56:55 +02:00
commit e70c1f8d1a

View File

@ -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) {