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.
eabc9b8901
symfony/src/Symfony/Bundle/FrameworkBundle
History
Fabien Potencier eabc9b8901 Merge branch '2.5' into 2.6 
* 2.5:
  [WIP] Made help information of commands more consistent
  Made help information consistent

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
2015-01-06 18:50:02 +01:00
..
CacheWarmer Fixes various phpdoc and coding standards. 2015-01-02 09:58:20 +01:00
Command Merge branch '2.5' into 2.6 2015-01-06 18:50:02 +01:00
Console minor #13274 [2.6] Added internal annotation on Descriptor classes (saro0h) 2015-01-06 07:49:44 +01:00
Controller Merge branch '2.5' into 2.6 2015-01-03 09:01:59 +01:00
DataCollector [WebProfilerBundle] Show AJAX requests in the symfony profiler toolbar 2014-09-23 17:52:02 +02:00
DependencyInjection Merge branch '2.5' into 2.6 2014-12-24 08:11:54 +01:00
EventListener unified return null usages 2014-04-18 22:38:54 +02: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.5' into 2.6 2015-01-03 09:01:59 +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 [2.6] fix deprecation silencing... 2015-01-05 18:41:06 +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] forward error reporting level to insulated Client 2014-12-23 08:41:15 +01:00
composer.json Merge branch '2.5' into 2.6 2015-01-05 21:59:13 +01:00
FrameworkBundle.php [Debug] DI controllable ErrorHandler::register() 2014-10-28 11:06:58 +01:00
phpunit.xml.dist [Tests] Silenced all deprecations in tests for 2.3 2014-12-18 20:00:19 +01:00