diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
fc009c16d7
symfony/src/Symfony/Bundle/FrameworkBundle
History
Nicolas Grekas fc009c16d7 Merge branch '2.3' into 2.6 
* 2.3:
  Changed visibility of setUp() and tearDown to protected
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Config/Util/XmlUtils.php
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Yaml/Inline.php
2015-03-12 11:28:44 +01:00
..
CacheWarmer Fixes various phpdoc and coding standards. 2015-01-02 09:58:20 +01:00
Command Php Inspections (EA Extended) - static code analysis includes: 2015-03-07 20:12:23 +01:00
Console Merge branch '2.3' into 2.6 2015-02-24 12:52:21 +01:00
Controller [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver 2015-02-02 15:24:27 +02:00
DataCollector [WebProfilerBundle] Show AJAX requests in the symfony profiler toolbar 2014-09-23 17:52:02 +02:00
DependencyInjection Merge branch '2.3' into 2.6 2015-03-07 08:40:15 +01:00
EventListener [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
Fragment [HttpKernel] added escaping for hx:include tag attributes 2013-03-29 05:29:22 +01:00
HttpCache SSI support 2014-06-18 11:11:19 +02:00
Resources Merge branch '2.3' into 2.6 2015-02-11 08:12:14 +01:00
Routing Merge branch '2.3' into 2.5 2014-10-26 08:41:27 +01:00
Templating Merge branch '2.5' into 2.6 2015-01-03 09:01:59 +01:00
Test fix phpdoc's alignment 2014-12-09 19:18:22 +01:00
Tests Merge branch '2.3' into 2.6 2015-03-12 11:28:44 +01:00
Translation Merge branch '2.5' into 2.6 2014-12-22 17:44:09 +01: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 add changelog entry for web server commands 2014-10-09 12:52:43 +02:00
Client.php [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients 2015-02-24 17:59:59 +01:00
composer.json [FrameworkBundle] simplify dep declaration 2015-03-06 22:21:22 +01:00
FrameworkBundle.php [Debug] DI controllable ErrorHandler::register() 2014-10-28 11:06:58 +01:00
phpunit.xml.dist [2.3] require-dev PHPUnit bridge 2015-02-24 11:24:26 +01:00