Bump minimum version of PHP to 8.1

Author: nicolas-grekas

Tests/Parser/Handler/AbstractHandlerTest.php

@@ -52,7 +52,6 @@ abstract protected function generateHandler();
     protected function assertStreamEmpty(TokenStream $stream)
     {
         $property = new \ReflectionProperty($stream, 'tokens');
-        $property->setAccessible(true);
 
         $this->assertEquals([], $property->getValue($stream));
     }

Tests/Parser/ReaderTest.php

@@ -96,7 +96,6 @@ public function testToEnd()
     private function assignPosition(Reader $reader, int $value)
     {
         $position = new \ReflectionProperty($reader, 'position');
-        $position->setAccessible(true);
         $position->setValue($reader, $value);
     }
 }

XPath/Extension/AttributeMatchingExtension.php

@@ -32,14 +32,14 @@ class AttributeMatchingExtension extends AbstractExtension
     public function getAttributeMatchingTranslators(): array
     {
         return [
-            'exists' => [$this, 'translateExists'],
-            '=' => [$this, 'translateEquals'],
-            '~=' => [$this, 'translateIncludes'],
-            '|=' => [$this, 'translateDashMatch'],
-            '^=' => [$this, 'translatePrefixMatch'],
-            '$=' => [$this, 'translateSuffixMatch'],
-            '*=' => [$this, 'translateSubstringMatch'],
-            '!=' => [$this, 'translateDifferent'],
+            'exists' => $this->translateExists(...),
+            '=' => $this->translateEquals(...),
+            '~=' => $this->translateIncludes(...),
+            '|=' => $this->translateDashMatch(...),
+            '^=' => $this->translatePrefixMatch(...),
+            '$=' => $this->translateSuffixMatch(...),
+            '*=' => $this->translateSubstringMatch(...),
+            '!=' => $this->translateDifferent(...),
         ];
     }
 

XPath/Extension/CombinationExtension.php

@@ -31,10 +31,10 @@ class CombinationExtension extends AbstractExtension
     public function getCombinationTranslators(): array
     {
         return [
-            ' ' => [$this, 'translateDescendant'],
-            '>' => [$this, 'translateChild'],
-            '+' => [$this, 'translateDirectAdjacent'],
-            '~' => [$this, 'translateIndirectAdjacent'],
+            ' ' => $this->translateDescendant(...),
+            '>' => $this->translateChild(...),
+            '+' => $this->translateDirectAdjacent(...),
+            '~' => $this->translateIndirectAdjacent(...),
         ];
     }
 

XPath/Extension/FunctionExtension.php

@@ -36,12 +36,12 @@ class FunctionExtension extends AbstractExtension
     public function getFunctionTranslators(): array
     {
         return [
-            'nth-child' => [$this, 'translateNthChild'],
-            'nth-last-child' => [$this, 'translateNthLastChild'],
-            'nth-of-type' => [$this, 'translateNthOfType'],
-            'nth-last-of-type' => [$this, 'translateNthLastOfType'],
-            'contains' => [$this, 'translateContains'],
-            'lang' => [$this, 'translateLang'],
+            'nth-child' => $this->translateNthChild(...),
+            'nth-last-child' => $this->translateNthLastChild(...),
+            'nth-of-type' => $this->translateNthOfType(...),
+            'nth-last-of-type' => $this->translateNthLastOfType(...),
+            'contains' => $this->translateContains(...),
+            'lang' => $this->translateLang(...),
         ];
     }
 

XPath/Extension/HtmlExtension.php

@@ -42,14 +42,14 @@ public function __construct(Translator $translator)
     public function getPseudoClassTranslators(): array
     {
         return [
-            'checked' => [$this, 'translateChecked'],
-            'link' => [$this, 'translateLink'],
-            'disabled' => [$this, 'translateDisabled'],
-            'enabled' => [$this, 'translateEnabled'],
-            'selected' => [$this, 'translateSelected'],
-            'invalid' => [$this, 'translateInvalid'],
-            'hover' => [$this, 'translateHover'],
-            'visited' => [$this, 'translateVisited'],
+            'checked' => $this->translateChecked(...),
+            'link' => $this->translateLink(...),
+            'disabled' => $this->translateDisabled(...),
+            'enabled' => $this->translateEnabled(...),
+            'selected' => $this->translateSelected(...),
+            'invalid' => $this->translateInvalid(...),
+            'hover' => $this->translateHover(...),
+            'visited' => $this->translateVisited(...),
         ];
     }
 
@@ -59,7 +59,7 @@ public function getPseudoClassTranslators(): array
     public function getFunctionTranslators(): array
     {
         return [
-            'lang' => [$this, 'translateLang'],
+            'lang' => $this->translateLang(...),
         ];
     }
 

XPath/Extension/NodeExtension.php

@@ -65,15 +65,15 @@ public function hasFlag(int $flag): bool
     public function getNodeTranslators(): array
     {
         return [
-            'Selector' => [$this, 'translateSelector'],
-            'CombinedSelector' => [$this, 'translateCombinedSelector'],
-            'Negation' => [$this, 'translateNegation'],
-            'Function' => [$this, 'translateFunction'],
-            'Pseudo' => [$this, 'translatePseudo'],
-            'Attribute' => [$this, 'translateAttribute'],
-            'Class' => [$this, 'translateClass'],
-            'Hash' => [$this, 'translateHash'],
-            'Element' => [$this, 'translateElement'],
+            'Selector' => $this->translateSelector(...),
+            'CombinedSelector' => $this->translateCombinedSelector(...),
+            'Negation' => $this->translateNegation(...),
+            'Function' => $this->translateFunction(...),
+            'Pseudo' => $this->translatePseudo(...),
+            'Attribute' => $this->translateAttribute(...),
+            'Class' => $this->translateClass(...),
+            'Hash' => $this->translateHash(...),
+            'Element' => $this->translateElement(...),
         ];
     }
 

XPath/Extension/PseudoClassExtension.php

@@ -32,14 +32,14 @@ class PseudoClassExtension extends AbstractExtension
     public function getPseudoClassTranslators(): array
     {
         return [
-            'root' => [$this, 'translateRoot'],
-            'first-child' => [$this, 'translateFirstChild'],
-            'last-child' => [$this, 'translateLastChild'],
-            'first-of-type' => [$this, 'translateFirstOfType'],
-            'last-of-type' => [$this, 'translateLastOfType'],
-            'only-child' => [$this, 'translateOnlyChild'],
-            'only-of-type' => [$this, 'translateOnlyOfType'],
-            'empty' => [$this, 'translateEmpty'],
+            'root' => $this->translateRoot(...),
+            'first-child' => $this->translateFirstChild(...),
+            'last-child' => $this->translateLastChild(...),
+            'first-of-type' => $this->translateFirstOfType(...),
+            'last-of-type' => $this->translateLastOfType(...),
+            'only-child' => $this->translateOnlyChild(...),
+            'only-of-type' => $this->translateOnlyOfType(...),
+            'empty' => $this->translateEmpty(...),
         ];
     }
 

composer.json

@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.2"
+        "php": ">=8.1"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\CssSelector\\": "" },