Commit Graph

14 Commits

Author SHA1 Message Date
Nicolas Grekas 6f390d45e3 Merge branch '2.8' into 3.1
* 2.8:
  Relax 1 test failing with latest PHP versions
  bumped Symfony version to 2.8.10
  Remove usage of __CLASS__ outside of a class
  [HttpKernel] Fix variable conflicting name
  [Process] Fix double-fread() when reading unix pipes
  [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least)
  [Validator] Fix dockblock typehint in XmlFileLoader
  bumped Symfony version to 2.8.10
  updated VERSION for 2.8.9
  updated CHANGELOG for 2.8.9
  bumped Symfony version to 2.7.17
  updated VERSION for 2.7.16
  update CONTRIBUTORS for 2.7.16
  updated CHANGELOG for 2.7.16
  Minor fixes
  [Console] Overcomplete argument exception message tweak.
  fixed bad auto merge
  Console table cleanup
  undefined offset fix (#19406)
  [EventDispatcher] Removed unused variable

Conflicts:
	CHANGELOG-2.7.md
	CHANGELOG-3.0.md
	src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
	src/Symfony/Component/Console/Tests/Helper/TableTest.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php
	src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
2016-08-05 10:37:39 +02:00
Fabien Potencier 7e24dff661 updated CHANGELOG for 3.0.8 2016-06-30 18:30:10 +02:00
Nicolas Grekas a7ed68b38f Merge branch '2.8' into 3.0
* 2.8: (22 commits)
  Fix merge
  [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
  [Console] fixed PHPDoc
  [travis] HHVM 3.12 LTS
  Fix feature detection for IE
  [Form] Fixed collapsed choice attributes
  [Console] added explanation of messages usage in a progress bar
  force enabling the external XML entity loaders
  [Yaml] properly count skipped comment lines
  [WebProfilerBundle] Fix invalid CSS style
  Added progressive jpeg to mime types guesser
  [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
  Fixed singular of committee
  Do not inject web debug toolbar on attachments
  bumped Symfony version to 2.8.8
  updated VERSION for 2.8.7
  updated CHANGELOG for 2.8.7
  bumped Symfony version to 2.7.15
  updated VERSION for 2.7.14
  update CONTRIBUTORS for 2.7.14
  ...

Conflicts:
	CHANGELOG-2.7.md
	CHANGELOG-3.0.md
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/HttpKernel/Kernel.php
2016-06-14 13:04:19 +02:00
Fabien Potencier bde636a0dc updated CHANGELOG for 3.0.7 2016-06-06 18:52:28 +02:00
Fabien Potencier 4f8c89d1be updated CHANGELOG for 3.0.6 2016-05-09 17:12:58 -05:00
Fabien Potencier feae3e5c5f updated CHANGELOG for 3.0.5 2016-05-03 07:58:20 +02:00
Andrew Murray ba64d7bb0d Fixed typo 2016-05-01 05:15:06 +02:00
Fabien Potencier e1926f4d28 updated CHANGELOG for 3.0.4 2016-03-30 13:34:52 +02:00
Fabien Potencier 6c08bfb9be updated CHANGELOG for 3.0.3 2016-02-28 22:33:06 +01:00
Fabien Potencier beea262266 updated CHANGELOG for 3.0.2 2016-02-03 13:38:37 +01:00
Fabien Potencier 9dda04c238 updated CHANGELOG for 3.0.1 2015-12-26 17:46:07 +01:00
Fabien Potencier a882401dd2 updated CHANGELOG for 3.0.0 2015-11-30 21:59:12 +01:00
Fabien Potencier af74da51b3 updated CHANGELOG for 3.0.0 2015-11-30 21:58:04 +01:00
Fabien Potencier 803c8f10ad updated CHANGELOG for 3.0.0-BETA1 2015-11-16 15:06:50 +01:00