Updates to vendors etc

vendor/symfony/css-selector/Node/AttributeNode.php

@@ -23,19 +23,13 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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
@@ -73,7 +67,7 @@ class AttributeNode extends AbstractNode
         $attribute = $this->namespace ? $this->namespace.'|'.$this->attribute : $this->attribute;
 
         return 'exists' === $this->operator
-            ? sprintf('%s[%s[%s]]', $this->getNodeName(), $this->selector, $attribute)
-            : sprintf("%s[%s[%s %s '%s']]", $this->getNodeName(), $this->selector, $attribute, $this->operator, $this->value);
+            ? \sprintf('%s[%s[%s]]', $this->getNodeName(), $this->selector, $attribute)
+            : \sprintf("%s[%s[%s %s '%s']]", $this->getNodeName(), $this->selector, $attribute, $this->operator, $this->value);
     }
 }

vendor/symfony/css-selector/Node/ClassNode.php

@@ -23,13 +23,10 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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
@@ -49,6 +46,6 @@ class ClassNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name);
+        return \sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name);
     }
 }

vendor/symfony/css-selector/Node/CombinedSelectorNode.php

@@ -23,15 +23,11 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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
@@ -58,6 +54,6 @@ class CombinedSelectorNode extends AbstractNode
     {
         $combinator = ' ' === $this->combinator ? '<followed>' : $this->combinator;
 
-        return sprintf('%s[%s %s %s]', $this->getNodeName(), $this->selector, $combinator, $this->subSelector);
+        return \sprintf('%s[%s %s %s]', $this->getNodeName(), $this->selector, $combinator, $this->subSelector);
     }
 }

vendor/symfony/css-selector/Node/ElementNode.php

@@ -23,13 +23,10 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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
@@ -51,6 +48,6 @@ class ElementNode extends AbstractNode
     {
         $element = $this->element ?: '*';
 
-        return sprintf('%s[%s]', $this->getNodeName(), $this->namespace ? $this->namespace.'|'.$element : $element);
+        return \sprintf('%s[%s]', $this->getNodeName(), $this->namespace ? $this->namespace.'|'.$element : $element);
     }
 }

vendor/symfony/css-selector/Node/FunctionNode.php

@@ -25,18 +25,17 @@ use Symfony\Component\CssSelector\Parser\Token;
  */
 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
@@ -66,6 +65,6 @@ class FunctionNode extends AbstractNode
     {
         $arguments = implode(', ', array_map(fn (Token $token) => "'".$token->getValue()."'", $this->arguments));
 
-        return sprintf('%s[%s:%s(%s)]', $this->getNodeName(), $this->selector, $this->name, $arguments ? '['.$arguments.']' : '');
+        return \sprintf('%s[%s:%s(%s)]', $this->getNodeName(), $this->selector, $this->name, $arguments ? '['.$arguments.']' : '');
     }
 }

vendor/symfony/css-selector/Node/HashNode.php

@@ -23,13 +23,10 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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
@@ -49,6 +46,6 @@ class HashNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id);
+        return \sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id);
     }
 }

vendor/symfony/css-selector/Node/MatchingNode.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\CssSelector\Node;
+
+/**
+ * Represents a "<selector>:is(<subSelectorList>)" node.
+ *
+ * This component is a port of the Python cssselect library,
+ * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
+ *
+ * @author Hubert Lenoir <lenoir.hubert@gmail.com>
+ *
+ * @internal
+ */
+class MatchingNode extends AbstractNode
+{
+    /**
+     * @param array<NodeInterface> $arguments
+     */
+    public function __construct(
+        public readonly NodeInterface $selector,
+        public readonly array $arguments = [],
+    ) {
+    }
+
+    public function getSpecificity(): Specificity
+    {
+        $argumentsSpecificity = array_reduce(
+            $this->arguments,
+            fn ($c, $n) => 1 === $n->getSpecificity()->compareTo($c) ? $n->getSpecificity() : $c,
+            new Specificity(0, 0, 0),
+        );
+
+        return $this->selector->getSpecificity()->plus($argumentsSpecificity);
+    }
+
+    public function __toString(): string
+    {
+        $selectorArguments = array_map(
+            fn ($n): string => ltrim((string) $n, '*'),
+            $this->arguments,
+        );
+
+        return \sprintf('%s[%s:is(%s)]', $this->getNodeName(), $this->selector, implode(', ', $selectorArguments));
+    }
+}

vendor/symfony/css-selector/Node/NegationNode.php

@@ -23,13 +23,10 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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
@@ -49,6 +46,6 @@ class NegationNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);
+        return \sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);
     }
 }

vendor/symfony/css-selector/Node/PseudoNode.php

@@ -23,12 +23,12 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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);
     }
 
@@ -49,6 +49,6 @@ class PseudoNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier);
+        return \sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier);
     }
 }

vendor/symfony/css-selector/Node/SelectorNode.php

@@ -23,12 +23,12 @@ namespace Symfony\Component\CssSelector\Node;
  */
 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;
     }
 
@@ -49,6 +49,6 @@ class SelectorNode extends AbstractNode
 
     public function __toString(): string
     {
-        return sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : '');
+        return \sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : '');
     }
 }

vendor/symfony/css-selector/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

vendor/symfony/css-selector/Node/SpecificityAdjustmentNode.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\CssSelector\Node;
+
+/**
+ * Represents a "<selector>:where(<subSelectorList>)" node.
+ *
+ * This component is a port of the Python cssselect library,
+ * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
+ *
+ * @author Hubert Lenoir <lenoir.hubert@gmail.com>
+ *
+ * @internal
+ */
+class SpecificityAdjustmentNode extends AbstractNode
+{
+    /**
+     * @param array<NodeInterface> $arguments
+     */
+    public function __construct(
+        public readonly NodeInterface $selector,
+        public readonly array $arguments = [],
+    ) {
+    }
+
+    public function getSpecificity(): Specificity
+    {
+        return $this->selector->getSpecificity();
+    }
+
+    public function __toString(): string
+    {
+        $selectorArguments = array_map(
+            fn ($n) => ltrim((string) $n, '*'),
+            $this->arguments,
+        );
+
+        return \sprintf('%s[%s:where(%s)]', $this->getNodeName(), $this->selector, implode(', ', $selectorArguments));
+    }
+}