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.

Fabien Potencier 3928ed5fce Merge branch '2.3' into 2.6 ... * 2.3: [DependencyInjection] Removed extra strtolower calls [Validator] Fixed Choice when an empty array is used in the "choices" option Fixed tests [StringUtil] Fixed singularification of 'selfies' Fix Portuguese (Portugal) translation for Security improved exception when missing required component CS: unalign = Show a better error when the port is in use CS: unalign => [FrameworkBundle] Check for 'xlf' instead of 'xliff' Add better phpdoc message for getListeners method of the EventDispatcher Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php src/Symfony/Component/Validator/Constraints/ChoiceValidator.php		2015-04-27 14:43:05 +02:00
..
DumpTokenParser.php	[DebugBundle] adjust after review	2014-09-23 16:25:59 +02:00
FormThemeTokenParser.php	fixed phpdoc @param alignment	2012-05-15 22:19:31 +02:00
StopwatchTokenParser.php	change the stopwatch argument to be any valid expression	2013-08-12 08:31:36 +02:00
TransChoiceTokenParser.php	CS: unalign =	2015-04-22 09:13:42 +02:00
TransDefaultDomainTokenParser.php	fixed phpdoc @param alignment	2012-05-15 22:19:31 +02:00
TransTokenParser.php	CS: unalign =	2015-04-22 09:13:42 +02:00