[Asset][BrowserKit][Cache][Console][CssSelector] Use CPP

OskarStark · nicolas-grekas · commit 5ec03ebb4337 · 2024-01-04T11:44:02.000+01:00
diff --git a/Node/AttributeNode.php b/Node/AttributeNode.php
@@ -23,19 +23,13 @@
  */
 class AttributeNode extends AbstractNode
 {
-    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)
-    {
-        $this->selector = $selector;
-        $this->namespace = $namespace;
-        $this->attribute = $attribute;
-        $this->operator = $operator;
-        $this->value = $value;
+    public function __construct(
+        private NodeInterface $selector,
+        private ?string $namespace,
+        private string $attribute,
+        private string $operator,
+        private ?string $value,
+    ) {
     }
 
     public function getSelector(): NodeInterface
diff --git a/Node/ClassNode.php b/Node/ClassNode.php
@@ -23,13 +23,10 @@
  */
 class ClassNode extends AbstractNode
 {
-    private NodeInterface $selector;
-    private string $name;
-
-    public function __construct(NodeInterface $selector, string $name)
-    {
-        $this->selector = $selector;
-        $this->name = $name;
+    public function __construct(
+        private NodeInterface $selector,
+        private string $name,
+    ) {
     }
 
     public function getSelector(): NodeInterface
diff --git a/Node/CombinedSelectorNode.php b/Node/CombinedSelectorNode.php
@@ -23,15 +23,11 @@
  */
 class CombinedSelectorNode extends AbstractNode
 {
-    private NodeInterface $selector;
-    private string $combinator;
-    private NodeInterface $subSelector;
-
-    public function __construct(NodeInterface $selector, string $combinator, NodeInterface $subSelector)
-    {
-        $this->selector = $selector;
-        $this->combinator = $combinator;
-        $this->subSelector = $subSelector;
+    public function __construct(
+        private NodeInterface $selector,
+        private string $combinator,
+        private NodeInterface $subSelector,
+    ) {
     }
 
     public function getSelector(): NodeInterface
diff --git a/Node/ElementNode.php b/Node/ElementNode.php
@@ -23,13 +23,10 @@
  */
 class ElementNode extends AbstractNode
 {
-    private ?string $namespace;
-    private ?string $element;
-
-    public function __construct(string $namespace = null, string $element = null)
-    {
-        $this->namespace = $namespace;
-        $this->element = $element;
+    public function __construct(
+        private ?string $namespace = null,
+        private ?string $element = null,
+    ) {
     }
 
     public function getNamespace(): ?string
diff --git a/Node/FunctionNode.php b/Node/FunctionNode.php
@@ -25,18 +25,17 @@
  */
 class FunctionNode extends AbstractNode
 {
-    private NodeInterface $selector;
     private string $name;
-    private array $arguments;
 
     /**
      * @param Token[] $arguments
      */
-    public function __construct(NodeInterface $selector, string $name, array $arguments = [])
-    {
-        $this->selector = $selector;
+    public function __construct(
+        private NodeInterface $selector,
+        string $name,
+        private array $arguments = [],
+    ) {
         $this->name = strtolower($name);
-        $this->arguments = $arguments;
     }
 
     public function getSelector(): NodeInterface
diff --git a/Node/HashNode.php b/Node/HashNode.php
@@ -23,13 +23,10 @@
  */
 class HashNode extends AbstractNode
 {
-    private NodeInterface $selector;
-    private string $id;
-
-    public function __construct(NodeInterface $selector, string $id)
-    {
-        $this->selector = $selector;
-        $this->id = $id;
+    public function __construct(
+        private NodeInterface $selector,
+        private string $id,
+    ) {
     }
 
     public function getSelector(): NodeInterface
diff --git a/Node/NegationNode.php b/Node/NegationNode.php
@@ -23,13 +23,10 @@
  */
 class NegationNode extends AbstractNode
 {
-    private NodeInterface $selector;
-    private NodeInterface $subSelector;
-
-    public function __construct(NodeInterface $selector, NodeInterface $subSelector)
-    {
-        $this->selector = $selector;
-        $this->subSelector = $subSelector;
+    public function __construct(
+        private NodeInterface $selector,
+        private NodeInterface $subSelector,
+    ) {
     }
 
     public function getSelector(): NodeInterface
diff --git a/Node/PseudoNode.php b/Node/PseudoNode.php
@@ -23,12 +23,12 @@
  */
 class PseudoNode extends AbstractNode
 {
-    private NodeInterface $selector;
     private string $identifier;
 
-    public function __construct(NodeInterface $selector, string $identifier)
-    {
-        $this->selector = $selector;
+    public function __construct(
+        private NodeInterface $selector,
+        string $identifier,
+    ) {
         $this->identifier = strtolower($identifier);
     }
 
diff --git a/Node/SelectorNode.php b/Node/SelectorNode.php
@@ -23,12 +23,12 @@
  */
 class SelectorNode extends AbstractNode
 {
-    private NodeInterface $tree;
     private ?string $pseudoElement;
 
-    public function __construct(NodeInterface $tree, string $pseudoElement = null)
-    {
-        $this->tree = $tree;
+    public function __construct(
+        private NodeInterface $tree,
+        string $pseudoElement = null,
+    ) {
         $this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null;
     }
 
diff --git a/Node/Specificity.php b/Node/Specificity.php
@@ -29,15 +29,11 @@ class Specificity
     public const B_FACTOR = 10;
     public const C_FACTOR = 1;
 
-    private int $a;
-    private int $b;
-    private int $c;
-
-    public function __construct(int $a, int $b, int $c)
-    {
-        $this->a = $a;
-        $this->b = $b;
-        $this->c = $c;
+    public function __construct(
+        private int $a,
+        private int $b,
+        private int $c,
+    ) {
     }
 
     public function plus(self $specificity): self
diff --git a/Parser/Handler/HashHandler.php b/Parser/Handler/HashHandler.php
@@ -29,13 +29,10 @@
  */
 class HashHandler implements HandlerInterface
 {
-    private TokenizerPatterns $patterns;
-    private TokenizerEscaping $escaping;
-
-    public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
-    {
-        $this->patterns = $patterns;
-        $this->escaping = $escaping;
+    public function __construct(
+        private TokenizerPatterns $patterns,
+        private TokenizerEscaping $escaping,
+    ) {
     }
 
     public function handle(Reader $reader, TokenStream $stream): bool
diff --git a/Parser/Handler/IdentifierHandler.php b/Parser/Handler/IdentifierHandler.php
@@ -29,13 +29,10 @@
  */
 class IdentifierHandler implements HandlerInterface
 {
-    private TokenizerPatterns $patterns;
-    private TokenizerEscaping $escaping;
-
-    public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
-    {
-        $this->patterns = $patterns;
-        $this->escaping = $escaping;
+    public function __construct(
+        private TokenizerPatterns $patterns,
+        private TokenizerEscaping $escaping,
+    ) {
     }
 
     public function handle(Reader $reader, TokenStream $stream): bool
diff --git a/Parser/Handler/NumberHandler.php b/Parser/Handler/NumberHandler.php
@@ -28,11 +28,9 @@
  */
 class NumberHandler implements HandlerInterface
 {
-    private TokenizerPatterns $patterns;
-
-    public function __construct(TokenizerPatterns $patterns)
-    {
-        $this->patterns = $patterns;
+    public function __construct(
+        private TokenizerPatterns $patterns,
+    ) {
     }
 
     public function handle(Reader $reader, TokenStream $stream): bool
diff --git a/Parser/Handler/StringHandler.php b/Parser/Handler/StringHandler.php
@@ -31,13 +31,10 @@
  */
 class StringHandler implements HandlerInterface
 {
-    private TokenizerPatterns $patterns;
-    private TokenizerEscaping $escaping;
-
-    public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
-    {
-        $this->patterns = $patterns;
-        $this->escaping = $escaping;
+    public function __construct(
+        private TokenizerPatterns $patterns,
+        private TokenizerEscaping $escaping,
+    ) {
     }
 
     public function handle(Reader $reader, TokenStream $stream): bool
diff --git a/Parser/Reader.php b/Parser/Reader.php
@@ -23,13 +23,12 @@
  */
 class Reader
 {
-    private string $source;
     private int $length;
     private int $position = 0;
 
-    public function __construct(string $source)
-    {
-        $this->source = $source;
+    public function __construct(
+        private string $source,
+    ) {
         $this->length = \strlen($source);
     }
 
diff --git a/Parser/Token.php b/Parser/Token.php
@@ -31,15 +31,11 @@ class Token
     public const TYPE_NUMBER = 'number';
     public const TYPE_STRING = 'string';
 
-    private ?string $type;
-    private ?string $value;
-    private ?int $position;
-
-    public function __construct(?string $type, ?string $value, ?int $position)
-    {
-        $this->type = $type;
-        $this->value = $value;
-        $this->position = $position;
+    public function __construct(
+        private ?string $type,
+        private ?string $value,
+        private ?int $position,
+    ) {
     }
 
     public function getType(): ?int
diff --git a/Parser/Tokenizer/TokenizerEscaping.php b/Parser/Tokenizer/TokenizerEscaping.php
@@ -23,11 +23,9 @@
  */
 class TokenizerEscaping
 {
-    private TokenizerPatterns $patterns;
-
-    public function __construct(TokenizerPatterns $patterns)
-    {
-        $this->patterns = $patterns;
+    public function __construct(
+        private TokenizerPatterns $patterns,
+    ) {
     }
 
     public function escapeUnicode(string $value): string
diff --git a/XPath/Extension/NodeExtension.php b/XPath/Extension/NodeExtension.php
@@ -31,11 +31,9 @@ class NodeExtension extends AbstractExtension
     public const ATTRIBUTE_NAME_IN_LOWER_CASE = 2;
     public const ATTRIBUTE_VALUE_IN_LOWER_CASE = 4;
 
-    private int $flags;
-
-    public function __construct(int $flags = 0)
-    {
-        $this->flags = $flags;
+    public function __construct(
+        private int $flags = 0,
+    ) {
     }
 
     /**
diff --git a/XPath/XPathExpr.php b/XPath/XPathExpr.php
@@ -23,16 +23,12 @@
  */
 class XPathExpr
 {
-    private string $path;
-    private string $element;
-    private string $condition;
-
-    public function __construct(string $path = '', string $element = '*', string $condition = '', bool $starPrefix = false)
-    {
-        $this->path = $path;
-        $this->element = $element;
-        $this->condition = $condition;
-
+    public function __construct(
+        private string $path = '',
+        private string $element = '*',
+        private string $condition = '',
+        bool $starPrefix = false,
+    ) {
         if ($starPrefix) {
             $this->addStarPrefix();
         }
