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 0191aa24bb Merge branch '2.3' into 2.6 ... * 2.3: [Routing][DependencyInjection] Support .yaml extension in YAML loaders [DX] improve file loader error for router/other resources in bundle [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors [HttpKernel] Cleanup ExceptionListener CS fixes [DependencyInjection] Show better error when the Yaml component is not installed [2.3] SCA for Components - reference mismatches [2.3] Static Code Analysis for Components [Translation][fixed test] refresh cache when resources are no longer fresh. [Validator] Added missing Simplified Chinese (zh_CN) translations [FrameworkBundle] Workaround php -S ignoring auto_prepend_file Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php src/Symfony/Component/Config/Exception/FileLoaderLoadException.php src/Symfony/Component/Console/Descriptor/TextDescriptor.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Yaml/Tests/InlineTest.php		2015-04-18 17:02:51 +02:00
..
Definition	Merge branch '2.3' into 2.6	2015-03-27 11:19:51 +01:00
Exception	Merge branch '2.3' into 2.6	2015-04-18 17:02:51 +02:00
Fixtures	Merge branch '2.3' into 2.6	2015-03-22 17:55:57 +01:00
Loader	Fix phpdoc and coding standards	2014-12-29 23:41:34 +01:00
Resource	minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource	2015-02-19 17:18:47 +03:00
Util	Merge branch '2.3' into 2.5	2014-12-23 18:36:02 +01:00
ConfigCacheTest.php	Changed visibility of setUp() and tearDown to protected	2015-03-11 19:52:02 +01:00
FileLocatorTest.php	[Config] fix filelocator with empty name	2014-10-13 20:50:59 +02:00