Skip to content

Commit a557c74

Browse files
Merge branch '2.3' into 2.7
* 2.3: [HttpFoundation] Fix transient test [HttpFoundation] Add a dependency on the mbstring polyfill add readme files where missing 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 Use constant instead of function call. fixed test name automatically generate safe fallback filename Conflicts: src/Symfony/Component/Debug/Debug.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
2 parents 9eff052 + c6f7814 commit a557c74

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)