Skip to content

Commit 4eb9fce

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed tests migrate session after remember me authentication prevent timing attacks in digest auth listener mitigate CSRF timing attack vulnerability fix potential timing attack issue
2 parents 9e2fb7a + 7a201bf commit 4eb9fce

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/ContainerBuilderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public function testCreateServiceMethodCallsWithEscapedParam()
359359
{
360360
$builder = new ContainerBuilder();
361361
$builder->register('bar', 'stdClass');
362-
$builder->register('foo1', 'FooClass')->addMethodCall('setBar', array(array('%%unescape_it%%')));
362+
$builder->register('foo1', 'Bar\FooClass')->addMethodCall('setBar', array(array('%%unescape_it%%')));
363363
$builder->setParameter('value', 'bar');
364364
$this->assertEquals(array('%unescape_it%'), $builder->get('foo1')->bar, '->createService() replaces the values in the method calls arguments');
365365
}
@@ -368,7 +368,7 @@ public function testCreateServiceProperties()
368368
{
369369
$builder = new ContainerBuilder();
370370
$builder->register('bar', 'stdClass');
371-
$builder->register('foo1', 'FooClass')->setProperty('bar', array('%value%', new Reference('bar'), '%%unescape_it%%'));
371+
$builder->register('foo1', 'Bar\FooClass')->setProperty('bar', array('%value%', new Reference('bar'), '%%unescape_it%%'));
372372
$builder->setParameter('value', 'bar');
373373
$this->assertEquals(array('bar', $builder->get('bar'), '%unescape_it%'), $builder->get('foo1')->bar, '->createService() replaces the values in the properties');
374374
}

0 commit comments

Comments
 (0)