diff --git a/composer.json b/composer.json
index c1423c98..c3fcd24e 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     },
     "require-dev": {
         "symplify/easy-coding-standard": "^12.5",
-        "squizlabs/php_codesniffer": "^3.12",
+        "squizlabs/php_codesniffer": "^4.0",
         "phpunit/phpunit": "^11.5",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.1",
diff --git a/phpstan.neon b/phpstan.neon
index 4fa0bf43..9dbaf7a7 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -27,15 +27,6 @@ parameters:
             message: '#Comparison operation ">\=" between int<80200, 80599> and (.*?) is always true#'
             path: src/TokenAnalyzer/DocblockRelatedParamNamesResolver.php
 
-        # offset access issues
-        -
-            message: '#Offset int\|null might not exist on PhpCsFixer\\Tokenizer\\Tokens#'
-            path: src/Fixer/Naming/ClassNameResolver.php
-
-        -
-            message: '#Offset int\|null might not exist on PhpCsFixer\\Tokenizer\\Tokens#'
-            path: src/Fixer/Naming/MethodNameResolver.php
-
         # array filter issue
         -
             message: '#Parameter \#1 \$array \(array<int, PhpCsFixer\\Tokenizer\\Token>\) to function array_filter does not contain falsy values, the array will always stay the same#'
diff --git a/src/Fixer/Naming/ClassNameResolver.php b/src/Fixer/Naming/ClassNameResolver.php
index cad8e7b6..a3af088f 100644
--- a/src/Fixer/Naming/ClassNameResolver.php
+++ b/src/Fixer/Naming/ClassNameResolver.php
@@ -45,6 +45,11 @@ private function resolveFromTokens(Tokens $tokens): ?string
             }
 
             $nextNextMeaningfulTokenIndex = $tokens->getNextMeaningfulToken($position + 1);
+
+            if (null === $nextNextMeaningfulTokenIndex) {
+                continue;
+            }
+
             $nextNextMeaningfulToken = $tokens[$nextNextMeaningfulTokenIndex];
 
             // skip anonymous classes
diff --git a/src/Fixer/Naming/MethodNameResolver.php b/src/Fixer/Naming/MethodNameResolver.php
index 57a96c88..af6af29a 100644
--- a/src/Fixer/Naming/MethodNameResolver.php
+++ b/src/Fixer/Naming/MethodNameResolver.php
@@ -24,6 +24,11 @@ public function resolve(Tokens $tokens, int $currentPosition): ?string
             }
 
             $nextNextMeaningfulTokenIndex = $tokens->getNextMeaningfulToken($position + 1);
+
+            if (null === $nextNextMeaningfulTokenIndex) {
+                continue;
+            }
+
             $nextNextMeaningfulToken = $tokens[$nextNextMeaningfulTokenIndex];
 
             // skip anonymous functions