Skip to content

Commit

Permalink
Merge branch '2.5'
Browse files Browse the repository at this point in the history 
* 2.5:
  [Doc] Use Markdown syntax highlighting
  [Finder] tweaked docs
  [Finder] Add info about possibilities offered by SplFileInfo
  fixed CS
  [Security][Http][Authentication] Make a test pass on HHVM
  fix components tests
  [Intl] FIxed failing test
  [Intl] Generated the data for ICU version 54-rc
  [EventDispatcher] fix doc bloc on EventDispatcherInterface
  [Validator] Update validators.zh_CN.xlf, fix translation error
  bumped Symfony version to 2.5.6
  updated VERSION for 2.5.5
  updated CHANGELOG for 2.5.5
  bumped Symfony version to 2.3.21
  updated VERSION for 2.3.20
  update CONTRIBUTORS for 2.3.20
  updated CHANGELOG for 2.3.20
  [Intl] Integrated ICU data into Intl component

Conflicts:
	src/Symfony/Component/Debug/README.md
	src/Symfony/Component/DependencyInjection/README.md
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/OptionsResolver/README.md
  • Loading branch information
@fabpot
fabpot committed Oct 1, 2014
2 parents 832c78f + cfd1ecf commit 6acf3e7
Show file tree
Hide file tree
Showing 1,086 changed files with 247,715 additions and 2,844 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Expand Up @@ -35,6 +35,6 @@ install:
- sh -c 'if [ "$components" = "no" ]; then sh -c "COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install"; fi;'

script:
- sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark {};'\''"; fi;'
- sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark,intl-data {};'\''"; fi;'
- sh -c 'if [ "$components" = "no" ]; then sh -c "echo "\""Running tests requiring tty"\""; phpunit --group tty"; fi;'
- sh -c 'if [ "$components" = "yes" ]; then sh -c "find src/Symfony -mindepth 3 -type f -name '\''phpunit.xml.dist'\'' | sed '\''s#\(.*\)/.*#\1#'\'' | parallel --gnu --keep-order '\''echo \"Running {} tests\"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark;'\''"; fi;'
- sh -c 'if [ "$components" = "yes" ]; then sh -c "find src/Symfony -mindepth 3 -type f -name '\''phpunit.xml.dist'\'' | sed '\''s#\(.*\)/.*#\1#'\'' | parallel --gnu --keep-order '\''echo \"Running {} tests\"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark,intl-data;'\''"; fi;'
31 changes: 31 additions & 0 deletions CHANGELOG-2.3.md
View file
Expand Up @@ -7,6 +7,37 @@ 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.20 (2014-09-28)

* bug #9453 [Form][DateTime] Propagate invalid_message & invalid_message_parameters to date & time (egeloen)
* bug #11058 [Security] bug #10242 Missing checkPreAuth from RememberMeAuthenticationProvider (glutamatt)
* bug #12004 [Form] Fixed ValidatorTypeGuesser to guess properties without constraints not to be required (webmozart)
* bug #11904 Make twig ExceptionController conformed with ExceptionListener (megazoll)
* bug #11924 [Form] Moved POST_MAX_SIZE validation from FormValidator to request handler (rpg600, webmozart)
* bug #11079 Response::isNotModified returns true when If-Modified-Since is later than Last-Modified (skolodyazhnyy)
* bug #11989 [Finder][Urgent] Remove asterisk and question mark from folder name in test to prevent windows file system issues. (Adam)
* bug #11908 [Translation] [Config] Clear libxml errors after parsing xliff file (pulzarraider)
* bug #11937 [HttpKernel] Make sure HttpCache is a trusted proxy (thewilkybarkid)
* bug #11970 [Finder] Escape location for regex searches (ymc-dabe)
* bug #11837 Use getPathname() instead of string casting to get BinaryFileReponse file path (nervo)
* bug #11513 [Translation] made XliffFileDumper support CDATA sections. (hhamon)
* bug #11907 [Intl] Improved bundle reader implementations (webmozart)
* bug #11874 [Console] guarded against non-traversable aliases (thierrymarianne)
* bug #11799 [YAML] fix handling of empty sequence items (xabbuh)
* bug #11906 [Intl] Fixed a few bugs in TextBundleWriter (webmozart)
* bug #11459 [Form][Validator] All index items after children are to be considered grand-children when resolving ViolationPath (Andrew Moore)
* bug #11715 [Form] FormBuilder::getIterator() now deals with resolved children (issei-m)
* bug #11892 [SwiftmailerBridge] Bump allowed versions of swiftmailer (ymc-dabe)
* bug #11918 [DependencyInjection] remove `service` parameter type from XSD (xabbuh)
* bug #11905 [Intl] Removed non-working $fallback argument from ArrayAccessibleResourceBundle (webmozart)
* bug #11497 Use separated function to resolve command and related arguments (JJK801)
* bug #11374 [DI] Added safeguards against invalid config in the YamlFileLoader (stof)
* bug #11897 [FrameworkBundle] Remove invalid markup (flack)
* bug #11860 [Security] Fix usage of unexistent method in DoctrineAclCache. (mauchede)
* bug #11850 [YAML] properly mask escape sequences in quoted strings (xabbuh)
* bug #11856 [FrameworkBundle] backport more error information from 2.6 to 2.3 (xabbuh)
* bug #11843 [Yaml] improve error message when detecting unquoted asterisks (xabbuh)

