Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit 4a0b15831468 · 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/Routing/DelegatingLoader.php b/Routing/DelegatingLoader.php
@@ -78,7 +78,7 @@ public function load($resource, $type = null)
             if ($controller = $route->getDefault('_controller')) {
                 try {
                     $controller = $this->parser->parse($controller);
-                } catch (\Exception $e) {
+                } catch (\InvalidArgumentException $e) {
                     // unable to optimize unknown notation
                 }
 
diff --git a/Translation/PhpExtractor.php b/Translation/PhpExtractor.php
@@ -182,9 +182,9 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
     /**
      * @param string $file
      *
-     * @throws \InvalidArgumentException
-     *
      * @return bool
+     *
+     * @throws \InvalidArgumentException
      */
     protected function canBeExtracted($file)
     {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function load($resource, $type = null)`
`78`	`78`	`if ($controller = $route->getDefault('_controller')) {`
`79`	`79`	`try {`
`80`	`80`	`$controller = $this->parser->parse($controller);`
`81`		`- } catch (\Exception $e) {`
	`81`	`+ } catch (\InvalidArgumentException $e) {`
`82`	`82`	`// unable to optimize unknown notation`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,9 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)`
`182`	`182`	`/**`
`183`	`183`	`* @param string $file`
`184`	`184`	`*`
`185`		`- * @throws \InvalidArgumentException`
`186`		`- *`
`187`	`185`	`* @return bool`
	`186`	`+ *`
	`187`	`+ * @throws \InvalidArgumentException`
`188`	`188`	`*/`
`189`	`189`	`protected function canBeExtracted($file)`
`190`	`190`	`{`