Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit cc98d3fa8ac2 · 2017-10-24T16:05:06.000+02:00
* 2.8:
  [DI] minor docblock fixes
diff --git a/Node/AttributeNode.php b/Node/AttributeNode.php
@@ -23,29 +23,10 @@
  */
 class AttributeNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $selector;
-
-    /**
-     * @var string
-     */
     private $namespace;
-
-    /**
-     * @var string
-     */
     private $attribute;
-
-    /**
-     * @var string
-     */
     private $operator;
-
-    /**
-     * @var string
-     */
     private $value;
 
     /**
diff --git a/Node/ClassNode.php b/Node/ClassNode.php
@@ -23,14 +23,7 @@
  */
 class ClassNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $selector;
-
-    /**
-     * @var string
-     */
     private $name;
 
     /**
diff --git a/Node/CombinedSelectorNode.php b/Node/CombinedSelectorNode.php
@@ -23,19 +23,8 @@
  */
 class CombinedSelectorNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $selector;
-
-    /**
-     * @var string
-     */
     private $combinator;
-
-    /**
-     * @var NodeInterface
-     */
     private $subSelector;
 
     /**
diff --git a/Node/FunctionNode.php b/Node/FunctionNode.php
@@ -25,19 +25,8 @@
  */
 class FunctionNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $selector;
-
-    /**
-     * @var string
-     */
     private $name;
-
-    /**
-     * @var Token[]
-     */
     private $arguments;
 
     /**
diff --git a/Node/HashNode.php b/Node/HashNode.php
@@ -23,14 +23,7 @@
  */
 class HashNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $selector;
-
-    /**
-     * @var string
-     */
     private $id;
 
     /**
diff --git a/Node/NegationNode.php b/Node/NegationNode.php
@@ -23,20 +23,9 @@
  */
 class NegationNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $selector;
-
-    /**
-     * @var NodeInterface
-     */
     private $subSelector;
 
