Merge branch '2.8' into 3.0

* 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
symfony · Jun 6, 2016 · e8a66c5 · e8a66c5
2 parents 65e764f + 9a0b264
commit e8a66c5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
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)
     {