Skip to content

Commit

Permalink
Merge branch '2.4' into 2.5
Browse files Browse the repository at this point in the history
* 2.4:
  updated VERSION for 2.4.7
  updated CHANGELOG for 2.4.7
  bumped Symfony version to 2.3.18
  updated VERSION for 2.3.17
  update CONTRIBUTORS for 2.3.17
  updated CHANGELOG for 2.3.17
  added XSD to PHPUnit configuration
  add missing docblock for ProcessBuilder::addEnvironmentVariables()
  bug symfony#11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
  [Translation] Added unescaping of ids in PoFileLoader
  updated italian translation for validation messages
  [DomCrawler] Fix docblocks and formatting.
  [DomCrawler] Remove the query string and the anchor of the uri of a link
  Simplified the Travis test command
  Remove Expression Language services when the component is unavailable
  [Console] Make sure formatter is the same

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
  • Loading branch information
fabpot committed Jul 8, 2014
2 parents 605a533 + e72f9eb commit 47c686d
Show file tree
Hide file tree
Showing 53 changed files with 395 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ before_script:
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'

script:
- ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};' || false
- ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};'
- echo "Running tests requiring tty"; phpunit --group tty
22 changes: 22 additions & 0 deletions CHANGELOG-2.3.md
Original file line number Diff line number Diff line change
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.17 (2014-07-07)

* bug #11238 [Translation] Added unescaping of ids in PoFileLoader (JustBlackBird)
* bug #11194 [DomCrawler] Remove the query string and the anchor of the uri of a link (benja-M-1)
* bug #11272 [Console] Make sure formatter is the same. (akimsko)
* bug #11259 [Config] Fixed failed config schema loads due to libxml_disable_entity_loader usage (ccorliss)
* bug #11234 [ClassLoader] fixed PHP warning on PHP 5.3 (fabpot)
* bug #11179 [Process] Fix ExecutableFinder with open basedir (cs278)
* bug #11242 [CssSelector] Refactored the CssSelector to remove the circular object graph (stof)
* bug #11219 [DomCrawler] properly handle buttons with single and double quotes insid... (xabbuh)
* bug #11220 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process (xabbuh)
* bug #11186 Added missing `break` statement (apfelbox)
* bug #11169 [Console] Fixed notice in DialogHelper (florianv)
* bug #11144 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6 (kicken)
* bug #10966 PHP Fatal error when getContainer method of ContainerAwareCommand has be... (kevinvergauwen)
* bug #10981 [HttpFoundation] Fixed isSecure() check to be compliant with the docs (Jannik Zschiesche)
* bug #11092 [HttpFoundation] Fix basic authentication in url with PHP-FPM (Kdecherf)
* bug #10808 [DomCrawler] Empty select with attribute name="foo[]" bug fix (darles)
* bug #11063 [HttpFoundation] fix switch statement (Tobion)
* bug #11009 [HttpFoundation] smaller fixes for PdoSessionHandler (Tobion)
* bug #11041 Remove undefined variable $e (skydiablo)

* 2.3.16 (2014-05-31)

* bug #11014 [Validator] Remove property and method targets from the optional and required constraints (jakzal)
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG-2.4.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,29 @@ in 2.4 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.4.0...v2.4.1

* 2.4.7 (2014-07-08)

* bug #11283 [SecurityBundle] Remove Expression Language services when the component is unavailable (thewilkybarkid)
* bug #11238 [Translation] Added unescaping of ids in PoFileLoader (JustBlackBird)
* bug #11194 [DomCrawler] Remove the query string and the anchor of the uri of a link (benja-M-1)
* bug #11272 [Console] Make sure formatter is the same. (akimsko)
* bug #11259 [Config] Fixed failed config schema loads due to libxml_disable_entity_loader usage (ccorliss)
* bug #11234 [ClassLoader] fixed PHP warning on PHP 5.3 (fabpot)
* bug #11179 [Process] Fix ExecutableFinder with open basedir (cs278)
* bug #11242 [CssSelector] Refactored the CssSelector to remove the circular object graph (stof)
* bug #11219 [DomCrawler] properly handle buttons with single and double quotes insid... (xabbuh)
* bug #11220 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process (xabbuh)
* bug #11186 Added missing `break` statement (apfelbox)
* bug #11169 [Console] Fixed notice in DialogHelper (florianv)
* bug #11144 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6 (kicken)
* bug #10966 PHP Fatal error when getContainer method of ContainerAwareCommand has be... (kevinvergauwen)
* bug #10981 [HttpFoundation] Fixed isSecure() check to be compliant with the docs (Jannik Zschiesche)
* bug #11092 [HttpFoundation] Fix basic authentication in url with PHP-FPM (Kdecherf)
* bug #10808 [DomCrawler] Empty select with attribute name="foo[]" bug fix (darles)
* bug #11063 [HttpFoundation] fix switch statement (Tobion)
* bug #11009 [HttpFoundation] smaller fixes for PdoSessionHandler (Tobion)
* bug #11041 Remove undefined variable $e (skydiablo)

* 2.4.6 (2014-05-31)

* bug #11014 [Validator] Remove property and method targets from the optional and required constraints (jakzal)
Expand Down
Loading

0 comments on commit 47c686d

Please sign in to comment.