* 2.3.19 (2014-09-03)

* security #11832 CVE-2014-6072 (fabpot)
Expand Down
39 changes: 39 additions & 0 deletions CHANGELOG-2.5.md
View file
Expand Up @@ -7,6 +7,45 @@ in 2.5 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.5.0...v2.5.1

* 2.5.5 (2014-09-28)

* bug #12016 [Validator] Added ConstraintValidator::buildViolation() helper for BC with the 2.4 API (webmozart)
* bug #12031 [Validator] Fixed LegacyValidator when only a constraint is validated (webmozart)
* bug #9453 [Form][DateTime] Propagate invalid_message & invalid_message_parameters to date & time (egeloen)
* bug #12030 Fix expression language in the container when using the "container" variable (fabpot)
* bug #12032 [Command] Set the process title as late as possible (lyrixx)
* bug #11058 [Security] bug #10242 Missing checkPreAuth from RememberMeAuthenticationProvider (glutamatt)
* bug #12004 [Form] Fixed ValidatorTypeGuesser to guess properties without constraints not to be required (webmozart)
* bug #11904 Make twig ExceptionController conformed with ExceptionListener (megazoll)
* bug #11924 [Form] Moved POST_MAX_SIZE validation from FormValidator to request handler (rpg600, webmozart)
* bug #12002 [Security] [Firewall] Bug fixed in SimplePreAuthenticationListener when createToken() not return TokenInterface object (adenkejawen, fabpot)
* bug #11079 Response::isNotModified returns true when If-Modified-Since is later than Last-Modified (skolodyazhnyy)
* bug #11989 [Finder][Urgent] Remove asterisk and question mark from folder name in test to prevent windows file system issues. (Adam)
* bug #11908 [Translation] [Config] Clear libxml errors after parsing xliff file (pulzarraider)
* bug #11839 [FrameworkBundle] check if the Validator component is present when forms are enabled (xabbuh)
* bug #11418 [JsonResponse] Silent only JSON errors (GromNaN)
* bug #11937 [HttpKernel] Make sure HttpCache is a trusted proxy (thewilkybarkid)
* bug #11970 [Finder] Escape location for regex searches (ymc-dabe)
* bug #11837 Use getPathname() instead of string casting to get BinaryFileReponse file path (nervo)
* bug #11513 [Translation] made XliffFileDumper support CDATA sections. (hhamon)
* bug #11928 [Validator] The ratio of the ImageValidator is rounded to two decimals now (webmozart)
* bug #11907 [Intl] Improved bundle reader implementations (webmozart)
* bug #11874 [Console] guarded against non-traversable aliases (thierrymarianne)
* bug #11799 [YAML] fix handling of empty sequence items (xabbuh)
* bug #11906 [Intl] Fixed a few bugs in TextBundleWriter (webmozart)
* bug #11459 [Form][Validator] All index items after children are to be considered grand-children when resolving ViolationPath (Andrew Moore)
* bug #11715 [Form] FormBuilder::getIterator() now deals with resolved children (issei-m)
* bug #11892 [SwiftmailerBridge] Bump allowed versions of swiftmailer (ymc-dabe)
* bug #11918 [DependencyInjection] remove `service` parameter type from XSD (xabbuh)
* bug #11905 [Intl] Removed non-working $fallback argument from ArrayAccessibleResourceBundle (webmozart)
* bug #11497 Use separated function to resolve command and related arguments (JJK801)
* bug #11374 [DI] Added safeguards against invalid config in the YamlFileLoader (stof)
* bug #11897 [FrameworkBundle] Remove invalid markup (flack)
* bug #11860 [Security] Fix usage of unexistent method in DoctrineAclCache. (mauchede)
* bug #11850 [YAML] properly mask escape sequences in quoted strings (xabbuh)
* bug #11856 [FrameworkBundle] backport more error information from 2.6 to 2.3 (xabbuh)
* bug #11843 [Yaml] improve error message when detecting unquoted asterisks (xabbuh)

* 2.5.4 (2014-09-03)

* security #11832 CVE-2014-6072 (fabpot)
Expand Down

0 comments on commit 6acf3e7

Please sign in to comment.