Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit a2edd59c2163 · 2016-06-06T13:11:27.000+02:00
* 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
diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -113,6 +113,9 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
             } catch (\Exception $e) {
                 unset(self::$loading[$resource]);
                 throw $e;
+            } catch (\Throwable $e) {
+                unset(self::$loading[$resource]);
+                throw $e;
             }
 
             unset(self::$loading[$resource]);

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe`
`113`	`113`	`} catch (\Exception $e) {`
`114`	`114`	`unset(self::$loading[$resource]);`
`115`	`115`	`throw $e;`
	`116`	`+ } catch (\Throwable $e) {`
	`117`	`+ unset(self::$loading[$resource]);`
	`118`	`+ throw $e;`
`116`	`119`	`}`
`117`	`120`
`118`	`121`	`unset(self::$loading[$resource]);`