[CssSelector] Add types to private properties

derrabus · derrabus · commit 4742e79c85fd · 2021-07-05T20:27:22.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/CssSelectorConverter.php b/CssSelectorConverter.php
@@ -26,11 +26,11 @@
  */
 class CssSelectorConverter
 {
-    private $translator;
-    private $cache;
+    private Translator $translator;
+    private array $cache;
 
-    private static $xmlCache = [];
-    private static $htmlCache = [];
+    private static array $xmlCache = [];
+    private static array $htmlCache = [];
 
     /**
      * @param bool $html Whether HTML support should be enabled. Disable it for XML documents
diff --git a/Node/AbstractNode.php b/Node/AbstractNode.php
@@ -23,17 +23,10 @@
  */
 abstract class AbstractNode implements NodeInterface
 {
-    /**
-     * @var string
-     */
-    private $nodeName;
+    private string $nodeName;
 
     public function getNodeName(): string
     {
-        if (null === $this->nodeName) {
-            $this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', static::class);
-        }
-
-        return $this->nodeName;
+        return $this->nodeName ??= preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', static::class);
     }
 }
diff --git a/Node/AttributeNode.php b/Node/AttributeNode.php
@@ -23,11 +23,11 @@
  */
 class AttributeNode extends AbstractNode
 {
-    private $selector;
-    private $namespace;
-    private $attribute;
-    private $operator;
-    private $value;
+    private NodeInterface $selector;
+    private ?string $namespace;
+    private string $attribute;
+    private string $operator;
+    private ?string $value;
 
     public function __construct(NodeInterface $selector, ?string $namespace, string $attribute, string $operator, ?string $value)
     {
diff --git a/Node/ClassNode.php b/Node/ClassNode.php
@@ -23,8 +23,8 @@
  */
 class ClassNode extends AbstractNode
 {
-    private $selector;
-    private $name;
+    private NodeInterface $selector;
+    private string $name;
 
     public function __construct(NodeInterface $selector, string $name)
     {
diff --git a/Node/CombinedSelectorNode.php b/Node/CombinedSelectorNode.php
@@ -23,9 +23,9 @@
  */
 class CombinedSelectorNode extends AbstractNode
 {
-    private $selector;
-    private $combinator;
-    private $subSelector;
+    private NodeInterface $selector;
+    private string $combinator;
+    private NodeInterface $subSelector;
 
     public function __construct(NodeInterface $selector, string $combinator, NodeInterface $subSelector)
     {
diff --git a/Node/ElementNode.php b/Node/ElementNode.php
@@ -23,8 +23,8 @@
  */
 class ElementNode extends AbstractNode
 {
-    private $namespace;
-    private $element;
+    private ?string $namespace;
+    private ?string $element;
 
     public function __construct(string $namespace = null, string $element = null)
     {
diff --git a/Node/FunctionNode.php b/Node/FunctionNode.php
@@ -25,9 +25,9 @@
  */
 class FunctionNode extends AbstractNode
 {
-    private $selector;
-    private $name;
-    private $arguments;
+    private NodeInterface $selector;
+    private string $name;
+    private array $arguments;
 
     /**
      * @param Token[] $arguments
diff --git a/Node/HashNode.php b/Node/HashNode.php
@@ -23,8 +23,8 @@
  */
 class HashNode extends AbstractNode
 {
-    private $selector;
-    private $id;
+    private NodeInterface $selector;
+    private string $id;
 
     public function __construct(NodeInterface $selector, string $id)
     {
diff --git a/Node/NegationNode.php b/Node/NegationNode.php
@@ -23,8 +23,8 @@
  */
 class NegationNode extends AbstractNode
 {
-    private $selector;
-    private $subSelector;
+    private NodeInterface $selector;
+    private NodeInterface $subSelector;
 
     public function __construct(NodeInterface $selector, NodeInterface $subSelector)
     {
diff --git a/Node/PseudoNode.php b/Node/PseudoNode.php
@@ -23,8 +23,8 @@
  */
 class PseudoNode extends AbstractNode
 {
-    private $selector;
-    private $identifier;
+    private NodeInterface $selector;
+    private string $identifier;
 
     public function __construct(NodeInterface $selector, string $identifier)
     {
diff --git a/Node/SelectorNode.php b/Node/SelectorNode.php
@@ -23,8 +23,8 @@
  */
 class SelectorNode extends AbstractNode
 {
-    private $tree;
-    private $pseudoElement;
+    private NodeInterface $tree;
+    private ?string $pseudoElement;
 
     public function __construct(NodeInterface $tree, string $pseudoElement = null)
     {
diff --git a/Node/Specificity.php b/Node/Specificity.php
@@ -29,9 +29,9 @@ class Specificity
     public const B_FACTOR = 10;
     public const C_FACTOR = 1;
 
-    private $a;
-    private $b;
-    private $c;
+    private int $a;
+    private int $b;
+    private int $c;
 
     public function __construct(int $a, int $b, int $c)
     {
diff --git a/Parser/Handler/HashHandler.php b/Parser/Handler/HashHandler.php
@@ -29,8 +29,8 @@
  */
 class HashHandler implements HandlerInterface
 {
-    private $patterns;
-    private $escaping;
+    private TokenizerPatterns $patterns;
+    private TokenizerEscaping $escaping;
 
     public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
     {
diff --git a/Parser/Handler/IdentifierHandler.php b/Parser/Handler/IdentifierHandler.php
@@ -29,8 +29,8 @@
  */
 class IdentifierHandler implements HandlerInterface
 {
-    private $patterns;
-    private $escaping;
+    private TokenizerPatterns $patterns;
+    private TokenizerEscaping $escaping;
 
     public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
     {
diff --git a/Parser/Handler/NumberHandler.php b/Parser/Handler/NumberHandler.php
@@ -28,7 +28,7 @@
  */
 class NumberHandler implements HandlerInterface
 {
-    private $patterns;
+    private TokenizerPatterns $patterns;
 
     public function __construct(TokenizerPatterns $patterns)
     {
diff --git a/Parser/Handler/StringHandler.php b/Parser/Handler/StringHandler.php
@@ -31,8 +31,8 @@
  */
 class StringHandler implements HandlerInterface
 {
-    private $patterns;
-    private $escaping;
+    private TokenizerPatterns $patterns;
+    private TokenizerEscaping $escaping;
 
     public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
     {
diff --git a/Parser/Parser.php b/Parser/Parser.php
@@ -27,7 +27,7 @@
  */
 class Parser implements ParserInterface
 {
-    private $tokenizer;
+    private Tokenizer $tokenizer;
 
     public function __construct(Tokenizer $tokenizer = null)
     {
diff --git a/Parser/Reader.php b/Parser/Reader.php
@@ -23,9 +23,9 @@
  */
 class Reader
 {
-    private $source;
-    private $length;
-    private $position = 0;
+    private string $source;
+    private int $length;
+    private int $position = 0;
 
     public function __construct(string $source)
     {
diff --git a/Parser/Token.php b/Parser/Token.php
@@ -31,9 +31,9 @@ class Token
     public const TYPE_NUMBER = 'number';
     public const TYPE_STRING = 'string';
 
-    private $type;
-    private $value;
-    private $position;
+    private ?string $type;
+    private ?string $value;
+    private ?int $position;
 
     public function __construct(?string $type, ?string $value, ?int $position)
     {
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -29,27 +29,16 @@ class TokenStream
     /**
      * @var Token[]
      */
-    private $tokens = [];
+    private array $tokens = [];
 
     /**
      * @var Token[]
      */
-    private $used = [];
+    private array $used = [];
 
-    /**
-     * @var int
-     */
-    private $cursor = 0;
-
-    /**
-     * @var Token|null
-     */
-    private $peeked;
-
-    /**
-     * @var bool
-     */
-    private $peeking = false;
+    private int $cursor = 0;
+    private ?Token $peeked;
+    private bool $peeking = false;
 
     /**
      * Pushes a token.
diff --git a/Parser/Tokenizer/Tokenizer.php b/Parser/Tokenizer/Tokenizer.php
@@ -31,7 +31,7 @@ class Tokenizer
     /**
      * @var Handler\HandlerInterface[]
      */
-    private $handlers;
+    private array $handlers;
 
     public function __construct()
     {
diff --git a/Parser/Tokenizer/TokenizerEscaping.php b/Parser/Tokenizer/TokenizerEscaping.php
@@ -23,7 +23,7 @@
  */
 class TokenizerEscaping
 {
-    private $patterns;
+    private TokenizerPatterns $patterns;
 
     public function __construct(TokenizerPatterns $patterns)
     {
diff --git a/Parser/Tokenizer/TokenizerPatterns.php b/Parser/Tokenizer/TokenizerPatterns.php
@@ -23,18 +23,18 @@
  */
 class TokenizerPatterns
 {
-    private $unicodeEscapePattern;
-    private $simpleEscapePattern;
-    private $newLineEscapePattern;
-    private $escapePattern;
-    private $stringEscapePattern;
-    private $nonAsciiPattern;
-    private $nmCharPattern;
-    private $nmStartPattern;
-    private $identifierPattern;
-    private $hashPattern;
-    private $numberPattern;
-    private $quotedStringPattern;
+    private string $unicodeEscapePattern;
+    private string $simpleEscapePattern;
+    private string $newLineEscapePattern;
+    private string $escapePattern;
+    private string $stringEscapePattern;
+    private string $nonAsciiPattern;
+    private string $nmCharPattern;
+    private string $nmStartPattern;
+    private string $identifierPattern;
+    private string $hashPattern;
+    private string $numberPattern;
+    private string $quotedStringPattern;
 
     public function __construct()
     {
diff --git a/XPath/Extension/NodeExtension.php b/XPath/Extension/NodeExtension.php
@@ -31,7 +31,7 @@ class NodeExtension extends AbstractExtension
     public const ATTRIBUTE_NAME_IN_LOWER_CASE = 2;
     public const ATTRIBUTE_VALUE_IN_LOWER_CASE = 4;
 
-    private $flags;
+    private int $flags;
 
     public function __construct(int $flags = 0)
     {
diff --git a/XPath/Translator.php b/XPath/Translator.php
@@ -30,23 +30,23 @@
  */
 class Translator implements TranslatorInterface
 {
-    private $mainParser;
+    private ParserInterface $mainParser;
 
     /**
      * @var ParserInterface[]
      */
-    private $shortcutParsers = [];
+    private array $shortcutParsers = [];
 
     /**
      * @var Extension\ExtensionInterface[]
      */
-    private $extensions = [];
+    private array $extensions = [];
 
-    private $nodeTranslators = [];
-    private $combinationTranslators = [];
-    private $functionTranslators = [];
-    private $pseudoClassTranslators = [];
-    private $attributeMatchingTranslators = [];
+    private array $nodeTranslators = [];
+    private array $combinationTranslators = [];
+    private array $functionTranslators = [];
+    private array $pseudoClassTranslators = [];
+    private array $attributeMatchingTranslators = [];
 
     public function __construct(ParserInterface $parser = null)
     {
diff --git a/XPath/XPathExpr.php b/XPath/XPathExpr.php
@@ -23,9 +23,9 @@
  */
 class XPathExpr
 {
-    private $path;
-    private $element;
-    private $condition;
+    private string $path;
+    private string $element;
+    private string $condition;
 
     public function __construct(string $path = '', string $element = '*', string $condition = '', bool $starPrefix = false)
     {

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,10 @@`
`23`	`23`	`*/`
`24`	`24`	`abstract class AbstractNode implements NodeInterface`
`25`	`25`	`{`
`26`		`- /**`
`27`		`- * @var string`
`28`		`- */`
`29`		`- private $nodeName;`
	`26`	`+ private string $nodeName;`
`30`	`27`
`31`	`28`	`public function getNodeName(): string`
`32`	`29`	`{`
`33`		`- if (null === $this->nodeName) {`
`34`		`- $this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', static::class);`
`35`		`- }`
`36`		`-`
`37`		`- return $this->nodeName;`
	`30`	`+ return $this->nodeName ??= preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', static::class);`
`38`	`31`	`}`
`39`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`	`*/`
`24`	`24`	`class ClassNode extends AbstractNode`
`25`	`25`	`{`
`26`		`- private $selector;`
`27`		`- private $name;`
	`26`	`+ private NodeInterface $selector;`
	`27`	`+ private string $name;`
`28`	`28`
`29`	`29`	`public function __construct(NodeInterface $selector, string $name)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@`
`23`	`23`	`*/`
`24`	`24`	`class CombinedSelectorNode extends AbstractNode`
`25`	`25`	`{`
`26`		`- private $selector;`
`27`		`- private $combinator;`
`28`		`- private $subSelector;`
	`26`	`+ private NodeInterface $selector;`
	`27`	`+ private string $combinator;`
	`28`	`+ private NodeInterface $subSelector;`
`29`	`29`
`30`	`30`	`public function __construct(NodeInterface $selector, string $combinator, NodeInterface $subSelector)`
`31`	`31`	`{`