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.
symfony/src/Symfony/Component/DependencyInjection/Loader
Nicolas Grekas 1f7a6935f8 Merge branch '2.8' into 3.0
* 2.8:
  [Process] Fix transient tests for incremental outputs
  [Console] Add missing `@require` annotation in test
  Fix merge
  [appveyor] Fix failure reporting
  [#17634] move DebugBundle license file
  backport GlobTest from 2.7 branch
  Move licenses according to new best practices
  [FrameworkBundle] Remove unused code in test
  [2.3] Fixed an undefined variable in Glob::toRegex
  simplified a test
  fix container cache key generation
  [Form] fix option name in upgrade file
  [Form] fix option name in changelog
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()

Conflicts:
	UPGRADE-2.8.md
2016-02-02 14:44:19 +01:00
..
schema/dic/services Merge branch '2.8' into 3.0 2016-02-02 14:44:19 +01:00
ClosureLoader.php [DependencyInjection] use inheritdoc for loaders 2014-10-13 21:10:53 +02:00
DirectoryLoader.php Added CHANGELOG entries, cleanups 2015-06-02 16:18:00 -07:00
FileLoader.php [DependencyInjection] use inheritdoc for loaders 2014-10-13 21:10:53 +02:00
IniFileLoader.php [DependencyInjection] use inheritdoc for loaders 2014-10-13 21:10:53 +02:00
PhpFileLoader.php [DependencyInjection] use inheritdoc for loaders 2014-10-13 21:10:53 +02:00
XmlFileLoader.php Merge branch '2.8' into 3.0 2016-02-02 14:44:19 +01:00
YamlFileLoader.php Merge branch '2.8' into 3.0 2016-02-02 14:44:19 +01:00