diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,677 Commits 24 Branches 563 Tags 225 MiB
Commit Graph

14 Commits

Author SHA1 Message Date
Nicolas Grekas 3726aa15dd Merge branch '3.0' into 3.1 
* 3.0:
  [travis] Fix deps=low/high builds
  fixed CS
  skip test with current phpunit bridge
  Fix for #19183 to add support for new PHP MongoDB extension in sessions.
  [Console] Fix for block() padding formatting after #19189
  [Security][Guard] check if session exist before using it
  bumped Symfony version to 3.0.9
  updated VERSION for 3.0.8
  updated CHANGELOG for 3.0.8
  bumped Symfony version to 2.8.9
  updated VERSION for 2.8.8
  updated CHANGELOG for 2.8.8
  bumped Symfony version to 2.7.16
  updated VERSION for 2.7.15
  update CONTRIBUTORS for 2.7.15
  updated CHANGELOG for 2.7.15
  Fix some lowest deps
  Fixed typos in the expectedException annotations

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Guard/Authenticator/AbstractFormLoginAuthenticator.php
 2016-07-01 18:00:00 +02:00
Nicolas Grekas 58c8b71320 Merge branch '2.8' into 3.0 
* 2.8:
  [travis] Fix deps=low/high builds
  fixed CS
  skip test with current phpunit bridge
  Fix for #19183 to add support for new PHP MongoDB extension in sessions.
  [Console] Fix for block() padding formatting after #19189
  [Security][Guard] check if session exist before using it
  bumped Symfony version to 2.8.9
  updated VERSION for 2.8.8
  updated CHANGELOG for 2.8.8
  bumped Symfony version to 2.7.16
  updated VERSION for 2.7.15
  update CONTRIBUTORS for 2.7.15
  updated CHANGELOG for 2.7.15
  Fix some lowest deps
  Fixed typos in the expectedException annotations

Conflicts:
	CHANGELOG-2.7.md
	CHANGELOG-3.0.md
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Yaml/Tests/ParserTest.php
 2016-07-01 17:14:41 +02:00
Nicolas Grekas 72fd0b82c5 [travis] Fix deps=low/high builds 2016-07-01 16:56:05 +02:00
Nicolas Grekas e86cbbf38b Merge branch '3.0' into 3.1 
* 3.0:
  [travis] fix
 2016-06-30 12:07:58 +02:00
Nicolas Grekas ecc03f5ae7 Merge branch '2.8' into 3.0 
* 2.8:
  [travis] fix

Conflicts:
	.github/travis.php
 2016-06-30 12:07:39 +02:00
Fabien Potencier 080962f7ac Merge branch '3.0' into 3.1 
* 3.0:
  [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
  [HttpKernel] Move conflicting origin IPs handling to catch block
  [travis] Fix deps=low/high patching
 2016-06-30 11:40:26 +02:00
Fabien Potencier 9c0ca1948e Merge branch '2.8' into 3.0 
* 2.8:
  [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
  [HttpKernel] Move conflicting origin IPs handling to catch block
  [travis] Fix deps=low/high patching
 2016-06-30 11:37:32 +02:00
Nicolas Grekas 8712d54d8a [travis] fix 2016-06-30 11:22:01 +02:00
Nicolas Grekas 5ec92e8af3 [travis] Fix deps=low/high patching 2016-06-30 08:35:34 +02:00
Robin Chalas 71dcaa14c9 Add 3.1 to PR template branch row, remove 2.3 2016-06-01 21:19:49 +02:00
Javier Eguiluz 6af23ccaaa Improved the "branch" row of the PR table 2016-03-13 12:02:32 +01:00
Nicolas Grekas 852f9994ad Update contributing docs 2016-02-24 15:36:06 +01:00
Alex Rock Ancelet a2780357ca Simplify markdown for PR template 2016-02-19 16:05:47 +01:00
Colin O'Dell ac8f8f8964 Create PULL_REQUEST_TEMPLATE.md 2016-02-18 08:17:38 +01:00