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.

Nicolas Grekas a7e5b4932e Merge branch '2.7' into 2.8 ... * 2.7: [travis] timeout the sigchild tests at 60s CS: Single line comments should use double slashes (//) and not hash (#). Do not use HttpKernel Extension when not needed for 2.7 Do not use HttpKernel Extension when not needed bumped Symfony version to 2.7.9 updated VERSION for 2.7.8 updated CHANGELOG for 2.7.8 bumped Symfony version to 2.3.37 updated VERSION for 2.3.36 update CONTRIBUTORS for 2.3.36 updated CHANGELOG for 2.3.36 Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"" Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)" use nowdoc instead of heredoc Conflicts: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Acl/Dbal/AclProvider.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php		2015-12-28 14:12:56 +01:00
..
Command	Merge branch '2.7' into 2.8	2015-12-28 14:12:56 +01:00
Descriptor	[Console] respect multi-character shortcuts	2015-06-26 23:20:39 +02:00
Fixtures	Merge branch '2.7' into 2.8	2015-12-22 11:25:57 +01:00
Formatter	Merge branch '2.3' into 2.7	2015-12-28 14:11:03 +01:00
Helper	Merge branch '2.7' into 2.8	2015-12-28 14:12:56 +01:00
Input	Merge branch '2.3' into 2.7	2015-12-05 18:37:09 +01:00
Logger	fixes CS	2015-08-24 09:13:45 +02:00
Output	Convert Output::write's type to an options arg where verbosity can be passed in as well	2015-09-12 23:35:49 +01:00
Style	[Console] Fix tests for SymfonyStyle	2015-09-30 15:35:30 +02:00
Tester	[Console] added some tests for previous merge (refs #8626)	2013-09-30 21:59:36 +02:00
ApplicationTest.php	Rely on iconv and symfony/polyfill-*	2015-10-28 03:15:07 +01:00