Various static and linting prompted fixes

Author: cooperaj

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": "^8.1.0",
+    "php": "^8.1 || ^8.2 || ^8.3 || ^8.4",
     "ext-gettext": "*",
     "twig/twig": "^v3.21",
     "symfony/finder": "^4.0 || ^5.0",

psalm.xml

@@ -4,8 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="true"
+    ensureOverrideAttribute="false"
 >
     <projectFiles>
         <directory name="src" />

src/ExtractionException.php

@@ -6,6 +6,6 @@
 
 use Exception;
 
-class ExtractionException extends Exception
+final class ExtractionException extends Exception
 {
 }

src/NodeVisitor/Message.php

@@ -4,7 +4,7 @@
 
 namespace Acpr\I18n\NodeVisitor;
 
-class Message
+final class Message
 {
     /**
      * @param string      $original The original text, or key to use for the translation

src/NodeVisitor/PhpParserNodeVisitor.php

@@ -4,6 +4,7 @@
 
 namespace Acpr\I18n\NodeVisitor;
 
+use Override;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
@@ -27,6 +28,7 @@ public function getMessages(): array
         return $this->messages;
     }
 
+    #[Override]
     public function leaveNode(Node $node)
     {
         if (!$node instanceof MethodCall) {

src/TokenParser/BadPluralisationRuleException.php

@@ -6,6 +6,6 @@
 
 use Exception;
 
-class BadPluralisationRuleException extends Exception
+final class BadPluralisationRuleException extends Exception
 {
 }

src/TokenParser/TransTokenParser.php

@@ -15,7 +15,6 @@
 
 use Acpr\I18n\Node\TransNode;
 use Twig\Error\SyntaxError;
-use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Node;
 use Twig\Node\TextNode;
@@ -48,21 +47,18 @@ public function parse(Token $token): Node
             if ($stream->test('count')) {
                 // {% trans count 5 %}
                 $stream->next();
-                /** @var AbstractExpression $count */
                 $count = $this->parser->parseExpression();
             }
 
             if ($stream->test('with')) {
                 // {% trans with vars %}
                 $stream->next();
-                /** @var AbstractExpression $vars */
                 $vars = $this->parser->parseExpression();
             }
 
             if ($stream->test('from')) {
                 // {% trans from "messages" %}
                 $stream->next();
-                /** @var AbstractExpression $domain */
                 $domain = $this->parser->parseExpression();
             }
 
@@ -144,7 +140,7 @@ public function parse(Token $token): Node
             preg_replace('/\s{2,}/', ' ', $msg)
         );
 
-        return new TransNode($body, $plural, $domain, $count, $vars, $notes, $context, $lineno, $this->getTag());
+        return new TransNode($body, $plural, $domain, $count, $vars, $notes, $context, $lineno);
     }
 
     /**

src/TokenParser/UnhandledPluralisationRuleException.php

@@ -6,6 +6,6 @@
 
 use Exception;
 
-class UnhandledPluralisationRuleException extends Exception
+final class UnhandledPluralisationRuleException extends Exception
 {
 }