Skip to content

Commit e848750

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 86d5c68 + a557c74 commit e848750

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Tests/Normalizer/GetSetMethodNormalizerTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,11 @@ public static function setStaticObject($object)
651651
{
652652
self::$staticObject = $object;
653653
}
654+
655+
protected function getPrivate()
656+
{
657+
throw new \RuntimeException('Dummy::getPrivate() should not be called');
658+
}
654659
}
655660

656661
class GetConstructorDummy

0 commit comments

Comments
 (0)