-    /**
-     * @param NodeInterface $selector
-     * @param NodeInterface $subSelector
-     */
     public function __construct(NodeInterface $selector, NodeInterface $subSelector)
     {
         $this->selector = $selector;
diff --git a/Node/PseudoNode.php b/Node/PseudoNode.php
@@ -23,14 +23,7 @@
  */
 class PseudoNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $selector;
-
-    /**
-     * @var string
-     */
     private $identifier;
 
     /**
diff --git a/Node/SelectorNode.php b/Node/SelectorNode.php
@@ -23,14 +23,7 @@
  */
 class SelectorNode extends AbstractNode
 {
-    /**
-     * @var NodeInterface
-     */
     private $tree;
-
-    /**
-     * @var null|string
-     */
     private $pseudoElement;
 
     /**
diff --git a/Node/Specificity.php b/Node/Specificity.php
@@ -29,19 +29,8 @@ class Specificity
     const B_FACTOR = 10;
     const C_FACTOR = 1;
 
-    /**
-     * @var int
-     */
     private $a;
-
-    /**
-     * @var int
-     */
     private $b;
-
-    /**
-     * @var int
-     */
     private $c;
 
     /**
@@ -57,8 +46,6 @@ public function __construct($a, $b, $c)
     }
 
     /**
-     * @param Specificity $specificity
-     *
      * @return self
      */
     public function plus(Specificity $specificity)
@@ -80,8 +67,6 @@ public function getValue()
      * Returns -1 if the object specificity is lower than the argument,
      * 0 if they are equal, and 1 if the argument is lower.
      *
-     * @param Specificity $specificity
-     *
      * @return int
      */
     public function compareTo(Specificity $specificity)
diff --git a/Parser/Handler/HandlerInterface.php b/Parser/Handler/HandlerInterface.php
@@ -27,9 +27,6 @@
 interface HandlerInterface
 {
     /**
-     * @param Reader      $reader
-     * @param TokenStream $stream
-     *
      * @return bool
      */
     public function handle(Reader $reader, TokenStream $stream);
diff --git a/Parser/Handler/HashHandler.php b/Parser/Handler/HashHandler.php
@@ -29,20 +29,9 @@
  */
 class HashHandler implements HandlerInterface
 {
-    /**
-     * @var TokenizerPatterns
-     */
     private $patterns;
-
-    /**
-     * @var TokenizerEscaping
-     */
     private $escaping;
 
-    /**
-     * @param TokenizerPatterns $patterns
-     * @param TokenizerEscaping $escaping
-     */
     public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
     {
         $this->patterns = $patterns;
diff --git a/Parser/Handler/IdentifierHandler.php b/Parser/Handler/IdentifierHandler.php
@@ -29,20 +29,9 @@
  */
 class IdentifierHandler implements HandlerInterface
 {
-    /**
-     * @var TokenizerPatterns
-     */
     private $patterns;
-
-    /**
-     * @var TokenizerEscaping
-     */
     private $escaping;
 
-    /**
-     * @param TokenizerPatterns $patterns
-     * @param TokenizerEscaping $escaping
-     */
     public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
     {
         $this->patterns = $patterns;
diff --git a/Parser/Handler/NumberHandler.php b/Parser/Handler/NumberHandler.php
@@ -28,14 +28,8 @@
  */
 class NumberHandler implements HandlerInterface
 {
-    /**
-     * @var TokenizerPatterns
-     */
     private $patterns;
 
-    /**
-     * @param TokenizerPatterns $patterns
-     */
     public function __construct(TokenizerPatterns $patterns)
     {
         $this->patterns = $patterns;
diff --git a/Parser/Handler/StringHandler.php b/Parser/Handler/StringHandler.php
@@ -31,20 +31,9 @@
  */
 class StringHandler implements HandlerInterface
 {
-    /**
-     * @var TokenizerPatterns
-     */
     private $patterns;
-
-    /**
-     * @var TokenizerEscaping
-     */
     private $escaping;
 
-    /**
-     * @param TokenizerPatterns $patterns
-     * @param TokenizerEscaping $escaping
-     */
     public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
     {
         $this->patterns = $patterns;
diff --git a/Parser/Parser.php b/Parser/Parser.php
@@ -27,14 +27,8 @@
  */
 class Parser implements ParserInterface
 {
-    /**
-     * @var Tokenizer
-     */
     private $tokenizer;
 
-    /**
-     * @param null|Tokenizer $tokenizer
-     */
     public function __construct(Tokenizer $tokenizer = null)
     {
         $this->tokenizer = $tokenizer ?: new Tokenizer();
@@ -103,8 +97,6 @@ public static function parseSeries(array $tokens)
     /**
      * Parses selector nodes.
      *
-     * @param TokenStream $stream
-     *
      * @return array
      */
     private function parseSelectorList(TokenStream $stream)
@@ -129,8 +121,6 @@ private function parseSelectorList(TokenStream $stream)
     /**
      * Parses next selector or combined node.
      *
-     * @param TokenStream $stream
-     *
      * @return Node\SelectorNode
      *
      * @throws SyntaxErrorException
@@ -292,8 +282,6 @@ private function parseSimpleSelector(TokenStream $stream, $insideNegation = fals
     /**
      * Parses next element node.
      *
-     * @param TokenStream $stream
-     *
      * @return Node\ElementNode
      */
     private function parseElementNode(TokenStream $stream)
@@ -325,9 +313,6 @@ private function parseElementNode(TokenStream $stream)
     /**
      * Parses next attribute node.
      *
-     * @param Node\NodeInterface $selector
-     * @param TokenStream        $stream
-     *
      * @return Node\AttributeNode
      *
      * @throws SyntaxErrorException
diff --git a/Parser/Token.php b/Parser/Token.php
@@ -91,8 +91,6 @@ public function isFileEnd()
     }
 
     /**
-     * @param array $values
-     *
      * @return bool
      */
     public function isDelimiter(array $values = array())
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -59,8 +59,6 @@ class TokenStream
     /**
      * Pushes a token.
      *
-     * @param Token $token
-     *
      * @return $this
      */
     public function push(Token $token)
diff --git a/Parser/Tokenizer/Tokenizer.php b/Parser/Tokenizer/Tokenizer.php
@@ -51,8 +51,6 @@ public function __construct()
     /**
      * Tokenize selector source code.
      *
-     * @param Reader $reader
-     *
      * @return TokenStream
      */
     public function tokenize(Reader $reader)
diff --git a/Parser/Tokenizer/TokenizerEscaping.php b/Parser/Tokenizer/TokenizerEscaping.php
@@ -23,14 +23,8 @@
  */
 class TokenizerEscaping
 {
-    /**
-     * @var TokenizerPatterns
-     */
     private $patterns;
 
-    /**
-     * @param TokenizerPatterns $patterns
-     */
     public function __construct(TokenizerPatterns $patterns)
     {
         $this->patterns = $patterns;
diff --git a/XPath/Extension/CombinationExtension.php b/XPath/Extension/CombinationExtension.php
diff --git a/XPath/Extension/FunctionExtension.php b/XPath/Extension/FunctionExtension.php
diff --git a/XPath/Extension/HtmlExtension.php b/XPath/Extension/HtmlExtension.php
diff --git a/XPath/Extension/NodeExtension.php b/XPath/Extension/NodeExtension.php
diff --git a/XPath/Extension/PseudoClassExtension.php b/XPath/Extension/PseudoClassExtension.php
diff --git a/XPath/Translator.php b/XPath/Translator.php
