Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit 56efce0fa251 · 2016-06-06T13:33:26.000+02:00
* 2.8: `@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: CHANGELOG-2.3.md src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php src/Symfony/Component/Config/Loader/FileLoader.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/Finder/Expression/Expression.php src/Symfony/Component/Finder/Finder.php src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -154,6 +154,8 @@ public function getKernel()
      * Gets the Surrogate instance.
      *
      * @return SurrogateInterface A Surrogate instance
+     *
+     * @throws \LogicException
      */
     public function getSurrogate()
     {

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,8 @@ public function getKernel()`
`154`	`154`	`* Gets the Surrogate instance.`
`155`	`155`	`*`
`156`	`156`	`* @return SurrogateInterface A Surrogate instance`
	`157`	`+ *`
	`158`	`+ * @throws \LogicException`
`157`	`159`	`*/`
`158`	`160`	`public function getSurrogate()`
`159`	`161`	`{`