diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
c4716d2511
symfony/src/Symfony/Component
History
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
..
Asset Merge branch '2.7' into 2.8 2016-05-13 10:38:45 -05:00
BrowserKit Merge branch '2.7' into 2.8 2016-03-04 08:54:35 +01:00
ClassLoader Merge branch '2.7' into 2.8 2016-03-30 12:37:34 +02:00
Config Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Console Merge branch '2.7' into 2.8 2016-06-03 13:06:57 +02:00
CssSelector Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Debug Merge branch '2.7' into 2.8 2016-05-24 12:00:02 +02:00
DependencyInjection Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
DomCrawler Merge branch '2.7' into 2.8 2016-04-12 20:01:21 +02:00
EventDispatcher Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
ExpressionLanguage Merge branch '2.7' into 2.8 2016-03-07 15:04:32 +01:00
Filesystem Merge branch '2.7' into 2.8 2016-04-12 20:01:21 +02:00
Finder Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Form Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
HttpFoundation Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
HttpKernel Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Intl Merge branch '2.7' into 2.8 2016-05-13 10:38:45 -05:00
Ldap [LDAP] Free the search result after a search to free memory 2016-04-12 11:43:13 +02:00
Locale Merge branch '2.7' into 2.8 2016-03-04 08:54:35 +01:00
OptionsResolver Merge branch '2.7' into 2.8 2016-05-24 12:00:02 +02:00
Process Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
PropertyAccess Merge branch '2.7' into 2.8 2016-05-29 11:49:47 +02:00
PropertyInfo [PropertyInfo] PHPDoc correction 2016-05-02 22:41:39 +02:00
Routing Merge branch '2.7' into 2.8 2016-05-30 08:57:11 +02:00
Security @throws annotations should go after @return 2016-06-06 13:03:51 +02:00
Serializer Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Stopwatch Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Templating [2.8] fix mocks 2016-03-27 11:27:49 +02:00
Translation Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00
Validator Replace iconv_*() uses by mb_*(), add mbstring polyfill when required 2016-04-14 10:48:44 +02:00
VarDumper Merge branch '2.7' into 2.8 2016-05-24 12:00:02 +02:00
Yaml Merge branch '2.7' into 2.8 2016-06-06 13:11:27 +02:00