This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
symfony/src/Symfony/Bundle/FrameworkBundle
Nicolas Grekas eb179f9032 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] Towards 100% HHVM compat
  [Security/Http] Fix test
  [Stopwatch] Fix test
  Minor fixes
  Towards 100% HHVM compat
  unify default AccessDeniedExeption message
  trigger event with right user (add test)
  [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
  [Form] Fixed: Data mappers always receive forms indexed by their names

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-07-01 13:25:50 +02:00
..
CacheWarmer FIX #13919 added TranslationsCacheWarmer to generate catalogues at warmup 2015-03-31 14:07:52 +02:00
Command Merge remote-tracking branch 'origin/2.6' into 2.7 2015-06-25 12:52:11 +00:00
Console Merge branch '2.6' into 2.7 2015-05-15 15:53:44 +02:00
Controller Merge branch '2.6' into 2.7 2015-07-01 13:25:50 +02:00
DataCollector [WebProfilerBundle] Show AJAX requests in the symfony profiler toolbar 2014-09-23 17:52:02 +02:00
DependencyInjection Merge remote-tracking branch 'origin/2.6' into 2.7 2015-06-25 12:52:11 +00:00
EventListener [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
Fragment Silence invasive deprecation warnings, opt-in for warnings 2015-06-08 10:37:21 +01:00
HttpCache Silence invasive deprecation warnings, opt-in for warnings 2015-06-08 10:37:21 +01:00
Resources Fix choice translation domain for expanded choice widget 2015-06-29 21:23:41 +02:00
Routing Merge branch '2.6' into 2.7 2015-04-18 17:11:06 +02:00
Templating Added a small Upgrade note regarding security.context 2015-06-15 08:46:44 +02:00
Test fix missing links to https://symfony.com 2015-05-13 13:33:56 +02:00
Tests update type hint 2015-06-26 18:55:33 +02:00
Translation Merge branch '2.6' into 2.7 2015-05-15 15:33:16 +02:00
Validator [Validator] Removed legacy validator classes 2014-08-06 15:23:29 +02:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md FIX #13919 added TranslationsCacheWarmer to generate catalogues at warmup 2015-03-31 14:07:52 +02:00
Client.php tweaked phpdocs 2015-03-23 09:23:11 +01:00
composer.json [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands 2015-05-12 23:29:10 +02:00
FrameworkBundle.php renamed asset_path() to asset() and added a BC layer 2015-02-10 13:45:46 +01:00
phpunit.xml.dist [2.3] require-dev PHPUnit bridge 2015-02-24 11:24:26 +01:00