@throws annotations should go after @return

nicolas-grekas · nicolas-grekas · commit d255e4207952 · 2016-06-06T13:03:51.000+02:00
diff --git a/Parser/Parser.php b/Parser/Parser.php
@@ -56,9 +56,9 @@ public function parse($source)
      *
      * @param Token[] $tokens
      *
-     * @throws SyntaxErrorException
-     *
      * @return array
+     *
+     * @throws SyntaxErrorException
      */
     public static function parseSeries(array $tokens)
     {
@@ -131,9 +131,9 @@ private function parseSelectorList(TokenStream $stream)
      *
      * @param TokenStream $stream
      *
-     * @throws SyntaxErrorException
-     *
      * @return Node\SelectorNode
+     *
+     * @throws SyntaxErrorException
      */
     private function parserSelectorNode(TokenStream $stream)
     {
@@ -171,9 +171,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)
     {
@@ -328,9 +328,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
@@ -83,9 +83,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()
     {
@@ -131,9 +131,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()
     {
@@ -149,9 +149,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
@@ -266,9 +266,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
`@@ -56,9 +56,9 @@ public function parse($source)`
`56`	`56`	`*`
`57`	`57`	`* @param Token[] $tokens`
`58`	`58`	`*`
`59`		`- * @throws SyntaxErrorException`
`60`		`- *`
`61`	`59`	`* @return array`
	`60`	`+ *`
	`61`	`+ * @throws SyntaxErrorException`
`62`	`62`	`*/`
`63`	`63`	`public static function parseSeries(array $tokens)`
`64`	`64`	`{`
`@@ -131,9 +131,9 @@ private function parseSelectorList(TokenStream $stream)`
`131`	`131`	`*`
`132`	`132`	`* @param TokenStream $stream`
`133`	`133`	`*`
`134`		`- * @throws SyntaxErrorException`
`135`		`- *`
`136`	`134`	`* @return Node\SelectorNode`
	`135`	`+ *`
	`136`	`+ * @throws SyntaxErrorException`
`137`	`137`	`*/`
`138`	`138`	`private function parserSelectorNode(TokenStream $stream)`
`139`	`139`	`{`
`@@ -171,9 +171,9 @@ private function parserSelectorNode(TokenStream $stream)`
`171`	`171`	`* @param TokenStream $stream`
`172`	`172`	`* @param bool $insideNegation`
`173`	`173`	`*`
`174`		`- * @throws SyntaxErrorException`
`175`		`- *`
`176`	`174`	`* @return array`
	`175`	`+ *`
	`176`	`+ * @throws SyntaxErrorException`
`177`	`177`	`*/`
`178`	`178`	`private function parseSimpleSelector(TokenStream $stream, $insideNegation = false)`
`179`	`179`	`{`
`@@ -328,9 +328,9 @@ private function parseElementNode(TokenStream $stream)`
`328`	`328`	`* @param Node\NodeInterface $selector`
`329`	`329`	`* @param TokenStream $stream`
`330`	`330`	`*`
`331`		`- * @throws SyntaxErrorException`
`332`		`- *`
`333`	`331`	`* @return Node\AttributeNode`
	`332`	`+ *`
	`333`	`+ * @throws SyntaxErrorException`
`334`	`334`	`*/`
`335`	`335`	`private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream)`
`336`	`336`	`{`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ public function freeze()`
`83`	`83`	`/**`
`84`	`84`	`* Returns next token.`
`85`	`85`	`*`
`86`		`- * @throws InternalErrorException If there is no more token`
`87`		`- *`
`88`	`86`	`* @return Token`
	`87`	`+ *`
	`88`	`+ * @throws InternalErrorException If there is no more token`
`89`	`89`	`*/`
`90`	`90`	`public function getNext()`
`91`	`91`	`{`
`@@ -131,9 +131,9 @@ public function getUsed()`
`131`	`131`	`/**`
`132`	`132`	`* Returns nex identifier token.`
`133`	`133`	`*`
`134`		`- * @throws SyntaxErrorException If next token is not an identifier`
`135`		`- *`
`136`	`134`	`* @return string The identifier token value`
	`135`	`+ *`
	`136`	`+ * @throws SyntaxErrorException If next token is not an identifier`
`137`	`137`	`*/`
`138`	`138`	`public function getNextIdentifier()`
`139`	`139`	`{`
`@@ -149,9 +149,9 @@ public function getNextIdentifier()`
`149`	`149`	`/**`
`150`	`150`	`* Returns nex identifier or star delimiter token.`
`151`	`151`	`*`
`152`		`- * @throws SyntaxErrorException If next token is not an identifier or a star delimiter`
`153`		`- *`
`154`	`152`	`* @return null\|string The identifier token value or null if star found`
	`153`	`+ *`
	`154`	`+ * @throws SyntaxErrorException If next token is not an identifier or a star delimiter`
`155`	`155`	`*/`
`156`	`156`	`public function getNextIdentifierOrStar()`
`157`	`157`	`{`
Original file line number	Diff line number	Diff line change
`@@ -266,9 +266,9 @@ public function addPseudoClass(XPathExpr $xpath, $pseudoClass)`
`266`	`266`	`* @param string $attribute`
`267`	`267`	`* @param string $value`
`268`	`268`	`*`
`269`		`- * @throws ExpressionErrorException`
`270`		`- *`
`271`	`269`	`* @return XPathExpr`
	`270`	`+ *`
	`271`	`+ * @throws ExpressionErrorException`
`272`	`272`	`*/`
`273`	`273`	`public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $value)`
`274`	`274`	`{`