Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 360f3330e1df · 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/NodeVisitor/Scope.php b/NodeVisitor/Scope.php
@@ -67,9 +67,9 @@ public function leave()
      * @param string $key
      * @param mixed  $value
      *
-     * @throws \LogicException
-     *
      * @return Scope Current scope
+     *
+     * @throws \LogicException
      */
     public function set($key, $value)
     {

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ public function leave()`
`67`	`67`	`* @param string $key`
`68`	`68`	`* @param mixed $value`
`69`	`69`	`*`
`70`		`- * @throws \LogicException`
`71`		`- *`
`72`	`70`	`* @return Scope Current scope`
	`71`	`+ *`
	`72`	`+ * @throws \LogicException`
`73`	`73`	`*/`
`74`	`74`	`public function set($key, $value)`
`75`	`75`	`{`