Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 4c85da8e6764 · 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/DependencyInjection/ContainerAwareHttpKernel.php b/DependencyInjection/ContainerAwareHttpKernel.php
@@ -71,6 +71,11 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
             $this->container->set('request', null, 'request');
             $this->container->leaveScope('request');
 
+            throw $e;
+        } catch (\Throwable $e) {
+            $this->container->set('request', null, 'request');
+            $this->container->leaveScope('request');
+
             throw $e;
         }
 
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -153,9 +153,9 @@ public function getKernel()
     /**
      * Gets the Surrogate instance.
      *
-     * @throws \LogicException
-     *
      * @return SurrogateInterface A Surrogate instance
+     *
+     * @throws \LogicException
      */
     public function getSurrogate()
     {
@@ -169,10 +169,10 @@ public function getSurrogate()
     /**
      * Gets the Esi instance.
      *
-     * @throws \LogicException
-     *
      * @return Esi An Esi instance
      *
+     * @throws \LogicException
+     *
      * @deprecated since version 2.6, to be removed in 3.0. Use getSurrogate() instead
      */
     public function getEsi()

Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,9 @@ public function getKernel()`
`153`	`153`	`/**`
`154`	`154`	`* Gets the Surrogate instance.`
`155`	`155`	`*`
`156`		`- * @throws \LogicException`
`157`		`- *`
`158`	`156`	`* @return SurrogateInterface A Surrogate instance`
	`157`	`+ *`
	`158`	`+ * @throws \LogicException`
`159`	`159`	`*/`
`160`	`160`	`public function getSurrogate()`
`161`	`161`	`{`
`@@ -169,10 +169,10 @@ public function getSurrogate()`
`169`	`169`	`/**`
`170`	`170`	`* Gets the Esi instance.`
`171`	`171`	`*`
`172`		`- * @throws \LogicException`
`173`		`- *`
`174`	`172`	`* @return Esi An Esi instance`
`175`	`173`	`*`
	`174`	`+ * @throws \LogicException`
	`175`	`+ *`
`176`	`176`	`* @deprecated since version 2.6, to be removed in 3.0. Use getSurrogate() instead`
`177`	`177`	`*/`
`178`	`178`	`public function getEsi()`