Skip to content

Commit 15b42f3

Browse files
Merge branch '2.8' into 3.0
* 2.8: (25 commits) [Console] Fix an autocompletion question helper issue with non-sequentially indexed choices [Process] Fix pipes handling Mentioned the deprecation of deep parameters in UPGRADE files [Filesystem] Fix false positive in ->remove() [Filesystem] Cleanup/sync with 2.3 [Validator] Fix the locale validator so it treats a locale alias as a valid locale [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 [2.8] update readme files for new components fix lowest TwigBridge deps versions reference form type by name on Symfony 2.7 [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 ... Conflicts: UPGRADE-2.8.md UPGRADE-3.0.md src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FragmentRendererPass.php src/Symfony/Component/Console/Helper/DialogHelper.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Security/Core/README.md src/Symfony/Component/Security/Csrf/README.md src/Symfony/Component/Security/Http/README.md src/Symfony/Component/Validator/Constraints/LocaleValidator.php
2 parents b3d2a2e + d67cd45 commit 15b42f3

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
@@ -325,9 +325,8 @@ public function reset()
325325
public function getServiceIds()
326326
{
327327
$ids = array();
328-
$r = new \ReflectionClass($this);
329-
foreach ($r->getMethods() as $method) {
330-
if (preg_match('/^get(.+)Service$/', $method->name, $match)) {
328+
foreach (get_class_methods($this) as $method) {
329+
if (preg_match('/^get(.+)Service$/', $method, $match)) {
331330
$ids[] = self::underscore($match[1]);
332331
}
333332
}

0 commit comments

Comments
 (0)