Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Merge branch '2.6' into 2.7

* 2.6: (21 commits)
  [FrameworkBundle] Fix title and placeholder rendering in php form templates.
  [TwigBridge] Removed duplicated code from TwigRenderer
  [Translator][Logging] implement TranslatorBagInterface.
  RequestDataCollector - small fix
  renamed composer.phar to composer to be consistent with the Symfony docs
  [FrameworkBundle] bumped min version of Routing to 2.3
  removed composer --dev option everywhere
  fixed a test
  [Console] Fixed output bug, if escaped string in a formatted string.
  “console help” ignores --raw option
  Fix form icon position in web profiler
  [Security] Remove ContextListener's onKernelResponse listener as it is used
  Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
  Revert "fixed assertion"
  fixed assertion
  [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
  fixed URL
  Add reference to documentation in FormEvents phpdocs
  [YAML] Fix one-liners to work with multiple new lines
  Keep "pre" meaning for var_dump quick-and-dirty debug
  ...

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Security/Http/Firewall/ContextListener.php
	src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
latest commit 6fa94f258d
Fabien Potencier fabpot authored
..
Failed to load latest commit information.
AbstractAuthenticationListener.php [DX] Attempt to improve logging messages with parameters
AbstractPreAuthenticatedListener.php [DX] Attempt to improve logging messages with parameters
AccessListener.php Merge branch '2.6' into 2.7
AnonymousAuthenticationListener.php [DX] Attempt to improve logging messages with parameters
BasicAuthenticationListener.php [DX] Attempt to improve logging messages with parameters
ChannelListener.php [DX] Attempt to improve logging messages with parameters
ContextListener.php Merge branch '2.6' into 2.7
DigestAuthenticationListener.php [DX] Attempt to improve logging messages with parameters
ExceptionListener.php Merge branch '2.6' into 2.7
ListenerInterface.php
LogoutListener.php added type-hint
RememberMeListener.php [DX] Attempt to improve logging messages with parameters
RemoteUserAuthenticationListener.php added type-hint
SimpleFormAuthenticationListener.php added type-hint
SimplePreAuthenticationListener.php [DX] Attempt to improve logging messages with parameters
SwitchUserListener.php [DX] Attempt to improve logging messages with parameters
UsernamePasswordFormAuthenticationListener.php added type-hint
X509AuthenticationListener.php added type-hint
Something went wrong with that request. Please try again.