Skip to content

Commit f611205

Browse files
Merge branch '2.5' into 2.6
* 2.5: [Validator] use 2.5 API in LengthValidator fixed id for translations bumped Symfony version to 2.3.26 Dutch translation for invalid charset message German translation for invalid charset message Add a Slovenian translation for invalid charset message Add a Polish translation. Test lowest deps with latest 5.3 updated VERSION for 2.3.25 update CONTRIBUTORS for 2.3.25 updated CHANGELOG for 2.3.25 Fix docblocks to comments Inject the correct EventDispatcher instance [Validator] reject ill-formed strings [Validator] drop grapheme_strlen in LengthValidator Unique Entity Validator Invalid Value [FrameworkBundle][config] allow multiple fallback locales. Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php src/Symfony/Component/Validator/Resources/translations/validators.de.xlf src/Symfony/Component/Validator/Resources/translations/validators.en.xlf src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
2 parents b2b448b + 16c0520 commit f611205

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Exception/FatalErrorException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\HttpKernel\Exception;
1313

14-
/**
14+
/*
1515
* Fatal Error Exception.
1616
*
1717
* @author Konstanton Myakshin <koc-dp@yandex.ru>

Exception/FlattenException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\HttpKernel\Exception;
1313

14-
/**
14+
/*
1515
* FlattenException wraps a PHP Exception to be able to serialize it.
1616
*
1717
* Basically, this class removes all objects from the trace.

0 commit comments

Comments
 (0)