Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 9a0b26493282 · 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/Parser/Parser.php b/Parser/Parser.php
@@ -58,9 +58,9 @@ public function parse($source)
      *
      * @param Token[] $tokens
      *
-     * @throws SyntaxErrorException
-     *
      * @return array
+     *
+     * @throws SyntaxErrorException
      */
     public static function parseSeries(array $tokens)
     {
@@ -133,9 +133,9 @@ private function parseSelectorList(TokenStream $stream)
      *
      * @param TokenStream $stream
      *
-     * @throws SyntaxErrorException
-     *
      * @return Node\SelectorNode
+     *
+     * @throws SyntaxErrorException
      */
     private function parserSelectorNode(TokenStream $stream)
     {
@@ -173,9 +173,9 @@ private function parserSelectorNode(TokenStream $stream)
      * @param TokenStream $stream
      * @param bool        $insideNegation
      *
-     * @throws SyntaxErrorException
-     *
      * @return array
+     *
+     * @throws SyntaxErrorException
      */
     private function parseSimpleSelector(TokenStream $stream, $insideNegation = false)
     {
@@ -330,9 +330,9 @@ private function parseElementNode(TokenStream $stream)
      * @param Node\NodeInterface $selector
      * @param TokenStream        $stream
      *
-     * @throws SyntaxErrorException
-     *
      * @return Node\AttributeNode
+     *
+     * @throws SyntaxErrorException
      */
     private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream)
     {
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -85,9 +85,9 @@ public function freeze()
     /**
      * Returns next token.
      *
-     * @throws InternalErrorException If there is no more token
-     *
      * @return Token
+     *
+     * @throws InternalErrorException If there is no more token
      */
     public function getNext()
     {
@@ -133,9 +133,9 @@ public function getUsed()
     /**
      * Returns nex identifier token.
      *
-     * @throws SyntaxErrorException If next token is not an identifier
-     *
      * @return string The identifier token value
+     *
+     * @throws SyntaxErrorException If next token is not an identifier
      */
     public function getNextIdentifier()
     {
@@ -151,9 +151,9 @@ public function getNextIdentifier()
     /**
      * Returns nex identifier or star delimiter token.
      *
-     * @throws SyntaxErrorException If next token is not an identifier or a star delimiter
-     *
      * @return null|string The identifier token value or null if star found
+     *
+     * @throws SyntaxErrorException If next token is not an identifier or a star delimiter
      */
     public function getNextIdentifierOrStar()
     {
diff --git a/XPath/Translator.php b/XPath/Translator.php
@@ -268,9 +268,9 @@ public function addPseudoClass(XPathExpr $xpath, $pseudoClass)
      * @param string    $attribute
      * @param string    $value
      *
-     * @throws ExpressionErrorException
-     *
      * @return XPathExpr
+     *
+     * @throws ExpressionErrorException
      */
     public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $value)
     {

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ public function parse($source)`
`58`	`58`	`*`
`59`	`59`	`* @param Token[] $tokens`
`60`	`60`	`*`
`61`		`- * @throws SyntaxErrorException`
`62`		`- *`
`63`	`61`	`* @return array`
	`62`	`+ *`
	`63`	`+ * @throws SyntaxErrorException`
`64`	`64`	`*/`
`65`	`65`	`public static function parseSeries(array $tokens)`
`66`	`66`	`{`
`@@ -133,9 +133,9 @@ private function parseSelectorList(TokenStream $stream)`
`133`	`133`	`*`
`134`	`134`	`* @param TokenStream $stream`
`135`	`135`	`*`
`136`		`- * @throws SyntaxErrorException`
`137`		`- *`
`138`	`136`	`* @return Node\SelectorNode`
	`137`	`+ *`
	`138`	`+ * @throws SyntaxErrorException`
`139`	`139`	`*/`
`140`	`140`	`private function parserSelectorNode(TokenStream $stream)`
`141`	`141`	`{`
`@@ -173,9 +173,9 @@ private function parserSelectorNode(TokenStream $stream)`
`173`	`173`	`* @param TokenStream $stream`
`174`	`174`	`* @param bool $insideNegation`
`175`	`175`	`*`
`176`		`- * @throws SyntaxErrorException`
`177`		`- *`
`178`	`176`	`* @return array`
	`177`	`+ *`
	`178`	`+ * @throws SyntaxErrorException`
`179`	`179`	`*/`
`180`	`180`	`private function parseSimpleSelector(TokenStream $stream, $insideNegation = false)`
`181`	`181`	`{`
`@@ -330,9 +330,9 @@ private function parseElementNode(TokenStream $stream)`
`330`	`330`	`* @param Node\NodeInterface $selector`
`331`	`331`	`* @param TokenStream $stream`
`332`	`332`	`*`
`333`		`- * @throws SyntaxErrorException`
`334`		`- *`
`335`	`333`	`* @return Node\AttributeNode`
	`334`	`+ *`
	`335`	`+ * @throws SyntaxErrorException`
`336`	`336`	`*/`
`337`	`337`	`private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream)`
`338`	`338`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,9 @@ public function freeze()`
`85`	`85`	`/**`
`86`	`86`	`* Returns next token.`
`87`	`87`	`*`
`88`		`- * @throws InternalErrorException If there is no more token`
`89`		`- *`
`90`	`88`	`* @return Token`
	`89`	`+ *`
	`90`	`+ * @throws InternalErrorException If there is no more token`
`91`	`91`	`*/`
`92`	`92`	`public function getNext()`
`93`	`93`	`{`
`@@ -133,9 +133,9 @@ public function getUsed()`
`133`	`133`	`/**`
`134`	`134`	`* Returns nex identifier token.`
`135`	`135`	`*`
`136`		`- * @throws SyntaxErrorException If next token is not an identifier`
`137`		`- *`
`138`	`136`	`* @return string The identifier token value`
	`137`	`+ *`
	`138`	`+ * @throws SyntaxErrorException If next token is not an identifier`
`139`	`139`	`*/`
`140`	`140`	`public function getNextIdentifier()`
`141`	`141`	`{`
`@@ -151,9 +151,9 @@ public function getNextIdentifier()`
`151`	`151`	`/**`
`152`	`152`	`* Returns nex identifier or star delimiter token.`
`153`	`153`	`*`
`154`		`- * @throws SyntaxErrorException If next token is not an identifier or a star delimiter`
`155`		`- *`
`156`	`154`	`* @return null\|string The identifier token value or null if star found`
	`155`	`+ *`
	`156`	`+ * @throws SyntaxErrorException If next token is not an identifier or a star delimiter`
`157`	`157`	`*/`
`158`	`158`	`public function getNextIdentifierOrStar()`
`159`	`159`	`{`
Original file line number	Diff line number	Diff line change
`@@ -268,9 +268,9 @@ public function addPseudoClass(XPathExpr $xpath, $pseudoClass)`
`268`	`268`	`* @param string $attribute`
`269`	`269`	`* @param string $value`
`270`	`270`	`*`
`271`		`- * @throws ExpressionErrorException`
`272`		`- *`
`273`	`271`	`* @return XPathExpr`
	`272`	`+ *`
	`273`	`+ * @throws ExpressionErrorException`
`274`	`274`	`*/`
`275`	`275`	`public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $value)`
`276`	`276`	`{`