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/HttpKernel/DependencyInjection
Nicolas Grekas c4716d2511 Merge branch '2.7' into 2.8
* 2.7:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
	src/Symfony/Component/Security/Acl/Model/AclInterface.php
	src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
	src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2016-06-06 13:11:27 +02:00
..
AddClassesToCachePass.php made {@inheritdoc} annotations consistent across the board 2014-04-16 09:04:20 +02:00
ConfigurableExtension.php [DependencyInjection] improved a comment for reading fluency 2015-09-30 09:41:34 +02:00
ContainerAwareHttpKernel.php Merge branch '2.3' into 2.7 2016-06-06 10:55:42 +02:00
Extension.php [DI] Add a base class for extension 2012-12-06 15:41:32 +01:00
FragmentRendererPass.php Don't use reflections when possible 2016-03-05 18:34:36 +01:00
LazyLoadingFragmentHandler.php [HttpKernel] Fix RequestStack argument position and deprecated behavior 2015-09-10 12:52:08 +02:00
MergeExtensionConfigurationPass.php updated license blocks 2012-03-31 18:00:32 -03:00
RegisterListenersPass.php Silence invasive deprecation warnings, opt-in for warnings 2015-06-08 10:37:21 +01:00