Merge branch '3.1' into 3.2

* 3.1:
  fixed @return when returning this or static
  override property constraints in child class
  removed unneeded comment
  [Console] improved code coverage of Command class
  [FrameworkBundle] Make TemplateController working without the Templating component
  Only count on arrays or countables to avoid warnings in PHP 7.2

Author: fabpot

Exception/SyntaxErrorException.php

@@ -27,7 +27,7 @@ class SyntaxErrorException extends ParseException
      * @param string $expectedValue
      * @param Token  $foundToken
      *
-     * @return SyntaxErrorException
+     * @return self
      */
     public static function unexpectedToken($expectedValue, Token $foundToken)
     {
@@ -38,7 +38,7 @@ public static function unexpectedToken($expectedValue, Token $foundToken)
      * @param string $pseudoElement
      * @param string $unexpectedLocation
      *
-     * @return SyntaxErrorException
+     * @return self
      */
     public static function pseudoElementFound($pseudoElement, $unexpectedLocation)
     {
@@ -48,23 +48,23 @@ public static function pseudoElementFound($pseudoElement, $unexpectedLocation)
     /**
      * @param int $position
      *
-     * @return SyntaxErrorException
+     * @return self
      */
     public static function unclosedString($position)
     {
         return new self(sprintf('Unclosed/invalid string at %s.', $position));
     }
 
     /**
-     * @return SyntaxErrorException
+     * @return self
      */
     public static function nestedNot()
     {
         return new self('Got nested ::not().');
     }
 
     /**
-     * @return SyntaxErrorException
+     * @return self
      */
     public static function stringAsFunctionArgument()
     {

Node/Specificity.php

@@ -61,7 +61,7 @@ public function __construct($a, $b, $c)
     /**
      * @param Specificity $specificity
      *
-     * @return Specificity
+     * @return self
      */
     public function plus(Specificity $specificity)
     {

Parser/TokenStream.php

@@ -61,7 +61,7 @@ class TokenStream
      *
      * @param Token $token
      *
-     * @return TokenStream
+     * @return $this
      */
     public function push(Token $token)
     {
@@ -73,7 +73,7 @@ public function push(Token $token)
     /**
      * Freezes stream.
      *
-     * @return TokenStream
+     * @return $this
      */
     public function freeze()
     {

XPath/Extension/NodeExtension.php

@@ -50,7 +50,7 @@ public function __construct($flags = 0)
      * @param int  $flag
      * @param bool $on
      *
-     * @return NodeExtension
+     * @return $this
      */
     public function setFlag($flag, $on)
     {

XPath/Translator.php

@@ -146,7 +146,7 @@ public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or
      *
      * @param Extension\ExtensionInterface $extension
      *
-     * @return Translator
+     * @return $this
      */
     public function registerExtension(Extension\ExtensionInterface $extension)
     {
@@ -182,7 +182,7 @@ public function getExtension($name)
      *
      * @param ParserInterface $shortcut
      *
-     * @return Translator
+     * @return $this
      */
     public function registerParserShortcut(ParserInterface $shortcut)
     {

XPath/XPathExpr.php

@@ -66,7 +66,7 @@ public function getElement()
     /**
      * @param $condition
      *
-     * @return XPathExpr
+     * @return $this
      */
     public function addCondition($condition)
     {
@@ -84,7 +84,7 @@ public function getCondition()
     }
 
     /**
-     * @return XPathExpr
+     * @return $this
      */
     public function addNameTest()
     {
@@ -97,7 +97,7 @@ public function addNameTest()
     }
 
     /**
-     * @return XPathExpr
+     * @return $this
      */
     public function addStarPrefix()
     {
@@ -112,7 +112,7 @@ public function addStarPrefix()
      * @param string    $combiner
      * @param XPathExpr $expr
      *
-     * @return XPathExpr
+     * @return $this
      */
     public function join($combiner, XPathExpr $expr)
     {