Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit b5d2fd82c3d1 · 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/Expression/Expression.php b/Expression/Expression.php
@@ -125,9 +125,9 @@ public function isGlob()
     }
 
     /**
-     * @throws \LogicException
-     *
      * @return Glob
+     *
+     * @throws \LogicException
      */
     public function getGlob()
     {
diff --git a/Finder.php b/Finder.php
@@ -133,10 +133,10 @@ public function useBestAdapter()
      *
      * @param string $name
      *
-     * @throws \InvalidArgumentException
-     *
      * @return Finder The current Finder instance
      *
+     * @throws \InvalidArgumentException
+     *
      * @deprecated since 2.8, to be removed in 3.0.
      */
     public function setAdapter($name)

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,9 @@ public function isGlob()`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/**`
`128`		`- * @throws \LogicException`
`129`		`- *`
`130`	`128`	`* @return Glob`
	`129`	`+ *`
	`130`	`+ * @throws \LogicException`
`131`	`131`	`*/`
`132`	`132`	`public function getGlob()`
`133`	`133`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,10 @@ public function useBestAdapter()`
`133`	`133`	`*`
`134`	`134`	`* @param string $name`
`135`	`135`	`*`
`136`		`- * @throws \InvalidArgumentException`
`137`		`- *`
`138`	`136`	`* @return Finder The current Finder instance`
`139`	`137`	`*`
	`138`	`+ * @throws \InvalidArgumentException`
	`139`	`+ *`
`140`	`140`	`* @deprecated since 2.8, to be removed in 3.0.`
`141`	`141`	`*/`
`142`	`142`	`public function setAdapter($name)`