Skip to content

Commit

Permalink
Merge branch '2.5' into 2.6
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Feb 1, 2015
2 parents eadc8c7 + ed18cde commit c47bbbe
Show file tree
Hide file tree
Showing 31 changed files with 273 additions and 148 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -7,7 +7,7 @@ matrix:
- php: 5.4
- php: 5.5
- php: 5.6
- php: 5.3.3
- php: 5.3
env: components=low
- php: 5.6
env: components=high
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG-2.3.md
Expand Up @@ -7,6 +7,28 @@ in 2.3 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1

* 2.3.25 (2015-01-30)

* bug #13528 [Validator] reject ill-formed strings (nicolas-grekas)
* bug #13525 [Validator] UniqueEntityValidator - invalidValue fixed. (Dawid Sajdak)
* bug #13527 [Validator] drop grapheme_strlen in LengthValidator (nicolas-grekas)
* bug #13376 [FrameworkBundle][config] allow multiple fallback locales. (aitboudad)
* bug #12972 Make the container considered non-fresh if the environment parameters are changed (thewilkybarkid)
* bug #13309 [Console] fixed 10531 (nacmartin)
* bug #13352 [Yaml] fixed parse shortcut Key after unindented collection. (aitboudad)
* bug #13039 [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info (rk3rn3r)
* bug #13250 [Twig][Bridge][TranslationDefaultDomain] add support of named arguments. (aitboudad)
* bug #13332 [Console] ArgvInput and empty tokens (Taluu)
* bug #13293 [EventDispatcher] Add missing checks to RegisterListenersPass (znerol)
* bug #13262 [Yaml] Improve YAML boolean escaping (petert82, larowlan)
* bug #13420 [Debug] fix loading order for legacy classes (nicolas-grekas)
* bug #13371 fix missing comma in YamlDumper (garak)
* bug #13365 [HttpFoundation] Make use of isEmpty() method (xelaris)
* bug #13347 [Console] Helper\TableHelper->addRow optimization (boekkooi)
* bug #13346 [PropertyAccessor] Allow null value for a array (2.3) (boekkooi)
* bug #13170 [Form] Set a child type to text if added to the form without a type. (jakzal)
* bug #13334 [Yaml] Fixed #10597: Improved Yaml directive parsing (VictoriaQ)

* 2.3.24 (2015-01-07)

* bug #13286 [Security] Don't destroy the session on buggy php releases. (derrabus)
Expand Down

0 comments on commit c47bbbe

Please sign in to comment.