diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index e64a966..1d7110a 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -24,4 +24,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0"
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index b1cd768..c32da64 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -26,4 +26,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"
diff --git a/composer.json b/composer.json
index be3013c..7e16723 100644
--- a/composer.json
+++ b/composer.json
@@ -30,11 +30,11 @@
         "doctrine/deprecations": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9 || ^10",
+        "doctrine/coding-standard": "^9 || ^12",
         "phpstan/phpstan": "^1.3",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "psalm/plugin-phpunit": "^0.18.3",
-        "vimeo/psalm": "^4.11 || ^5.0"
+        "vimeo/psalm": "^4.11 || ^5.21"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 54a9e54..5131f5d 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -9,7 +9,7 @@
     <config name="php_version" value="70100"/>
 
     <!-- Ignore warnings and show progress of the run -->
-    <arg value="np"/>
+    <arg value="nps"/>
 
     <file>src</file>
     <file>tests</file>
@@ -32,4 +32,9 @@
         <!-- Remove when dropping PHPUnit 7 -->
         <exclude-pattern>tests/*</exclude-pattern>
     </rule>
+
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint">
+        <!-- The sniff does not interpret @inheritDoc correctly anymore -->
+        <exclude-pattern>src/Token.php</exclude-pattern>
+    </rule>
 </ruleset>
diff --git a/psalm.xml b/psalm.xml
index daebf3a..237d612 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
-    phpVersion="8.1"
+    phpVersion="8.3"
     resolveFromConfigFile="true"
     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"
 >
     <projectFiles>
         <directory name="src"/>
@@ -52,6 +54,12 @@
                 <file name="src/Token.php" />
             </errorLevel>
         </MixedReturnStatement>
+        <PossiblyUnusedProperty>
+            <errorLevel type="suppress">
+                <!-- TODO: Cover this property in a test -->
+                <referencedProperty name="Doctrine\Common\Lexer\Token::$position"/>
+            </errorLevel>
+        </PossiblyUnusedProperty>
         <ReferenceConstraintViolation>
             <errorLevel type="suppress">
                 <!-- https://github.com/vimeo/psalm/issues/8891 -->
diff --git a/src/AbstractLexer.php b/src/AbstractLexer.php
index e160a8f..8bbe6b0 100644
--- a/src/AbstractLexer.php
+++ b/src/AbstractLexer.php
@@ -70,7 +70,7 @@ abstract class AbstractLexer
     /**
      * Composed regex for input parsing.
      *
-     * @var string|null
+     * @var non-empty-string|null
      */
     private $regex;