Skip to content

Commit d67cd45

Browse files
Merge branch '2.7' into 2.8
* 2.7: [HttpFoundation] Fix transient test [HttpFoundation] Add a dependency on the mbstring polyfill [2.7] update readme files for new components add readme files where missing fix lowest TwigBridge deps versions [EventDispatcher] fix syntax error Don't use reflections when possible Don't use reflections when possible [Form] Update form tests after the ICU data update [Intl] Update tests and the number formatter to match behaviour of the intl extension [Intl] Update the ICU data to version 55 [Intl] Fix the update-data.php script in preparation for ICU 5.5 [Process] Fix memory issue when using large input streams Use constant instead of function call. fixed test name automatically generate safe fallback filename [Console] default to stderr in the console helpers Conflicts: composer.json src/Symfony/Bridge/PhpUnit/README.md src/Symfony/Bridge/Twig/composer.json src/Symfony/Component/Console/Helper/DialogHelper.php src/Symfony/Component/Debug/DebugClassLoader.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Security/Acl/README.md src/Symfony/Component/Security/Core/README.md src/Symfony/Component/Security/Csrf/README.md src/Symfony/Component/Security/Http/README.md
2 parents 78d5481 + 7cae1c9 commit d67cd45

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Container.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,8 @@ public function reset()
375375
public function getServiceIds()
376376
{
377377
$ids = array();
378-
$r = new \ReflectionClass($this);
379-
foreach ($r->getMethods() as $method) {
380-
if (preg_match('/^get(.+)Service$/', $method->name, $match)) {
378+
foreach (get_class_methods($this) as $method) {
379+
if (preg_match('/^get(.+)Service$/', $method, $match)) {
381380
$ids[] = self::underscore($match[1]);
382381
}
383382
}

0 commit comments

Comments
 (0)