Commite70c1f8

committed

Merge branch '3.3' into 3.4

* 3.3: fix merge

2 parents154e05f +6422577 commite70c1f8Copy full SHA for e70c1f8

File tree

-0

lines changed

src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler
- AddSessionDomainConstraintPassTest.php

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,12 @@ public function testNoSession()`
`99`	`99`	`privatefunctioncreateContainer($sessionStorageOptions)`
`100`	`100`	`{`
`101`	`101`	`$container =newContainerBuilder();`
	`102`	`+$container->setParameter('kernel.bundles_metadata',array());`
`102`	`103`	`$container->setParameter('kernel.cache_dir',__DIR__);`
`103`	`104`	`$container->setParameter('kernel.charset','UTF-8');`
`104`	`105`	`$container->setParameter('kernel.container_class','cc');`
`105`	`106`	`$container->setParameter('kernel.debug',true);`
	`107`	`+$container->setParameter('kernel.project_dir',__DIR__);`
`106`	`108`	`$container->setParameter('kernel.root_dir',__DIR__);`
`107`	`109`	`$container->setParameter('kernel.secret',__DIR__);`
`108`	`110`	`if (null !==$sessionStorageOptions) {`

Comments

(0)