Skip to content

Commit db8bdcf

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [Security] Fix wrong term in UserProviderInterface [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content [Security] validate empty passwords again [DI] Remove irrelevant comment from container [TwigBridge] cleaner implementation of the TwigRenderer
2 parents dcb2a28 + cb7ac81 commit db8bdcf

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

Container.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@
3030
*
3131
* Parameter and service keys are case insensitive.
3232
*
33-
* A service id can contain lowercased letters, digits, underscores, and dots.
34-
* Underscores are used to separate words, and dots to group services
35-
* under namespaces:
36-
*
37-
* <ul>
38-
* <li>request</li>
39-
* <li>mysql_session_storage</li>
40-
* <li>symfony.mysql_session_storage</li>
41-
* </ul>
42-
*
4333
* A service can also be defined by creating a method named
4434
* getXXXService(), where XXX is the camelized version of the id:
4535
*

Tests/ContainerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ public function testGetServiceIds()
134134
public function testSet()
135135
{
136136
$sc = new Container();
137-
$sc->set('foo', $foo = new \stdClass());
138-
$this->assertSame($foo, $sc->get('foo'), '->set() sets a service');
137+
$sc->set('._. \\o/', $foo = new \stdClass());
138+
$this->assertSame($foo, $sc->get('._. \\o/'), '->set() sets a service');
139139
}
140140

141141
public function testSetWithNullResetTheService()

0 commit comments

Comments
 (0)