diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e328ee7..90ad77a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,8 @@ jobs:
         php-version:
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"
@@ -53,7 +55,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.2"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -81,7 +83,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.2"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -109,7 +111,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.2"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -137,7 +139,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.2"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -170,7 +172,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.2"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
@@ -201,7 +203,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.2"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
diff --git a/composer.json b/composer.json
index b104815..edc81f4 100644
--- a/composer.json
+++ b/composer.json
@@ -21,19 +21,13 @@
             "email": "dk@csgo.com"
         }
     ],
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/onmoon/php-openapi"
-        }
-    ],
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "cebe/php-openapi": "1.6.99",
+        "devizzent/cebe-php-openapi": "1.1.4",
         "league/openapi-psr7-validator": "^0.22.0",
         "lukasoppermann/http-status": "^4.0",
-        "nikic/php-parser": "^4.19",
+        "nikic/php-parser": "^v5.4",
         "nyholm/psr7": "^1.5",
         "phpdocumentor/reflection-docblock": "^5.3",
         "sspat/reserved-words": "^3.0",
@@ -47,23 +41,23 @@
         "symfony/psr-http-message-bridge": "^6.4|^7.0",
         "symfony/routing": "^6.4|^7.0",
         "symfony/yaml": "^6.4|^7.0",
-        "thecodingmachine/safe": "^1.3|^2"
+        "thecodingmachine/safe": "^3.1"
     },
     "require-dev": {
         "doctrine/coding-standard": "^12.0",
         "matthiasnoback/symfony-config-test": "^5.1",
         "matthiasnoback/symfony-dependency-injection-test": "^5.1",
-        "phpstan/phpstan": "^1.11",
-        "phpstan/phpstan-phpunit": "^1.4",
-        "phpstan/phpstan-strict-rules": "^1.6",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpunit": "^10.5",
-        "roave/infection-static-analysis-plugin": "^1.35",
+        "roave/infection-static-analysis-plugin": "^1.37",
         "squizlabs/php_codesniffer": "^3.10",
         "symfony/browser-kit": "^6.4|^7.0",
         "symfony/dom-crawler": "^6.4|^7.0",
         "symfony/framework-bundle": "^6.4|^7.0",
-        "thecodingmachine/phpstan-safe-rule": "^1.2",
-        "vimeo/psalm": "^5.24"
+        "thecodingmachine/phpstan-safe-rule": "v1.4",
+        "vimeo/psalm": "^6.10"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
diff --git a/src/CodeGenerator/ApiServerCodeGenerator.php b/src/CodeGenerator/ApiServerCodeGenerator.php
index 74c1385..df2f099 100644
--- a/src/CodeGenerator/ApiServerCodeGenerator.php
+++ b/src/CodeGenerator/ApiServerCodeGenerator.php
@@ -11,7 +11,7 @@
 
 use const DIRECTORY_SEPARATOR;
 
-class ApiServerCodeGenerator
+final class ApiServerCodeGenerator
 {
     private GraphGenerator $graphGenerator;
     private NameGenerator $nameGenerator;
diff --git a/src/CodeGenerator/AttributeGenerator.php b/src/CodeGenerator/AttributeGenerator.php
index 68216d3..f31502d 100644
--- a/src/CodeGenerator/AttributeGenerator.php
+++ b/src/CodeGenerator/AttributeGenerator.php
@@ -10,6 +10,7 @@
 use OnMoon\OpenApiServerBundle\CodeGenerator\Definitions\PropertyDefinition;
 use OnMoon\OpenApiServerBundle\Specification\Definitions\Property;
 
+/** @psalm-suppress ClassMustBeFinal */
 class AttributeGenerator
 {
     public function setAllAttributes(GraphDefinition $graph): void
diff --git a/src/CodeGenerator/Definitions/ClassDefinition.php b/src/CodeGenerator/Definitions/ClassDefinition.php
index ee07611..6f226b5 100644
--- a/src/CodeGenerator/Definitions/ClassDefinition.php
+++ b/src/CodeGenerator/Definitions/ClassDefinition.php
@@ -4,14 +4,17 @@
 
 namespace OnMoon\OpenApiServerBundle\CodeGenerator\Definitions;
 
-use function Safe\substr;
+use Override;
+
 use function strrpos;
+use function substr;
 
 class ClassDefinition implements ClassReference
 {
     private string $className;
     private string $namespace;
 
+    #[Override]
     final public function getClassName(): string
     {
         return $this->className;
@@ -24,6 +27,7 @@ final public function setClassName(string $className): self
         return $this;
     }
 
+    #[Override]
     final public function getNamespace(): string
     {
         return $this->namespace;
@@ -36,6 +40,7 @@ final public function setNamespace(string $namespace): self
         return $this;
     }
 
+    #[Override]
     final public function getFQCN(): string
     {
         return $this->namespace . '\\' . $this->className;
diff --git a/src/CodeGenerator/Definitions/ComponentDefinition.php b/src/CodeGenerator/Definitions/ComponentDefinition.php
index ab8956c..c71be5d 100644
--- a/src/CodeGenerator/Definitions/ComponentDefinition.php
+++ b/src/CodeGenerator/Definitions/ComponentDefinition.php
@@ -4,7 +4,7 @@
 
 namespace OnMoon\OpenApiServerBundle\CodeGenerator\Definitions;
 
-class ComponentDefinition
+final class ComponentDefinition
 {
     private DtoDefinition $dto;
 
diff --git a/src/CodeGenerator/Definitions/ComponentReference.php b/src/CodeGenerator/Definitions/ComponentReference.php
index d488201..d25b4f9 100644
--- a/src/CodeGenerator/Definitions/ComponentReference.php
+++ b/src/CodeGenerator/Definitions/ComponentReference.php
@@ -4,27 +4,33 @@
 
 namespace OnMoon\OpenApiServerBundle\CodeGenerator\Definitions;
 
-class ComponentReference implements DtoReference
+use Override;
+
+final class ComponentReference implements DtoReference
 {
     public function __construct(private ComponentDefinition $referencedComponent)
     {
     }
 
+    #[Override]
     public function getClassName(): string
     {
         return $this->referencedComponent->getDto()->getClassName();
     }
 
+    #[Override]
     public function getNamespace(): string
     {
         return $this->referencedComponent->getDto()->getNamespace();
     }
 
+    #[Override]
     public function getFQCN(): string
     {
         return $this->referencedComponent->getDto()->getFQCN();
     }
 
+    #[Override]
     public function isEmpty(): bool
     {
         return $this->referencedComponent->getDto()->isEmpty();
diff --git a/src/CodeGenerator/Definitions/DtoDefinition.php b/src/CodeGenerator/Definitions/DtoDefinition.php
index 0c36486..7c0bcb6 100644
--- a/src/CodeGenerator/Definitions/DtoDefinition.php
+++ b/src/CodeGenerator/Definitions/DtoDefinition.php
@@ -5,10 +5,11 @@
 namespace OnMoon\OpenApiServerBundle\CodeGenerator\Definitions;
 
 use OnMoon\OpenApiServerBundle\Interfaces\Dto;
+use Override;
 
 use function count;
 
-class DtoDefinition extends GeneratedClassDefinition implements DtoReference
+final class DtoDefinition extends GeneratedClassDefinition implements DtoReference
 {
     /** @var PropertyDefinition[] $properties; */
     private array $properties;
@@ -21,6 +22,7 @@ public function __construct(array $properties)
         $this->properties = $properties;
     }
 
+    #[Override]
     final public function isEmpty(): bool
     {
         return count($this->properties) === 0;
diff --git a/src/CodeGenerator/FileGenerator.php b/src/CodeGenerator/FileGenerator.php
index 7f3e966..c184828 100644
--- a/src/CodeGenerator/FileGenerator.php
+++ b/src/CodeGenerator/FileGenerator.php
@@ -14,6 +14,7 @@
 
 use function array_push;
 
+/** @psalm-suppress ClassMustBeFinal */
 class FileGenerator
 {
     private DtoCodeGenerator $dtoGenerator;
diff --git a/src/CodeGenerator/Filesystem/FilePutContentsFileWriter.php b/src/CodeGenerator/Filesystem/FilePutContentsFileWriter.php
index beb97ba..d10065a 100644
--- a/src/CodeGenerator/Filesystem/FilePutContentsFileWriter.php
+++ b/src/CodeGenerator/Filesystem/FilePutContentsFileWriter.php
@@ -4,6 +4,8 @@
 
 namespace OnMoon\OpenApiServerBundle\CodeGenerator\Filesystem;
 
+use Override;
+
 use function is_dir;
 use function Safe\file_put_contents;
 use function Safe\mkdir;
@@ -19,6 +21,7 @@ public function __construct(int $dirPemissions)
         $this->dirPemissions = $dirPemissions;
     }
 
+    #[Override]
     public function write(string $path, string $filename, string $contents): void
     {
         if (! is_dir($path)) {
diff --git a/src/CodeGenerator/GraphGenerator.php b/src/CodeGenerator/GraphGenerator.php
index 2eee373..4aa6af1 100644
--- a/src/CodeGenerator/GraphGenerator.php
+++ b/src/CodeGenerator/GraphGenerator.php
@@ -25,6 +25,7 @@
 use function array_map;
 use function count;
 
+/** @psalm-suppress ClassMustBeFinal */
 class GraphGenerator
 {
     private SpecificationLoader $loader;
diff --git a/src/CodeGenerator/NameGenerator.php b/src/CodeGenerator/NameGenerator.php
index 2ecade1..658a3f9 100644
--- a/src/CodeGenerator/NameGenerator.php
+++ b/src/CodeGenerator/NameGenerator.php
@@ -13,6 +13,7 @@
 
 use function ucfirst;
 
+/** @psalm-suppress ClassMustBeFinal */
 class NameGenerator
 {
     private const DTO_NAMESPACE       = 'Dto';
diff --git a/src/CodeGenerator/Naming/CannotCreateNamespace.php b/src/CodeGenerator/Naming/CannotCreateNamespace.php
index 80da985..9394401 100644
--- a/src/CodeGenerator/Naming/CannotCreateNamespace.php
+++ b/src/CodeGenerator/Naming/CannotCreateNamespace.php
@@ -6,7 +6,7 @@
 
 use OnMoon\OpenApiServerBundle\Exception\OpenApiError;
 
-use function Safe\sprintf;
+use function sprintf;
 
 final class CannotCreateNamespace extends OpenApiError
 {
diff --git a/src/CodeGenerator/Naming/CannotCreatePropertyName.php b/src/CodeGenerator/Naming/CannotCreatePropertyName.php
index 22b8b87..2e15083 100644
--- a/src/CodeGenerator/Naming/CannotCreatePropertyName.php
+++ b/src/CodeGenerator/Naming/CannotCreatePropertyName.php
@@ -6,7 +6,7 @@
 
 use OnMoon\OpenApiServerBundle\Exception\OpenApiError;
 
-use function Safe\sprintf;
+use function sprintf;
 
 final class CannotCreatePropertyName extends OpenApiError
 {
diff --git a/src/CodeGenerator/Naming/DefaultNamingStrategy.php b/src/CodeGenerator/Naming/DefaultNamingStrategy.php
index 76b5b4a..233b0b9 100644
--- a/src/CodeGenerator/Naming/DefaultNamingStrategy.php
+++ b/src/CodeGenerator/Naming/DefaultNamingStrategy.php
@@ -7,6 +7,7 @@
 use OnMoon\OpenApiServerBundle\CodeGenerator\NameGenerator;
 // phpcs:ignore SlevomatCodingStandard.Namespaces.UnusedUses.UnusedUse
 use OnMoon\OpenApiServerBundle\Interfaces\RequestHandler;
+use Override;
 use sspat\ReservedWords\ReservedWords;
 
 use function array_map;
@@ -37,11 +38,13 @@ public function __construct(
         $this->languageLevel = $languageLevel;
     }
 
+    #[Override]
     public function isAllowedPhpPropertyName(string $name): bool
     {
         return preg_match('/^\d/', $name) === 0 && preg_match('/^[A-Za-z0-9_]+$/', $name) === 1;
     }
 
+    #[Override]
     public function getInterfaceFQCN(string $apiNameSpace, string $operationId): string
     {
         /** @psalm-var class-string<RequestHandler> $interfaceNamespace */
@@ -56,6 +59,7 @@ public function getInterfaceFQCN(string $apiNameSpace, string $operationId): str
         return $interfaceNamespace;
     }
 
+    #[Override]
     public function stringToNamespace(string $text): string
     {
         $namespace = $this->padStringThatIsReservedNamespaceName(
@@ -71,6 +75,7 @@ public function stringToNamespace(string $text): string
         return $namespace;
     }
 
+    #[Override]
     public function stringToMethodName(string $text): string
     {
         $propertyName = $this->padStringThatIsReservedMethodName(
@@ -88,11 +93,13 @@ public function stringToMethodName(string $text): string
         return $propertyName;
     }
 
+    #[Override]
     public function buildNamespace(string ...$parts): string
     {
         return implode('\\', array_map(static fn (string $part): string => trim($part, '\\'), $parts));
     }
 
+    #[Override]
     public function buildPath(string ...$parts): string
     {
         return implode(
diff --git a/src/CodeGenerator/PhpParserGenerators/CodeGenerator.php b/src/CodeGenerator/PhpParserGenerators/CodeGenerator.php
index be417a1..87e7976 100644
--- a/src/CodeGenerator/PhpParserGenerators/CodeGenerator.php
+++ b/src/CodeGenerator/PhpParserGenerators/CodeGenerator.php
@@ -16,7 +16,7 @@
 use function array_map;
 use function count;
 use function implode;
-use function Safe\sprintf;
+use function sprintf;
 use function trim;
 
 use const PHP_EOL;
diff --git a/src/CodeGenerator/PhpParserGenerators/DtoCodeGenerator.php b/src/CodeGenerator/PhpParserGenerators/DtoCodeGenerator.php
index 04b4b3e..2b47970 100644
--- a/src/CodeGenerator/PhpParserGenerators/DtoCodeGenerator.php
+++ b/src/CodeGenerator/PhpParserGenerators/DtoCodeGenerator.php
@@ -34,9 +34,9 @@
 
 use function array_map;
 use function count;
-use function Safe\sprintf;
+use function sprintf;
 
-class DtoCodeGenerator extends CodeGenerator
+final class DtoCodeGenerator extends CodeGenerator
 {
     public function generate(DtoDefinition $definition): GeneratedFileDefinition
     {
@@ -302,7 +302,7 @@ private function generateFromArray(FileBuilder $builder, DtoDefinition $definiti
 
         $statements = [];
         if (count($setters) > 0) {
-            $statements[] = new Assign($dto, $new);
+            $statements[] = new Expression(new Assign($dto, $new));
             foreach ($setters as $setter) {
                 $statements[] = $setter;
             }
@@ -317,8 +317,8 @@ private function generateFromArray(FileBuilder $builder, DtoDefinition $definiti
             ->method('fromArray')
             ->makePublic()
             ->makeStatic()
-            ->setReturnType('self')
-            ->addParam(new Param_($source, null, 'array'))
+            ->setReturnType(new Name('self'))
+            ->addParam(new Param_($source, null, new Name('array')))
             ->setDocComment($this->getDocComment(['@inheritDoc']))
             ->addStmts($statements);
     }
diff --git a/src/CodeGenerator/PhpParserGenerators/FileBuilder.php b/src/CodeGenerator/PhpParserGenerators/FileBuilder.php
index 6dedcad..2dd9cf7 100644
--- a/src/CodeGenerator/PhpParserGenerators/FileBuilder.php
+++ b/src/CodeGenerator/PhpParserGenerators/FileBuilder.php
@@ -15,8 +15,9 @@
 use function in_array;
 use function Safe\preg_match;
 use function Safe\preg_replace;
-use function Safe\substr;
+use function substr;
 
+/** @psalm-suppress ClassMustBeFinal */
 class FileBuilder
 {
     private ClassDefinition $definition;
diff --git a/src/CodeGenerator/PhpParserGenerators/InterfaceCodeGenerator.php b/src/CodeGenerator/PhpParserGenerators/InterfaceCodeGenerator.php
index 7312472..68cc340 100644
--- a/src/CodeGenerator/PhpParserGenerators/InterfaceCodeGenerator.php
+++ b/src/CodeGenerator/PhpParserGenerators/InterfaceCodeGenerator.php
@@ -11,9 +11,9 @@
 use function array_map;
 use function count;
 use function implode;
-use function Safe\sprintf;
+use function sprintf;
 
-class InterfaceCodeGenerator extends CodeGenerator
+final class InterfaceCodeGenerator extends CodeGenerator
 {
     public function generate(RequestHandlerInterfaceDefinition $definition): GeneratedFileDefinition
     {
diff --git a/src/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGenerator.php b/src/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGenerator.php
index cefe0a0..fbcbeb7 100644
--- a/src/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGenerator.php
+++ b/src/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGenerator.php
@@ -24,9 +24,9 @@
 use PhpParser\Node\Stmt\Return_;
 use Psr\Container\ContainerInterface;
 
-use function Safe\sprintf;
+use function sprintf;
 
-class ServiceSubscriberCodeGenerator extends CodeGenerator
+final class ServiceSubscriberCodeGenerator extends CodeGenerator
 {
     public function generate(GraphDefinition $graphDefinition): GeneratedFileDefinition
     {
diff --git a/src/Command/DeleteGeneratedCodeCommand.php b/src/Command/DeleteGeneratedCodeCommand.php
index 6001b1b..23d1f2b 100644
--- a/src/Command/DeleteGeneratedCodeCommand.php
+++ b/src/Command/DeleteGeneratedCodeCommand.php
@@ -4,6 +4,7 @@
 
 namespace OnMoon\OpenApiServerBundle\Command;
 
+use Override;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use SplFileInfo;
@@ -18,8 +19,8 @@
 
 use function is_dir;
 use function Safe\rmdir;
-use function Safe\sprintf;
 use function Safe\unlink;
+use function sprintf;
 
 #[AsCommand(name: 'open-api:delete')]
 final class DeleteGeneratedCodeCommand extends Command
@@ -42,6 +43,7 @@ public function __construct(string $rootPath, ?string $name = null)
      */
     protected static $defaultName = self::COMMAND;
 
+    #[Override]
     protected function configure(): void
     {
         $this
@@ -53,6 +55,7 @@ protected function configure(): void
             );
     }
 
+    #[Override]
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (! (bool) $input->getOption('yes')) {
diff --git a/src/Command/GenerateApiCodeCommand.php b/src/Command/GenerateApiCodeCommand.php
index 97e3e2b..f32dbd0 100644
--- a/src/Command/GenerateApiCodeCommand.php
+++ b/src/Command/GenerateApiCodeCommand.php
@@ -7,6 +7,7 @@
 use FilesystemIterator;
 use OnMoon\OpenApiServerBundle\CodeGenerator\ApiServerCodeGenerator;
 use OnMoon\OpenApiServerBundle\Specification\SpecificationLoader;
+use Override;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use SplFileInfo;
@@ -21,8 +22,8 @@
 use function is_dir;
 use function iterator_count;
 use function Safe\rmdir;
-use function Safe\sprintf;
 use function Safe\unlink;
+use function sprintf;
 
 #[AsCommand(name: 'open-api:generate')]
 final class GenerateApiCodeCommand extends Command
@@ -46,6 +47,7 @@ public function __construct(
         parent::__construct($name);
     }
 
+    #[Override]
     protected function configure(): void
     {
         $this
@@ -65,6 +67,7 @@ protected function configure(): void
      */
     protected static $defaultName = self::COMMAND;
 
+    #[Override]
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $keep = (bool) $input->getOption('keep');
@@ -89,7 +92,6 @@ private function removeExtraFiles(string $root, array $generatedFiles): void
             return;
         }
 
-        /** @var SplFileInfo[] $iterator */
         $iterator = new RecursiveIteratorIterator(
             new RecursiveDirectoryIterator(
                 $root,
@@ -98,6 +100,7 @@ private function removeExtraFiles(string $root, array $generatedFiles): void
             RecursiveIteratorIterator::CHILD_FIRST
         );
 
+        /** @var SplFileInfo[] $iterator */
         foreach ($iterator as $directoryOrFile) {
             if ($directoryOrFile->isDir() || in_array($directoryOrFile->getPathname(), $generatedFiles, true)) {
                 continue;
diff --git a/src/Controller/ApiController.php b/src/Controller/ApiController.php
index 25362be..e66df13 100644
--- a/src/Controller/ApiController.php
+++ b/src/Controller/ApiController.php
@@ -39,7 +39,7 @@
 use function intdiv;
 use function is_numeric;
 use function ltrim;
-use function Safe\sprintf;
+use function sprintf;
 use function strcasecmp;
 
 use const JSON_THROW_ON_ERROR;
diff --git a/src/DependencyInjection/CompilerPass.php b/src/DependencyInjection/CompilerPass.php
index a29636a..0fa329a 100644
--- a/src/DependencyInjection/CompilerPass.php
+++ b/src/DependencyInjection/CompilerPass.php
@@ -5,6 +5,7 @@
 namespace OnMoon\OpenApiServerBundle\DependencyInjection;
 
 use OnMoon\OpenApiServerBundle\Controller\ApiController;
+use Override;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,6 +21,7 @@ public function __construct(string $tag)
         $this->tag = $tag;
     }
 
+    #[Override]
     public function process(ContainerBuilder $container): void
     {
         if (! $container->has(ApiController::class)) {
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 148487e..9424a6d 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -4,11 +4,13 @@
 
 namespace OnMoon\OpenApiServerBundle\DependencyInjection;
 
+use Override;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 final class Configuration implements ConfigurationInterface
 {
+    #[Override]
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('open_api_server');
diff --git a/src/DependencyInjection/OpenApiServerExtension.php b/src/DependencyInjection/OpenApiServerExtension.php
index 416633d..23a7a57 100644
--- a/src/DependencyInjection/OpenApiServerExtension.php
+++ b/src/DependencyInjection/OpenApiServerExtension.php
@@ -6,6 +6,7 @@
 
 use Exception;
 use OnMoon\OpenApiServerBundle\Specification\SpecificationLoader;
+use Override;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
@@ -19,6 +20,7 @@
 final class OpenApiServerExtension extends Extension implements ExtensionInterface
 {
     /** @param mixed[] $configs */
+    #[Override]
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
diff --git a/src/Exception/ApiCallFailed.php b/src/Exception/ApiCallFailed.php
index 4898bec..bee70ef 100644
--- a/src/Exception/ApiCallFailed.php
+++ b/src/Exception/ApiCallFailed.php
@@ -5,7 +5,7 @@
 namespace OnMoon\OpenApiServerBundle\Exception;
 
 use function implode;
-use function Safe\sprintf;
+use function sprintf;
 
 final class ApiCallFailed extends OpenApiError
 {
diff --git a/src/Exception/CannotParseOpenApi.php b/src/Exception/CannotParseOpenApi.php
index 4e08891..d2036e1 100644
--- a/src/Exception/CannotParseOpenApi.php
+++ b/src/Exception/CannotParseOpenApi.php
@@ -4,7 +4,7 @@
 
 namespace OnMoon\OpenApiServerBundle\Exception;
 
-use function Safe\sprintf;
+use function sprintf;
 
 final class CannotParseOpenApi extends OpenApiError
 {
diff --git a/src/OpenApiServerBundle.php b/src/OpenApiServerBundle.php
index 7a9839b..0cbc82a 100644
--- a/src/OpenApiServerBundle.php
+++ b/src/OpenApiServerBundle.php
@@ -6,6 +6,7 @@
 
 use OnMoon\OpenApiServerBundle\DependencyInjection\CompilerPass;
 use OnMoon\OpenApiServerBundle\Interfaces\ApiLoader;
+use Override;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -13,6 +14,7 @@ final class OpenApiServerBundle extends Bundle
 {
     public const API_LOADER_TAG = 'openapi.api_loader';
 
+    #[Override]
     public function build(ContainerBuilder $container): void
     {
         $container->registerForAutoconfiguration(ApiLoader::class)->addTag(self::API_LOADER_TAG);
diff --git a/src/Router/RouteLoader.php b/src/Router/RouteLoader.php
index 2eb6df2..b33a928 100644
--- a/src/Router/RouteLoader.php
+++ b/src/Router/RouteLoader.php
@@ -7,6 +7,7 @@
 use OnMoon\OpenApiServerBundle\Controller\ApiController;
 use OnMoon\OpenApiServerBundle\Specification\SpecificationLoader;
 use OnMoon\OpenApiServerBundle\Types\ArgumentResolver;
+use Override;
 use Stringable;
 use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\Routing\Route;
@@ -14,6 +15,7 @@
 
 use function array_key_exists;
 
+/** @psalm-suppress ClassMustBeFinal */
 class RouteLoader extends Loader
 {
     private SpecificationLoader $loader;
@@ -28,6 +30,7 @@ public function __construct(SpecificationLoader $loader, ArgumentResolver $argum
         $this->argumentResolver = $argumentResolver;
     }
 
+    #[Override]
     public function load(mixed $resource, ?string $type = null): RouteCollection
     {
         $specName      = (string) $resource;
@@ -41,8 +44,14 @@ public function load(mixed $resource, ?string $type = null): RouteCollection
 
             $parameters = $operation->getRequestParameters();
             if (array_key_exists('path', $parameters)) {
-                /** @psalm-var array<(string|Stringable)> $requirements */
-                $requirements = $this->argumentResolver->resolveArgumentPatterns($parameters['path']);
+                $argumentPatterns = $this->argumentResolver->resolveArgumentPatterns($parameters['path']);
+                foreach ($argumentPatterns as $name => $pattern) {
+                    if ($pattern === null) {
+                        continue;
+                    }
+
+                    $requirements[$name] = $pattern;
+                }
             }
 
             $defaults  = [
@@ -61,6 +70,7 @@ public function load(mixed $resource, ?string $type = null): RouteCollection
     }
 
     /** @inheritDoc */
+    #[Override]
     public function supports($resource, ?string $type = null): bool
     {
         return $type === self::OPENAPI_TYPE;
diff --git a/src/Serializer/ArrayDtoSerializer.php b/src/Serializer/ArrayDtoSerializer.php
index 474dcb7..789db2e 100644
--- a/src/Serializer/ArrayDtoSerializer.php
+++ b/src/Serializer/ArrayDtoSerializer.php
@@ -9,6 +9,7 @@
 use OnMoon\OpenApiServerBundle\Specification\Definitions\ObjectSchema;
 use OnMoon\OpenApiServerBundle\Specification\Definitions\Operation;
 use OnMoon\OpenApiServerBundle\Types\ScalarTypesResolver;
+use Override;
 use Symfony\Component\HttpFoundation\Request;
 
 use function array_key_exists;
@@ -27,6 +28,7 @@ public function __construct(ScalarTypesResolver $resolver, bool $sendNulls)
         $this->sendNotRequiredNullableNulls = $sendNulls;
     }
 
+    #[Override]
     public function createRequestDto(
         Request $request,
         Operation $operation,
@@ -67,6 +69,7 @@ public function createRequestDto(
     }
 
     /** @inheritDoc */
+    #[Override]
     public function createResponseFromDto(Dto $responseDto, ObjectSchema $definition): array
     {
         return $this->convert(false, $responseDto->toArray(), $definition);
diff --git a/src/Specification/Definitions/ComponentArray.php b/src/Specification/Definitions/ComponentArray.php
index 242c88c..d7b1385 100644
--- a/src/Specification/Definitions/ComponentArray.php
+++ b/src/Specification/Definitions/ComponentArray.php
@@ -7,6 +7,6 @@
 use ArrayObject;
 
 /** @extends ArrayObject<string,ObjectSchema> */
-class ComponentArray extends ArrayObject
+final class ComponentArray extends ArrayObject
 {
 }
diff --git a/src/Specification/Definitions/ObjectReference.php b/src/Specification/Definitions/ObjectReference.php
index 630ad7e..c3f6cad 100644
--- a/src/Specification/Definitions/ObjectReference.php
+++ b/src/Specification/Definitions/ObjectReference.php
@@ -4,7 +4,9 @@
 
 namespace OnMoon\OpenApiServerBundle\Specification\Definitions;
 
-class ObjectReference implements GetSchema
+use Override;
+
+final class ObjectReference implements GetSchema
 {
     public function __construct(private string $schemaName, private ObjectSchema $referencedObject)
     {
@@ -20,6 +22,7 @@ public function getReferencedObject(): ObjectSchema
         return $this->referencedObject;
     }
 
+    #[Override]
     public function getSchema(): ObjectSchema
     {
         return $this->getReferencedObject();
diff --git a/src/Specification/Definitions/ObjectSchema.php b/src/Specification/Definitions/ObjectSchema.php
index e642b4f..bbfba6a 100644
--- a/src/Specification/Definitions/ObjectSchema.php
+++ b/src/Specification/Definitions/ObjectSchema.php
@@ -4,6 +4,8 @@
 
 namespace OnMoon\OpenApiServerBundle\Specification\Definitions;
 
+use Override;
+
 final class ObjectSchema implements GetSchema
 {
     /** @var Property[] $properties; */
@@ -21,6 +23,7 @@ public function getProperties(): array
         return $this->properties;
     }
 
+    #[Override]
     public function getSchema(): ObjectSchema
     {
         return $this;
diff --git a/src/Specification/SpecificationLoader.php b/src/Specification/SpecificationLoader.php
index 5fcc345..5376d02 100644
--- a/src/Specification/SpecificationLoader.php
+++ b/src/Specification/SpecificationLoader.php
@@ -17,11 +17,12 @@
 use function file_exists;
 use function implode;
 use function pathinfo;
-use function Safe\sprintf;
+use function sprintf;
 use function stream_is_local;
 
 use const PATHINFO_EXTENSION;
 
+/** @psalm-suppress ClassMustBeFinal */
 class SpecificationLoader
 {
     public const CACHE_TAG         = 'openapi.server.bundle.specifications';
diff --git a/src/Specification/SpecificationParser.php b/src/Specification/SpecificationParser.php
index fea367a..329cdab 100644
--- a/src/Specification/SpecificationParser.php
+++ b/src/Specification/SpecificationParser.php
@@ -42,6 +42,7 @@
 use function strcasecmp;
 use function substr;
 
+/** @psalm-suppress ClassMustBeFinal */
 class SpecificationParser
 {
     private ScalarTypesResolver $typeResolver;
diff --git a/src/Types/ArgumentResolver.php b/src/Types/ArgumentResolver.php
index 947309e..61fd5ee 100644
--- a/src/Types/ArgumentResolver.php
+++ b/src/Types/ArgumentResolver.php
@@ -9,6 +9,7 @@
 
 use function Safe\preg_match;
 
+/** @psalm-suppress ClassMustBeFinal */
 class ArgumentResolver
 {
     private ScalarTypesResolver $typesResolver;
diff --git a/src/Types/TypeSerializer.php b/src/Types/TypeSerializer.php
index a78f702..6f94a68 100644
--- a/src/Types/TypeSerializer.php
+++ b/src/Types/TypeSerializer.php
@@ -15,7 +15,7 @@
 use function Safe\base64_decode;
 use function sprintf;
 
-class TypeSerializer
+final class TypeSerializer
 {
     private const DATE_FORMAT     = 'Y-m-d';
     private const DATETIME_FORMAT = 'c';
diff --git a/src/Validator/LeaguePSR7RequestSchemaValidator.php b/src/Validator/LeaguePSR7RequestSchemaValidator.php
index aaefffa..c002046 100644
--- a/src/Validator/LeaguePSR7RequestSchemaValidator.php
+++ b/src/Validator/LeaguePSR7RequestSchemaValidator.php
@@ -7,6 +7,7 @@
 use League\OpenAPIValidation\PSR7\OperationAddress;
 use League\OpenAPIValidation\PSR7\ValidatorBuilder;
 use OnMoon\OpenApiServerBundle\Specification\Definitions\Specification;
+use Override;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -23,6 +24,7 @@ public function __construct(
         $this->httpFactory      = $httpFactory;
     }
 
+    #[Override]
     public function validate(
         Request $request,
         Specification $specification,
diff --git a/test/functional/Command/DeleteGeneratedCodeCommandTest.php b/test/functional/Command/DeleteGeneratedCodeCommandTest.php
index 3f30b67..a638d68 100644
--- a/test/functional/Command/DeleteGeneratedCodeCommandTest.php
+++ b/test/functional/Command/DeleteGeneratedCodeCommandTest.php
@@ -12,7 +12,7 @@
 use function rtrim;
 use function Safe\file_put_contents;
 use function Safe\mkdir;
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers \OnMoon\OpenApiServerBundle\Command\DeleteGeneratedCodeCommand */
 class DeleteGeneratedCodeCommandTest extends CommandTestCase
diff --git a/test/functional/Command/GenerateApiCodeCommandTest.php b/test/functional/Command/GenerateApiCodeCommandTest.php
index 081ab9d..4c14b39 100644
--- a/test/functional/Command/GenerateApiCodeCommandTest.php
+++ b/test/functional/Command/GenerateApiCodeCommandTest.php
@@ -10,7 +10,7 @@
 use Symfony\Component\Console\Tester\CommandTester;
 
 use function rtrim;
-use function Safe\sprintf;
+use function sprintf;
 use function ucfirst;
 
 use const DIRECTORY_SEPARATOR;
diff --git a/test/functional/DependencyInjection/ConfigurationTest.php b/test/functional/DependencyInjection/ConfigurationTest.php
index b861252..f700e80 100644
--- a/test/functional/DependencyInjection/ConfigurationTest.php
+++ b/test/functional/DependencyInjection/ConfigurationTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Kernel;
 
-use function Safe\sprintf;
+use function sprintf;
 use function version_compare;
 
 /** @covers \OnMoon\OpenApiServerBundle\DependencyInjection\Configuration */
diff --git a/test/functional/Specification/SpecificationLoaderTest.php b/test/functional/Specification/SpecificationLoaderTest.php
index e6289e9..408ea05 100644
--- a/test/functional/Specification/SpecificationLoaderTest.php
+++ b/test/functional/Specification/SpecificationLoaderTest.php
@@ -22,7 +22,7 @@
 use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
 use function array_pop;
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers \OnMoon\OpenApiServerBundle\Specification\SpecificationLoader */
 class SpecificationLoaderTest extends TestCase
diff --git a/test/functional/openapi_specification.yaml b/test/functional/openapi_specification.yaml
index 680a4b3..4aedfe0 100644
--- a/test/functional/openapi_specification.yaml
+++ b/test/functional/openapi_specification.yaml
@@ -3,7 +3,7 @@ info:
   title: 'Test Goods API'
   version: '1.0'
 paths:
-  '/goods/{goodId}':
+  /goods/{goodId}:
     get:
       operationId: "getGood"
       parameters:
diff --git a/test/generation/GeneratedClassAsserter.php b/test/generation/GeneratedClassAsserter.php
index 174a558..780b47e 100644
--- a/test/generation/GeneratedClassAsserter.php
+++ b/test/generation/GeneratedClassAsserter.php
@@ -22,12 +22,13 @@
 use PhpParser\Node\Stmt\UseUse;
 use PhpParser\NodeFinder;
 use PhpParser\ParserFactory;
+use PhpParser\PhpVersion;
 use PHPUnit\Framework\Assert;
 
 use function array_pop;
 use function explode;
 use function is_array;
-use function Safe\sprintf;
+use function sprintf;
 use function strpos;
 
 final class GeneratedClassAsserter
@@ -39,7 +40,7 @@ final class GeneratedClassAsserter
     public function __construct(InMemoryFileWriter $fileWriter, string $path)
     {
         $this->nodeFinder = new NodeFinder();
-        $phpParser        = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $phpParser        = (new ParserFactory())->createForVersion(PhpVersion::fromString('7.0'));
         $phpCode          = $fileWriter->getContentsByFullPath($path);
         $statements       = $phpParser->parse($phpCode);
         if ($statements === null) {
diff --git a/test/generation/GenerationTestCase.php b/test/generation/GenerationTestCase.php
index 3b5c79d..69cbf28 100644
--- a/test/generation/GenerationTestCase.php
+++ b/test/generation/GenerationTestCase.php
@@ -9,6 +9,7 @@
 use PhpParser\NodeFinder;
 use PhpParser\Parser;
 use PhpParser\ParserFactory;
+use PhpParser\PhpVersion;
 use PHPUnit\Framework\TestCase;
 
 abstract class GenerationTestCase extends TestCase
@@ -18,7 +19,7 @@ abstract class GenerationTestCase extends TestCase
 
     public function setUp(): void
     {
-        $this->phpParser  = (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
+        $this->phpParser  = (new ParserFactory())->createForVersion(PhpVersion::fromString('7.0'));
         $this->nodeFinder = new NodeFinder();
     }
 
diff --git a/test/unit/CodeGenerator/Naming/CannotCreateNamespaceTest.php b/test/unit/CodeGenerator/Naming/CannotCreateNamespaceTest.php
index 3993cf1..cf12839 100644
--- a/test/unit/CodeGenerator/Naming/CannotCreateNamespaceTest.php
+++ b/test/unit/CodeGenerator/Naming/CannotCreateNamespaceTest.php
@@ -7,7 +7,7 @@
 use OnMoon\OpenApiServerBundle\CodeGenerator\Naming\CannotCreateNamespace;
 use PHPUnit\Framework\TestCase;
 
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers  \OnMoon\OpenApiServerBundle\CodeGenerator\Naming\CannotCreateNamespace */
 final class CannotCreateNamespaceTest extends TestCase
diff --git a/test/unit/CodeGenerator/Naming/CannotCreatePropertyNameTest.php b/test/unit/CodeGenerator/Naming/CannotCreatePropertyNameTest.php
index 45b0ee5..0dfae5f 100644
--- a/test/unit/CodeGenerator/Naming/CannotCreatePropertyNameTest.php
+++ b/test/unit/CodeGenerator/Naming/CannotCreatePropertyNameTest.php
@@ -7,7 +7,7 @@
 use OnMoon\OpenApiServerBundle\CodeGenerator\Naming\CannotCreatePropertyName;
 use PHPUnit\Framework\TestCase;
 
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers \OnMoon\OpenApiServerBundle\CodeGenerator\Naming\CannotCreatePropertyName */
 final class CannotCreatePropertyNameTest extends TestCase
diff --git a/test/unit/CodeGenerator/PhpParserGenerators/FileBuilderTest.php b/test/unit/CodeGenerator/PhpParserGenerators/FileBuilderTest.php
index dd67499..0798d40 100644
--- a/test/unit/CodeGenerator/PhpParserGenerators/FileBuilderTest.php
+++ b/test/unit/CodeGenerator/PhpParserGenerators/FileBuilderTest.php
@@ -32,7 +32,7 @@ public function testAddStmt(): void
         /** @var \PhpParser\Node\Stmt\Use_ $statementToCheck */
         $statementToCheck = $this->fileBuilder->getNamespace()->getNode()->stmts[0];
 
-        Assert::assertEquals('test', $statementToCheck->uses[0]->name->parts[0]);
+        Assert::assertEquals('test', $statementToCheck->uses[0]->name->name);
     }
 
     public function testReferenceWithNotMatching(): void
@@ -63,9 +63,7 @@ public function testReferenceWithSameDefinition(): void
         /** @var Name $nodeName */
         $nodeName = $namespace->getNode()->name;
 
-        Assert::assertEquals('NamespaceOne', $nodeName->parts[0]);
-        Assert::assertEquals('NamespaceTwo', $nodeName->parts[1]);
-
+        Assert::assertEquals('NamespaceOne\NamespaceTwo', $nodeName->name);
         Assert::assertEquals('ClassDefinition', $reference);
     }
 
diff --git a/test/unit/CodeGenerator/PhpParserGenerators/InterfaceCodeGeneratorTest.php b/test/unit/CodeGenerator/PhpParserGenerators/InterfaceCodeGeneratorTest.php
index 6523fdd..6ac4394 100644
--- a/test/unit/CodeGenerator/PhpParserGenerators/InterfaceCodeGeneratorTest.php
+++ b/test/unit/CodeGenerator/PhpParserGenerators/InterfaceCodeGeneratorTest.php
@@ -62,7 +62,7 @@ public function testGenerateWithRequestHandlerInterfaceDefinition(): void
  */
 interface TestClass extends RequestHandler
 {
-    public function test() : void;
+    public function test(): void;
 }
 EOD;
         $expectedGeneratedFileDefinition = new GeneratedFileDefinition(
@@ -102,7 +102,7 @@ public function testGenerateWithRequestHandlerInterfaceDefinitionAndRequestedTyp
 interface TestClass extends RequestHandler
 {
     /** @param TestClass_ $request */
-    public function test(TestClass_ $request) : void;
+    public function test(TestClass_ $request): void;
 }
 EOD;
         $expectedGeneratedFileDefinition = new GeneratedFileDefinition(
@@ -139,7 +139,7 @@ public function testGenerateWithRequestHandlerInterfaceDefinitionAndResponseType
 interface TestClass extends RequestHandler
 {
     /** @return TestClass_ */
-    public function test() : TestClass_;
+    public function test(): TestClass_;
 }
 EOD;
         $expectedGeneratedFileDefinition = new GeneratedFileDefinition(
@@ -175,7 +175,7 @@ public function testGenerateWithRequestHandlerInterfaceDefinitionAndDescription(
 interface TestClass extends RequestHandler
 {
     /** method description */
-    public function test() : void;
+    public function test(): void;
 }
 EOD;
         $expectedGeneratedFileDefinition = new GeneratedFileDefinition(
diff --git a/test/unit/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGeneratorTest.php b/test/unit/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGeneratorTest.php
index 7f418ec..cee4328 100644
--- a/test/unit/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGeneratorTest.php
+++ b/test/unit/CodeGenerator/PhpParserGenerators/ServiceSubscriberCodeGeneratorTest.php
@@ -122,11 +122,11 @@ public function __construct(ContainerInterface $locator)
     /**
      * @inheritDoc
      */
-    public static function getSubscribedServices() : array
+    public static function getSubscribedServices(): array
     {
         return ['test' => '?' . ClassName::class];
     }
-    public function get(string $interface) : ?RequestHandler
+    public function get(string $interface): ?RequestHandler
     {
         if (!$this->locator->has($interface)) {
             return null;
@@ -134,7 +134,7 @@ public function get(string $interface) : ?RequestHandler
         return $this->locator->get($interface);
     }
     /** @return string[] */
-    public function getAllowedCodes(string $apiClass, string $dtoClass) : array
+    public function getAllowedCodes(string $apiClass, string $dtoClass): array
     {
         return self::HTTP_CODES[$apiClass][$dtoClass];
     }
diff --git a/test/unit/Exception/ApiCallFailedTest.php b/test/unit/Exception/ApiCallFailedTest.php
index 761fcd3..061dd33 100644
--- a/test/unit/Exception/ApiCallFailedTest.php
+++ b/test/unit/Exception/ApiCallFailedTest.php
@@ -7,7 +7,7 @@
 use OnMoon\OpenApiServerBundle\Exception\ApiCallFailed;
 use PHPUnit\Framework\TestCase;
 
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers \OnMoon\OpenApiServerBundle\Exception\ApiCallFailed */
 final class ApiCallFailedTest extends TestCase
diff --git a/test/unit/Exception/CannotParseOpenApiTest.php b/test/unit/Exception/CannotParseOpenApiTest.php
index 8ffa902..b82eaf4 100644
--- a/test/unit/Exception/CannotParseOpenApiTest.php
+++ b/test/unit/Exception/CannotParseOpenApiTest.php
@@ -7,7 +7,7 @@
 use OnMoon\OpenApiServerBundle\Exception\CannotParseOpenApi;
 use PHPUnit\Framework\TestCase;
 
-use function Safe\sprintf;
+use function sprintf;
 
 /** @covers \OnMoon\OpenApiServerBundle\Exception\CannotParseOpenApi */
 final class CannotParseOpenApiTest extends TestCase