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
Nicolas Grekas a249f5d582 Merge branch '3.0' into 3.1
* 3.0:
  `@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/Yaml/Tests/InlineTest.php
2016-06-06 13:42:41 +02:00
..
Asset Merge branch '3.0' 2016-05-13 13:06:41 -05:00
BrowserKit Merge branch '3.0' 2016-03-04 08:56:56 +01:00
Cache [Cache] Drop counting hit/miss in ProxyAdapter 2016-05-25 09:47:04 +02:00
ClassLoader Merge branch '3.0' 2016-03-30 12:41:47 +02:00
Config Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Console Merge branch '3.0' into 3.1 2016-06-03 13:12:53 +02:00
CssSelector Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
Debug Merge branch '3.0' into 3.1 2016-05-24 12:06:56 +02:00
DependencyInjection Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
DomCrawler feature #18184 [DomCrawler] Expose getter for uri (hason) 2016-05-13 10:49:09 -05:00
EventDispatcher Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
ExpressionLanguage Merge branch '3.0' 2016-03-10 12:16:56 +01:00
Filesystem Merge branch '3.0' 2016-04-12 20:27:47 +02:00
Finder Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Form Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
HttpFoundation Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
HttpKernel Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
Inflector Added people - person inflection 2016-05-23 11:06:27 +02:00
Intl Merge branch '3.0' 2016-05-13 13:06:41 -05:00
Ldap Added the possibility to configure all Ldap options for connection 2016-05-13 18:20:58 +02:00
OptionsResolver Merge branch '2.7' into 2.8 2016-05-24 12:00:02 +02:00
Process Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
PropertyAccess Merge branch '3.0' into 3.1 2016-05-29 11:50:31 +02:00
PropertyInfo Merge branch '3.0' 2016-05-03 14:24:23 +02:00
Routing Merge branch '3.0' into 3.1 2016-05-30 08:58:39 +02:00
Security @throws annotations should go after @return 2016-06-06 13:03:51 +02:00
Serializer Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
Stopwatch Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
Templating Merge branch '3.0' 2016-03-27 18:15:51 +02:00
Translation Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00
Validator Merge branch '3.0' into 3.1 2016-05-24 12:06:56 +02:00
VarDumper Merge branch '3.0' into 3.1 2016-05-24 12:06:56 +02:00
Yaml Merge branch '3.0' into 3.1 2016-06-06 13:42:41 +02:00