diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8bbfdfd..bc6d95b3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,20 +15,8 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [ ubuntu-latest ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         dependencies: [ 'lowest', 'highest' ]
-        exclude:
-          - php: '8.1'
-            dependencies: 'lowest'
-          - php: '8.2'
-            dependencies: 'lowest'
-          - php: '8.3'
-            dependencies: 'lowest'
-          - php: '8.4'
-            dependencies: 'lowest'
-        include:
-          - php: '8.2'
-            composer-options: "--ignore-platform-req=php+"
 
     name: PHP ${{ matrix.php }} on ${{ matrix.operating-system }} with ${{ matrix.dependencies }} dependencies
 
@@ -50,8 +38,3 @@ jobs:
 
       - name: PHPUnit Tests
         run: bin/phpunit --configuration phpunit.xml.dist --coverage-text
-
-      - name: PHPUnit Legacy Tests
-        run: bin/phpunit --configuration phpunit.xml.dist --coverage-text
-        env:
-          PHPUNIT_ANALYSER: 'legacy'
diff --git a/.github/workflows/security-checks.yml b/.github/workflows/security-checks.yml
index 949602e0..f6474c3a 100644
--- a/.github/workflows/security-checks.yml
+++ b/.github/workflows/security-checks.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [ ubuntu-latest ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         dependencies: [ 'highest' ]
 
     name: PHP ${{ matrix.php }} on ${{ matrix.operating-system }} with ${{ matrix.dependencies }} dependencies
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 2affc46d..93291364 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -6,9 +6,15 @@
 $finder = PhpCsFixer\Finder::create()
     ->path('src')->name('*.php')
     ->path('tests')->name('*.php')
-    // ContextTest::testFullyQualifiedName relies on the 'use Exception' statement...
     ->filter(function (\SplFileInfo $file) {
-        return !strpos($file->getPathname(), 'tests/Fixtures/Customer.php');
+        return
+            // ContextTest::testFullyQualifiedName relies on the 'use Exception' statement...
+            !strpos($file->getPathname(), 'tests/Fixtures/Customer.php')
+            // multi arg use; 'use a, b;`
+            && !strpos($file->getPathname(), 'tests/Fixtures/Parser/HelloTrait.php')
+            // FQDN in docblock
+            && !strpos($file->getPathname(), 'tests/Fixtures/TypedProperties.php')
+        ;
     })
     ->path('Examples')->name('*.php')
     ->filter(function (\SplFileInfo $file) {
@@ -24,10 +30,11 @@
         (new ScopedDeclareStrictTypesFixer())->scope(['/src/', '/tests/']),
     ])
     ->setRules([
-        '@PSR2' => true,
+        '@PSR12' => true,
         '@DoctrineAnnotation' => true,
         'OpenApi/license' => true,
         'OpenApi/declare_strict_types' => true,
+        'blank_line_after_opening_tag' => false,
         'array_syntax' => ['syntax' => 'short'],
         'no_unused_imports' => true,
         'blank_line_before_statement' => ['statements' => ['return']],
diff --git a/README.md b/README.md
index 30764f6e..7f1ac3b2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 # swagger-php
 
-Generate interactive [OpenAPI](https://www.openapis.org) documentation for your RESTful API using [PHP attributes](https://www.php.net/manual/en/language.attributes.overview.php) (preferred) or 
+Generate interactive [OpenAPI](https://www.openapis.org) documentation for your RESTful API using [PHP attributes](https://www.php.net/manual/en/language.attributes.overview.php) (preferred) or
 [doctrine annotations](https://www.doctrine-project.org/projects/annotations.html) (requires additional `doctrine/annotations` library).
 
 See the [documentation website](https://zircote.github.io/swagger-php/guide/attributes.html) for supported attributes and annotations.
@@ -98,9 +98,6 @@ The `openapi` command line interface can be used to generate the documentation t
 ```shell
 ./vendor/bin/openapi --help
 ```
-Starting with version 4 the default analyser used on the command line is the new `ReflectionAnalyser`.
-
-Using the `--legacy` flag (`-l`) the legacy `TokenAnalyser` can still be used.
 
 ### Usage from the Deserializer
 
diff --git a/bin/openapi b/bin/openapi
index a41fa0d7..dae40fbb 100755
--- a/bin/openapi
+++ b/bin/openapi
@@ -4,7 +4,6 @@
 use OpenApi\Analysers\AttributeAnnotationFactory;
 use OpenApi\Analysers\DocBlockAnnotationFactory;
 use OpenApi\Analysers\ReflectionAnalyser;
-use OpenApi\Analysers\TokenAnalyser;
 use OpenApi\Annotations\OpenApi;
 use OpenApi\Generator;
 use OpenApi\Util;
@@ -23,7 +22,6 @@ error_reporting(E_ALL);
 // Possible options and their default values.
 $options = [
     'config' => [],
-    'legacy' => false,
     'output' => false,
     'format' => 'auto',
     'exclude' => [],
@@ -36,7 +34,6 @@ $options = [
 ];
 $aliases = [
     'c' => 'config',
-    'l' => 'legacy',
     'o' => 'output',
     'e' => 'exclude',
     'n' => 'pattern',
@@ -132,7 +129,6 @@ Usage: openapi [--option value] [/path/to/project ...]
 Options:
   --config (-c)     Generator config
                     ex: -c operationId.hash=false
-  --legacy (-l)     Use legacy TokenAnalyser; default is the new ReflectionAnalyser
   --output (-o)     Path to store the generated documentation.
                     ex: --output openapi.yaml
   --exclude (-e)    Exclude path(s).
@@ -222,9 +218,7 @@ foreach ($options["processor"] as $processor) {
     $generator->getProcessorPipeline()->add($processor);
 }
 
-$analyser = $options['legacy']
-    ? new TokenAnalyser()
-    : new ReflectionAnalyser([new DocBlockAnnotationFactory(), new AttributeAnnotationFactory()]);
+$analyser = new ReflectionAnalyser([new DocBlockAnnotationFactory(), new AttributeAnnotationFactory()]);
 
 $openapi = $generator
     ->setVersion($options['version'])
diff --git a/composer.json b/composer.json
index 62414402..1dce1a1f 100644
--- a/composer.json
+++ b/composer.json
@@ -40,16 +40,17 @@
     "minimum-stability": "stable",
     "extra": {
         "branch-alias": {
-            "dev-master": "4.x-dev"
+            "dev-master": "5.x-dev"
         }
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "ext-json": "*",
+        "nikic/php-parser": "^4.19",
         "psr/log": "^1.1 || ^2.0 || ^3.0",
         "symfony/deprecation-contracts": "^2 || ^3",
-        "symfony/finder": ">=2.2",
-        "symfony/yaml": ">=3.3"
+        "symfony/finder": "^5.0 || ^6.0 || ^7.0",
+        "symfony/yaml": "^5.0 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -58,17 +59,18 @@
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
-        "doctrine/annotations": "^1.7 || ^2.0",
-        "friendsofphp/php-cs-fixer": "^2.17 || 3.62.0",
+        "doctrine/annotations": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.62.0",
         "phpstan/phpstan": "^1.6",
-        "phpunit/phpunit": ">=8",
-        "vimeo/psalm": "^4.23"
+        "phpunit/phpunit": "^9.0",
+        "rector/rector": "^1.0",
+        "vimeo/psalm": "^4.30"
     },
     "conflict": {
         "symfony/process": ">=6, <6.4.14"
     },
     "suggest": {
-        "doctrine/annotations": "^1.7 || ^2.0"
+        "doctrine/annotations": "^2.0"
     },
     "autoload-dev": {
         "exclude-from-classmap": [
@@ -82,10 +84,9 @@
     },
     "scripts-descriptions": {
         "cs": "Fix all codestyle issues",
+        "rector": "Automatic refactoring",
         "lint": "Test codestyle",
-        "test": "Run all non-legacy and codestyle tests",
-        "testlegacy": "Run tests using the legacy TokenAnalyser",
-        "testall": "Run all tests (test + testlegacy)",
+        "test": "Run all PHP, codestyle and rector tests",
         "analyse": "Run static analysis (phpstan/psalm)",
         "spectral-examples": "Run spectral lint over all .yaml files in the Examples folder",
         "spectral-scratch": "Run spectral lint over all .yaml files in the tests/Fixtures/Scratch folder",
@@ -96,16 +97,15 @@
     },
     "scripts": {
         "cs": "export XDEBUG_MODE=off && php-cs-fixer fix --allow-risky=yes",
-        "lint": "@cs --dry-run",
+        "rector": "rector process src",
+        "lint": [
+            "@cs --dry-run",
+            "@rector --dry-run"
+        ],
         "test": [
             "export XDEBUG_MODE=off && phpunit",
             "@lint"
         ],
-        "testlegacy": "export XDEBUG_MODE=off && export PHPUNIT_ANALYSER=legacy && phpunit",
-        "testall": [
-            "@test",
-            "@testlegacy"
-        ],
         "analyse": [
             "export XDEBUG_MODE=off && phpstan analyse --memory-limit=2G",
             "export XDEBUG_MODE=off && psalm"
diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js
index 670afcf1..4a04e2c3 100644
--- a/docs/.vitepress/config.js
+++ b/docs/.vitepress/config.js
@@ -20,6 +20,7 @@ function getGuideSidebar() {
     {
       text: 'Upgrading',
       children: [
+        { text: 'Migration from 4.x to 5.x', link: '/guide/migrating-to-v5' },
         { text: 'Migration from 3.x to 4.x', link: '/guide/migrating-to-v4' },
         { text: 'Migration from 2.x to 3.x', link: '/guide/migrating-to-v3' },
       ]
diff --git a/docs/guide/generating-openapi-documents.md b/docs/guide/generating-openapi-documents.md
index 92fa204b..e19ba23e 100644
--- a/docs/guide/generating-openapi-documents.md
+++ b/docs/guide/generating-openapi-documents.md
@@ -36,7 +36,6 @@ Usage: openapi [--option value] [/path/to/project ...]
 Options:
   --config (-c)     Generator config
                     ex: -c operationId.hash=false
-  --legacy (-l)     Use legacy TokenAnalyser; default is the new ReflectionAnalyser
   --output (-o)     Path to store the generated documentation.
                     ex: --output openapi.yaml
   --exclude (-e)    Exclude path(s).
diff --git a/docs/guide/migrating-to-v5.md b/docs/guide/migrating-to-v5.md
new file mode 100644
index 00000000..387fba67
--- /dev/null
+++ b/docs/guide/migrating-to-v5.md
@@ -0,0 +1,15 @@
+# Migrating to v5
+
+## Overview
+
+v5 is mostly a cleanup release with updated dependencies. The main changes are:
+
+* Minimum required PHP version is now 7.4
+* The legacy `TokenAnalyser` and the `--legacy` CLI option have been removed
+* Defaults now prefer attributes over annotations
+* PHP parsing now uses `nicic/php-parser`
+* Removal of deprecated features
+  * empty/unused `ProcessorInterface`
+  * `Context::clone()` and `Context::detect()`
+
+For most installations upgrading should not require any changes.
diff --git a/docs/guide/under-the-hood.md b/docs/guide/under-the-hood.md
index 7ee2dbb1..7506bf12 100644
--- a/docs/guide/under-the-hood.md
+++ b/docs/guide/under-the-hood.md
@@ -5,6 +5,7 @@
 - The `Generator` iterates over the given sources (Symfony `Finder`, file/directory list, etc)
 - The configured analyser (`AnalyserInterface`) reads the files and builds an `Analysis` object.
   Default (as of v4) is the `ReflectionAnalyser`. Alternatively, there is the `TokenAnalyser` which was the default in v3.
+- The legacy `TokenAnalyser` was removed in v5.
 - The `Analysis` object and its annotations are then processed by the configured processors.
 - If enabled, the analysis/annotations are validated.
 - The root `OpenApi` annotation then contains all annotations and is serialized into YAML/JSON.
@@ -16,7 +17,7 @@ about the PHP context where the annotation was found.
 
 Typically, there will be a processor that uses the data to augment/enrich the annotation.
 
-**Examples of the data collected:** 
+**Examples of the data collected:**
   - class/interface/trait/enum names
   - property names
   - doctype or native type hints
@@ -35,7 +36,7 @@ This documentation is generated with [VitePress](https://vitepress.vuejs.org/)
 ### Installation
 ```shell
 cd docs
-npm install vitepress 
+npm install vitepress
 ```
 
 ### Workflow
diff --git a/docs/index.md b/docs/index.md
index 84a7a3fa..ab34f8e2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -20,7 +20,10 @@ features:
 
 ### 2. Update your code
 
-Add `swagger-php` attributes or annotations to your source code.
+Add `swagger-php` attributes (or legacy annotations) to your source code.
+
+⚠️ `doctrine/annotations` is going to be deprecated in the future, so wherever
+possible attributes should be used.
 
 <codeblock id="minimal">
   <template v-slot:at>
@@ -53,4 +56,5 @@ Use an OpenAPI tool like [Swagger UI ](https://swagger.io/tools/swagger-ui/) to
 - [OpenApi Specification](https://spec.openapis.org/oas/v3.1.0.html)
 - [Learn by example](https://github.com/zircote/swagger-php/tree/master/Examples)
 - [Related projects](related-projects.md)
-- [Swagger-php 2.x documentation](https://github.com/zircote/swagger-php/tree/2.x/docs)
+- [swagger-php 2.x documentation](https://github.com/zircote/swagger-php/tree/2.x/docs)
+- [swagger-php 3.x documentation](https://github.com/zircote/swagger-php/tree/3.x/docs)
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e0ff673d..8252520a 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -16,7 +16,7 @@ parameters:
 			path: Examples/using-links-php81/User.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between array\\|string and false will always evaluate to false\\.$#"
+			message: "#^Call to function array_key_exists\\(\\) with string and array\\{\\} will always evaluate to false\\.$#"
 			count: 1
 			path: src/Analysers/TokenScanner.php
 
@@ -50,11 +50,6 @@ parameters:
 			count: 1
 			path: src/Annotations/Schema.php
 
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/Generator.php
-
 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 3
diff --git a/rector.php b/rector.php
new file mode 100644
index 00000000..9bf87fe2
--- /dev/null
+++ b/rector.php
@@ -0,0 +1,31 @@
+<?php
+
+use Rector\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector;
+use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector;
+use Rector\CodeQuality\Rector\If_\CombineIfRector;
+use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
+use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
+use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
+use Rector\ValueObject\PhpVersion;
+
+return RectorConfig::configure()
+    ->withRules([
+        TypedPropertyFromStrictConstructorRector::class
+    ])
+    ->withSkip([
+        CombineIfRector::class,
+        ExplicitBoolCompareRector::class,
+        ForRepeatedCountToOwnVariableRector::class,
+        RemoveAlwaysTrueIfConditionRector::class => [
+            __DIR__ . '/src/Processors/ExpandEnums.php',
+        ] ,
+        RemoveDeadInstanceOfRector::class => [
+            __DIR__ . '/src/Processors/ExpandEnums.php',
+        ],
+        ShortenElseIfRector::class,
+    ])
+    ->withPreparedSets(true, true)
+    ->withPhpVersion(PhpVersion::PHP_74);
diff --git a/src/Analysers/AttributeAnnotationFactory.php b/src/Analysers/AttributeAnnotationFactory.php
index 3262e0dc..c158e78a 100644
--- a/src/Analysers/AttributeAnnotationFactory.php
+++ b/src/Analysers/AttributeAnnotationFactory.php
@@ -12,19 +12,13 @@
 
 class AttributeAnnotationFactory implements AnnotationFactoryInterface
 {
-    /** @var Generator|null */
-    protected $generator;
+    use GeneratorAwareTrait;
 
     public function isSupported(): bool
     {
         return \PHP_VERSION_ID >= 80100;
     }
 
-    public function setGenerator(Generator $generator): void
-    {
-        $this->generator = $generator;
-    }
-
     public function build(\Reflector $reflector, Context $context): array
     {
         if (!$this->isSupported() || !method_exists($reflector, 'getAttributes')) {
@@ -116,9 +110,7 @@ public function build(\Reflector $reflector, Context $context): array
             Generator::$context = null;
         }
 
-        $annotations = array_values(array_filter($annotations, function ($a) {
-            return $a instanceof OA\AbstractAnnotation;
-        }));
+        $annotations = array_values(array_filter($annotations, fn ($a) => $a instanceof OA\AbstractAnnotation));
 
         // merge backwards into parents...
         $isParent = function (OA\AbstractAnnotation $annotation, OA\AbstractAnnotation $possibleParent): bool {
@@ -141,7 +133,7 @@ public function build(\Reflector $reflector, Context $context): array
 
             // Attachables can always be nested (unless explicitly restricted)
             return ($isAttachable && $isParentAllowed)
-                || ($annotation->getRoot() != $possibleParent->getRoot() && $explicitParent);
+                || ($annotation->getRoot() !== $possibleParent->getRoot() && $explicitParent);
         };
 
         $annotationsWithoutParent = [];
diff --git a/src/Analysers/DocBlockAnnotationFactory.php b/src/Analysers/DocBlockAnnotationFactory.php
index 435c4776..469a1070 100644
--- a/src/Analysers/DocBlockAnnotationFactory.php
+++ b/src/Analysers/DocBlockAnnotationFactory.php
@@ -12,11 +12,9 @@
 
 class DocBlockAnnotationFactory implements AnnotationFactoryInterface
 {
-    /** @var DocBlockParser|null */
-    protected $docBlockParser = null;
+    use GeneratorAwareTrait;
 
-    /** @var Generator|null */
-    protected $generator = null;
+    protected ?DocBlockParser $docBlockParser = null;
 
     public function __construct(?DocBlockParser $docBlockParser = null)
     {
diff --git a/src/Analysers/DocBlockParser.php b/src/Analysers/DocBlockParser.php
index 5e68cc39..a4045fce 100644
--- a/src/Analysers/DocBlockParser.php
+++ b/src/Analysers/DocBlockParser.php
@@ -16,10 +16,7 @@
  */
 class DocBlockParser
 {
-    /**
-     * @var DocParser
-     */
-    protected $docParser;
+    protected DocParser $docParser;
 
     /**
      * @param array<string, class-string> $aliases
diff --git a/src/Analysers/GeneratorAwareTrait.php b/src/Analysers/GeneratorAwareTrait.php
new file mode 100644
index 00000000..afb9f314
--- /dev/null
+++ b/src/Analysers/GeneratorAwareTrait.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Analysers;
+
+use OpenApi\Generator;
+
+trait GeneratorAwareTrait
+{
+    protected ?Generator $generator = null;
+
+    public function setGenerator(Generator $generator): void
+    {
+        $this->generator = $generator;
+    }
+}
diff --git a/src/Analysers/ReflectionAnalyser.php b/src/Analysers/ReflectionAnalyser.php
index fb67aa13..8c561c10 100644
--- a/src/Analysers/ReflectionAnalyser.php
+++ b/src/Analysers/ReflectionAnalyser.php
@@ -22,18 +22,16 @@
  */
 class ReflectionAnalyser implements AnalyserInterface
 {
-    /** @var AnnotationFactoryInterface[] */
-    protected $annotationFactories;
+    use GeneratorAwareTrait;
 
-    /** @var Generator|null */
-    protected $generator;
+    /** @var AnnotationFactoryInterface[] */
+    protected array $annotationFactories = [];
 
     /**
      * @param array<AnnotationFactoryInterface> $annotationFactories
      */
     public function __construct(array $annotationFactories = [])
     {
-        $this->annotationFactories = [];
         foreach ($annotationFactories as $annotationFactory) {
             if ($annotationFactory->isSupported()) {
                 $this->annotationFactories[] = $annotationFactory;
@@ -113,13 +111,11 @@ protected function analyzeFqdn(string $fqdn, Analysis $analysis, array $details)
             'methods' => [],
             'context' => $context,
         ];
-        $normaliseClass = function (string $name): string {
-            return '\\' . ltrim($name, '\\');
-        };
+        $normaliseClass = fn (string $name): string => '\\' . ltrim($name, '\\');
         if ($parentClass = $rc->getParentClass()) {
             $definition['extends'] = $normaliseClass($parentClass->getName());
         }
-        $definition[$contextType == 'class' ? 'implements' : 'extends'] = array_map($normaliseClass, $details['interfaces']);
+        $definition[$contextType === 'class' ? 'implements' : 'extends'] = array_map($normaliseClass, $details['interfaces']);
         $definition['traits'] = array_map($normaliseClass, $details['traits']);
 
         foreach ($this->annotationFactories as $annotationFactory) {
diff --git a/src/Analysers/TokenAnalyser.php b/src/Analysers/TokenAnalyser.php
deleted file mode 100644
index d7e8fa4e..00000000
--- a/src/Analysers/TokenAnalyser.php
+++ /dev/null
@@ -1,641 +0,0 @@
-<?php declare(strict_types=1);
-
-/**
- * @license Apache 2.0
- */
-
-namespace OpenApi\Analysers;
-
-use OpenApi\Analysis;
-use OpenApi\Context;
-use OpenApi\Generator;
-
-/**
- * Extracts swagger-php annotations from php code using static analysis.
- */
-class TokenAnalyser implements AnalyserInterface
-{
-    /** @var Generator|null */
-    protected $generator;
-
-    public function setGenerator(Generator $generator): void
-    {
-        $this->generator = $generator;
-    }
-
-    /**
-     * Extract and process all doc-comments from a file.
-     *
-     * @param string $filename path to a php file
-     */
-    public function fromFile(string $filename, Context $context): Analysis
-    {
-        if (function_exists('opcache_get_status') && function_exists('opcache_get_configuration')) {
-            if (empty($GLOBALS['openapi_opcache_warning'])) {
-                $GLOBALS['openapi_opcache_warning'] = true;
-                $status = opcache_get_status();
-                $config = opcache_get_configuration();
-                if (is_array($status) && $status['opcache_enabled'] && $config['directives']['opcache.save_comments'] == false) {
-                    $context->logger->error("php.ini \"opcache.save_comments = 0\" interferes with extracting annotations.\n[LINK] https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.save-comments");
-                }
-            }
-        }
-        $tokens = token_get_all(file_get_contents($filename));
-
-        return $this->fromTokens($tokens, new Context(['filename' => $filename], $context));
-    }
-
-    /**
-     * Extract and process all doc-comments from the contents.
-     *
-     * @param string  $code    PHP code. (including <?php tags)
-     * @param Context $context the original location of the contents
-     */
-    public function fromCode(string $code, Context $context): Analysis
-    {
-        $tokens = token_get_all($code);
-
-        return $this->fromTokens($tokens, $context);
-    }
-
-    /**
-     * Shared implementation for parseFile() & parseContents().
-     *
-     * @param array $tokens The result of a token_get_all()
-     */
-    protected function fromTokens(array $tokens, Context $parseContext): Analysis
-    {
-        $generator = $this->generator ?: new Generator();
-        $analysis = new Analysis([], $parseContext);
-        $docBlockParser = new DocBlockParser($generator->getAliases());
-
-        reset($tokens);
-        $token = '';
-
-        $aliases = $generator->getAliases();
-
-        $parseContext->uses = [];
-        // default to parse context to start with
-        $schemaContext = $parseContext;
-
-        $classDefinition = false;
-        $interfaceDefinition = false;
-        $traitDefinition = false;
-        $enumDefinition = false;
-        $comment = false;
-
-        $line = 0;
-        $lineOffset = $parseContext->line ?: 0;
-
-        while ($token !== false) {
-            $previousToken = $token;
-            $token = $this->nextToken($tokens, $parseContext);
-
-            if (is_array($token) === false) {
-                // Ignore tokens like "{", "}", etc
-                continue;
-            }
-
-            if (defined('T_ATTRIBUTE') && $token[0] === T_ATTRIBUTE) {
-                // consume
-                $this->parseAttribute($tokens, $token, $parseContext);
-                continue;
-            }
-
-            if ($token[0] === T_DOC_COMMENT) {
-                if ($comment) {
-                    // 2 Doc-comments in succession?
-                    $this->analyseComment($analysis, $docBlockParser, $comment, new Context(['line' => $line], $schemaContext));
-                }
-                $comment = $token[1];
-                $line = $token[2] + $lineOffset;
-                continue;
-            }
-
-            if (in_array($token[0], [T_ABSTRACT, T_FINAL])) {
-                // skip
-                $token = $this->nextToken($tokens, $parseContext);
-            }
-
-            if ($token[0] === T_CLASS) {
-                // Doc-comment before a class?
-                if (is_array($previousToken) && $previousToken[0] === T_DOUBLE_COLON) {
-                    // php 5.5 class name resolution (i.e. ClassName::class)
-                    continue;
-                }
-
-                $token = $this->nextToken($tokens, $parseContext);
-
-                if (is_string($token) && ($token === '(' || $token === '{')) {
-                    // php7 anonymous classes (i.e. new class() { public function foo() {} };)
-                    continue;
-                }
-
-                if (is_array($token) && ($token[1] === 'extends' || $token[1] === 'implements')) {
-                    // php7 anonymous classes with extends (i.e. new class() extends { public function foo() {} };)
-                    continue;
-                }
-
-                if (!is_array($token)) {
-                    // PHP 8 named argument
-                    continue;
-                }
-
-                $interfaceDefinition = false;
-                $traitDefinition = false;
-                $enumDefinition = false;
-
-                $schemaContext = new Context(['class' => $token[1], 'line' => $token[2]], $parseContext);
-                if ($classDefinition) {
-                    $analysis->addClassDefinition($classDefinition);
-                }
-                $classDefinition = [
-                    'class' => $token[1],
-                    'extends' => null,
-                    'properties' => [],
-                    'methods' => [],
-                    'context' => $schemaContext,
-                ];
-
-                $token = $this->nextToken($tokens, $parseContext);
-
-                if ($token[0] === T_EXTENDS) {
-                    $schemaContext->extends = $this->parseNamespace($tokens, $token, $parseContext);
-                    $classDefinition['extends'] = $schemaContext->fullyQualifiedName($schemaContext->extends);
-                }
-
-                if ($token[0] === T_IMPLEMENTS) {
-                    $schemaContext->implements = $this->parseNamespaceList($tokens, $token, $parseContext);
-                    $classDefinition['implements'] = array_map([$schemaContext, 'fullyQualifiedName'], $schemaContext->implements);
-                }
-
-                if ($comment) {
-                    $schemaContext->line = $line;
-                    $this->analyseComment($analysis, $docBlockParser, $comment, $schemaContext);
-                    $comment = false;
-                    continue;
-                }
-
-                // @todo detect end-of-class and reset $schemaContext
-            }
-
-            if ($token[0] === T_INTERFACE) { // Doc-comment before an interface?
-                $classDefinition = false;
-                $traitDefinition = false;
-                $enumDefinition = false;
-
-                $token = $this->nextToken($tokens, $parseContext);
-
-                if (!is_array($token)) {
-                    // PHP 8 named argument
-                    continue;
-                }
-
-                $schemaContext = new Context(['interface' => $token[1], 'line' => $token[2]], $parseContext);
-                if ($interfaceDefinition) {
-                    $analysis->addInterfaceDefinition($interfaceDefinition);
-                }
-                $interfaceDefinition = [
-                    'interface' => $token[1],
-                    'extends' => null,
-                    'properties' => [],
-                    'methods' => [],
-                    'context' => $schemaContext,
-                ];
-
-                $token = $this->nextToken($tokens, $parseContext);
-
-                if ($token[0] === T_EXTENDS) {
-                    $schemaContext->extends = $this->parseNamespaceList($tokens, $token, $parseContext);
-                    $interfaceDefinition['extends'] = array_map([$schemaContext, 'fullyQualifiedName'], $schemaContext->extends);
-                }
-
-                if ($comment) {
-                    $schemaContext->line = $line;
-                    $this->analyseComment($analysis, $docBlockParser, $comment, $schemaContext);
-                    $comment = false;
-                    continue;
-                }
-
-                // @todo detect end-of-interface and reset $schemaContext
-            }
-
-            if ($token[0] === T_TRAIT) {
-                $classDefinition = false;
-                $interfaceDefinition = false;
-                $enumDefinition = false;
-
-                $token = $this->nextToken($tokens, $parseContext);
-
-                if (!is_array($token)) {
-                    // PHP 8 named argument
-                    continue;
-                }
-
-                $schemaContext = new Context(['trait' => $token[1], 'line' => $token[2]], $parseContext);
-                if ($traitDefinition) {
-                    $analysis->addTraitDefinition($traitDefinition);
-                }
-                $traitDefinition = [
-                    'trait' => $token[1],
-                    'properties' => [],
-                    'methods' => [],
-                    'context' => $schemaContext,
-                ];
-
-                if ($comment) {
-                    $schemaContext->line = $line;
-                    $this->analyseComment($analysis, $docBlockParser, $comment, $schemaContext);
-                    $comment = false;
-                    continue;
-                }
-
-                // @todo detect end-of-trait and reset $schemaContext
-            }
-
-            if (defined('T_ENUM') && $token[0] === T_ENUM) {
-                $classDefinition = false;
-                $interfaceDefinition = false;
-                $traitDefinition = false;
-
-                $token = $this->nextToken($tokens, $parseContext);
-
-                if (!is_array($token)) {
-                    // PHP 8 named argument
-                    continue;
-                }
-
-                $schemaContext = new Context(['enum' => $token[1], 'line' => $token[2]], $parseContext);
-                if ($enumDefinition) {
-                    $analysis->addEnumDefinition($enumDefinition);
-                }
-                $enumDefinition = [
-                    'enum' => $token[1],
-                    'properties' => [],
-                    'methods' => [],
-                    'context' => $schemaContext,
-                ];
-
-                if ($comment) {
-                    $schemaContext->line = $line;
-                    $this->analyseComment($analysis, $docBlockParser, $comment, $schemaContext);
-                    $comment = false;
-                    continue;
-                }
-
-                // @todo detect end-of-trait and reset $schemaContext
-            }
-
-            if ($token[0] === T_STATIC) {
-                $token = $this->nextToken($tokens, $parseContext);
-                if ($token[0] === T_VARIABLE) {
-                    // static property
-                    $propertyContext = new Context(
-                        [
-                            'property' => substr($token[1], 1),
-                            'static' => true,
-                            'line' => $line,
-                        ],
-                        $schemaContext
-                    );
-
-                    if ($classDefinition) {
-                        $classDefinition['properties'][$propertyContext->property] = $propertyContext;
-                    }
-                    if ($traitDefinition) {
-                        $traitDefinition['properties'][$propertyContext->property] = $propertyContext;
-                    }
-                    if ($comment) {
-                        $this->analyseComment($analysis, $docBlockParser, $comment, $propertyContext);
-                        $comment = false;
-                    }
-                    continue;
-                }
-            }
-
-            if (in_array($token[0], [T_PRIVATE, T_PROTECTED, T_PUBLIC, T_VAR])) { // Scope
-                [$type, $nullable, $token] = $this->parseTypeAndNextToken($tokens, $parseContext);
-                if ($token[0] === T_VARIABLE) {
-                    // instance property
-                    $propertyContext = new Context(
-                        [
-                            'property' => substr($token[1], 1),
-                            'type' => $type,
-                            'nullable' => $nullable,
-                            'line' => $line,
-                        ],
-                        $schemaContext
-                    );
-
-                    if ($classDefinition) {
-                        $classDefinition['properties'][$propertyContext->property] = $propertyContext;
-                    }
-                    if ($interfaceDefinition) {
-                        $interfaceDefinition['properties'][$propertyContext->property] = $propertyContext;
-                    }
-                    if ($traitDefinition) {
-                        $traitDefinition['properties'][$propertyContext->property] = $propertyContext;
-                    }
-                    if ($comment) {
-                        $this->analyseComment($analysis, $docBlockParser, $comment, $propertyContext);
-                        $comment = false;
-                    }
-                } elseif ($token[0] === T_FUNCTION) {
-                    $token = $this->nextToken($tokens, $parseContext);
-                    if ($token[0] === T_STRING) {
-                        $methodContext = new Context(
-                            [
-                                'method' => $token[1],
-                                'line' => $line,
-                            ],
-                            $schemaContext
-                        );
-
-                        if ($classDefinition) {
-                            $classDefinition['methods'][$token[1]] = $methodContext;
-                        }
-                        if ($interfaceDefinition) {
-                            $interfaceDefinition['methods'][$token[1]] = $methodContext;
-                        }
-                        if ($traitDefinition) {
-                            $traitDefinition['methods'][$token[1]] = $methodContext;
-                        }
-                        if ($comment) {
-                            $this->analyseComment($analysis, $docBlockParser, $comment, $methodContext);
-                            $comment = false;
-                        }
-                    }
-                }
-                continue;
-            } elseif ($token[0] === T_FUNCTION) {
-                $token = $this->nextToken($tokens, $parseContext);
-                if ($token[0] === T_STRING) {
-                    $methodContext = new Context(
-                        [
-                            'method' => $token[1],
-                            'line' => $line,
-                        ],
-                        $schemaContext
-                    );
-
-                    if ($classDefinition) {
-                        $classDefinition['methods'][$token[1]] = $methodContext;
-                    }
-                    if ($interfaceDefinition) {
-                        $interfaceDefinition['methods'][$token[1]] = $methodContext;
-                    }
-                    if ($traitDefinition) {
-                        $traitDefinition['methods'][$token[1]] = $methodContext;
-                    }
-                    if ($comment) {
-                        $this->analyseComment($analysis, $docBlockParser, $comment, $methodContext);
-                        $comment = false;
-                    }
-                }
-            }
-
-            if (in_array($token[0], [T_NAMESPACE, T_USE]) === false) {
-                // Skip "use" & "namespace" to prevent "never imported" warnings)
-                if ($comment) {
-                    // Not a doc-comment for a class, property or method?
-                    $this->analyseComment($analysis, $docBlockParser, $comment, new Context(['line' => $line], $schemaContext));
-                    $comment = false;
-                }
-            }
-
-            if ($token[0] === T_NAMESPACE) {
-                $parseContext->namespace = $this->parseNamespace($tokens, $token, $parseContext);
-                $aliases['__NAMESPACE__'] = $parseContext->namespace;
-                $docBlockParser->setAliases($aliases);
-                continue;
-            }
-
-            if ($token[0] === T_USE) {
-                $statements = $this->parseUseStatement($tokens, $token, $parseContext);
-                foreach ($statements as $alias => $target) {
-                    if ($classDefinition) {
-                        // class traits
-                        $classDefinition['traits'][] = $schemaContext->fullyQualifiedName($target);
-                    } elseif ($traitDefinition) {
-                        // trait traits
-                        $traitDefinition['traits'][] = $schemaContext->fullyQualifiedName($target);
-                    } else {
-                        // not a trait use
-                        $parseContext->uses[$alias] = $target;
-
-                        $namespaces = $generator->getNamespaces();
-                        if (null === $namespaces) {
-                            $aliases[strtolower($alias)] = $target;
-                        } else {
-                            foreach ($namespaces as $namespace) {
-                                if (strcasecmp(substr($target . '\\', 0, strlen($namespace)), $namespace) === 0) {
-                                    $aliases[strtolower($alias)] = $target;
-                                    break;
-                                }
-                            }
-                        }
-                        $docBlockParser->setAliases($aliases);
-                    }
-                }
-            }
-        }
-
-        // cleanup final comment and definition
-        if ($comment) {
-            $this->analyseComment($analysis, $docBlockParser, $comment, new Context(['line' => $line], $schemaContext));
-        }
-        if ($classDefinition) {
-            $analysis->addClassDefinition($classDefinition);
-        }
-        if ($interfaceDefinition) {
-            $analysis->addInterfaceDefinition($interfaceDefinition);
-        }
-        if ($traitDefinition) {
-            $analysis->addTraitDefinition($traitDefinition);
-        }
-        if ($enumDefinition) {
-            $analysis->addEnumDefinition($enumDefinition);
-        }
-
-        return $analysis;
-    }
-
-    /**
-     * Parse comment and add annotations to analysis.
-     */
-    private function analyseComment(Analysis $analysis, DocBlockParser $docBlockParser, string $comment, Context $context): void
-    {
-        $analysis->addAnnotations($docBlockParser->fromComment($comment, $context), $context);
-    }
-
-    /**
-     * The next non-whitespace, non-comment token.
-     *
-     *
-     * @return array|string The next token (or false)
-     */
-    private function nextToken(array &$tokens, Context $context)
-    {
-        while (true) {
-            $token = next($tokens);
-            if (is_array($token)) {
-                if ($token[0] === T_WHITESPACE) {
-                    continue;
-                }
-                if ($token[0] === T_COMMENT) {
-                    $pos = strpos($token[1], '@OA\\');
-                    if ($pos) {
-                        $line = $context->line ? $context->line + $token[2] : $token[2];
-                        $commentContext = new Context(['line' => $line], $context);
-                        $context->logger->warning('Annotations are only parsed inside `/**` DocBlocks, skipping ' . $commentContext);
-                    }
-                    continue;
-                }
-            }
-
-            return $token;
-        }
-    }
-
-    private function parseAttribute(array &$tokens, &$token, Context $parseContext): void
-    {
-        $nesting = 1;
-        while ($token !== false) {
-            $token = $this->nextToken($tokens, $parseContext);
-            if (!is_array($token) && '[' === $token) {
-                ++$nesting;
-                continue;
-            }
-
-            if (!is_array($token) && ']' === $token) {
-                --$nesting;
-                if (!$nesting) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * @return int[]
-     */
-    private function php8NamespaceToken(): array
-    {
-        return defined('T_NAME_QUALIFIED') ? [T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED] : [];
-    }
-
-    /**
-     * Parse namespaced string.
-     *
-     * @param array|string $token
-     */
-    private function parseNamespace(array &$tokens, &$token, Context $parseContext): string
-    {
-        $namespace = '';
-        $nsToken = array_merge([T_STRING, T_NS_SEPARATOR], $this->php8NamespaceToken());
-        while ($token !== false) {
-            $token = $this->nextToken($tokens, $parseContext);
-            if (!in_array($token[0], $nsToken)) {
-                break;
-            }
-            $namespace .= $token[1];
-        }
-
-        return $namespace;
-    }
-
-    /**
-     * Parse comma separated list of namespaced strings.
-     *
-     * @param array|string $token
-     */
-    private function parseNamespaceList(array &$tokens, &$token, Context $parseContext): array
-    {
-        $namespaces = [];
-        while ($namespace = $this->parseNamespace($tokens, $token, $parseContext)) {
-            $namespaces[] = $namespace;
-            if ($token != ',') {
-                break;
-            }
-        }
-
-        return $namespaces;
-    }
-
-    /**
-     * Parse a use statement.
-     *
-     * @param (int|mixed)[]|string $token
-     */
-    private function parseUseStatement(array &$tokens, &$token, Context $parseContext): array
-    {
-        $normalizeAlias = function ($alias): string {
-            $alias = ltrim($alias, '\\');
-            $elements = explode('\\', $alias);
-
-            return array_pop($elements);
-        };
-
-        $class = '';
-        $alias = '';
-        $statements = [];
-        $explicitAlias = false;
-        $nsToken = array_merge([T_STRING, T_NS_SEPARATOR], $this->php8NamespaceToken());
-        while ($token !== false) {
-            $token = $this->nextToken($tokens, $parseContext);
-            $isNameToken = in_array($token[0], $nsToken);
-            if (!$explicitAlias && $isNameToken) {
-                $class .= $token[1];
-                $alias = $token[1];
-            } elseif ($explicitAlias && $isNameToken) {
-                $alias .= $token[1];
-            } elseif ($token[0] === T_AS) {
-                $explicitAlias = true;
-                $alias = '';
-            } elseif ($token === ',') {
-                $statements[$normalizeAlias($alias)] = $class;
-                $class = '';
-                $alias = '';
-                $explicitAlias = false;
-            } elseif ($token === ';') {
-                $statements[$normalizeAlias($alias)] = $class;
-                break;
-            } else {
-                break;
-            }
-        }
-
-        return $statements;
-    }
-
-    /**
-     * Parse type of variable (if it exists).
-     */
-    private function parseTypeAndNextToken(array &$tokens, Context $parseContext): array
-    {
-        $type = Generator::UNDEFINED;
-        $nullable = false;
-        $token = $this->nextToken($tokens, $parseContext);
-
-        if ($token[0] === T_STATIC) {
-            $token = $this->nextToken($tokens, $parseContext);
-        }
-
-        if ($token === '?') { // nullable type
-            $nullable = true;
-            $token = $this->nextToken($tokens, $parseContext);
-        }
-
-        $qualifiedToken = array_merge([T_NS_SEPARATOR, T_STRING, T_ARRAY], $this->php8NamespaceToken());
-        $typeToken = array_merge([T_STRING], $this->php8NamespaceToken());
-        // drill down namespace segments to basename property type declaration
-        while (in_array($token[0], $qualifiedToken)) {
-            if (in_array($token[0], $typeToken)) {
-                $type = $token[1];
-            }
-            $token = $this->nextToken($tokens, $parseContext);
-        }
-
-        return [$type, $nullable, $token];
-    }
-}
diff --git a/src/Analysers/TokenScanner.php b/src/Analysers/TokenScanner.php
index 872753db..2367d260 100644
--- a/src/Analysers/TokenScanner.php
+++ b/src/Analysers/TokenScanner.php
@@ -6,6 +6,16 @@
 
 namespace OpenApi\Analysers;
 
+use PhpParser\Error;
+use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassLike;
+use PhpParser\Node\Stmt\Enum_;
+use PhpParser\Node\Stmt\Interface_;
+use PhpParser\Node\Stmt\Namespace_;
+use PhpParser\Node\Stmt\Trait_;
+use PhpParser\Node\Stmt\Use_;
+use PhpParser\ParserFactory;
+
 /**
  * High level, PHP token based, scanner.
  */
@@ -18,27 +28,37 @@ class TokenScanner
      */
     public function scanFile(string $filename): array
     {
-        return $this->scanTokens(token_get_all(file_get_contents($filename)));
+        $parser = (new ParserFactory())->createForNewestSupportedVersion();
+        try {
+            $stmts = $parser->parse(file_get_contents($filename));
+        } catch (Error $e) {
+            throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
+        }
+
+        $result = [];
+        $result += $this->collect_stmts($stmts, '');
+        foreach ($stmts as $stmt) {
+            if ($stmt instanceof Namespace_) {
+                $namespace = (string) $stmt->name;
+
+                $result += $this->collect_stmts($stmt->stmts, $namespace);
+            }
+        }
+
+        return $result;
     }
 
-    /**
-     * Scan file for all classes, interfaces and traits.
-     *
-     * @return array<string, array<string, mixed>> File details
-     */
-    protected function scanTokens(array $tokens): array
+    protected function collect_stmts(array $stmts, string $namespace): array
     {
-        $units = [];
         $uses = [];
-        $isInterface = false;
-        $isAbstractFunction = false;
-        $namespace = '';
-        $currentName = null;
-        $unitLevel = 0;
-        $lastToken = null;
-        $stack = [];
+        $resolve = function (string $name) use ($namespace, &$uses) {
+            if (array_key_exists($name, $uses)) {
+                return $uses[$name];
+            }
 
-        $initUnit = function ($uses): array {
+            return $namespace . '\\' . $name;
+        };
+        $details = function () use (&$uses) {
             return [
                 'uses' => $uses,
                 'interfaces' => [],
@@ -48,334 +68,86 @@ protected function scanTokens(array $tokens): array
                 'properties' => [],
             ];
         };
-
-        while (false !== ($token = $this->nextToken($tokens))) {
-            // named arguments
-            $nextToken = $this->nextToken($tokens);
-            if (($token !== '}' && $nextToken === ':') || $nextToken === false) {
-                continue;
-            }
-            do {
-                $prevToken = prev($tokens);
-            } while ($token !== $prevToken);
-
-            if (!is_array($token)) {
-                switch ($token) {
-                    case '{':
-                        $stack[] = $token;
-                        break;
-                    case '}':
-                        array_pop($stack);
-                        if (count($stack) == $unitLevel) {
-                            $currentName = null;
-                        }
-                        break;
-                }
-                continue;
-            }
-
-            switch ($token[0]) {
-                case T_ABSTRACT:
-                    if (count($stack)) {
-                        $isAbstractFunction = true;
-                    }
-                    break;
-
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                    $stack[] = $token[1];
-                    break;
-
-                case T_NAMESPACE:
-                    $namespace = $this->nextWord($tokens);
-                    break;
-
-                case T_USE:
-                    if (!$stack) {
-                        $uses = array_merge($uses, $this->parseFQNStatement($tokens, $token));
-                    } elseif ($currentName) {
-                        $traits = $this->resolveFQN($this->parseFQNStatement($tokens, $token), $namespace, $uses);
-                        $units[$currentName]['traits'] = array_merge($units[$currentName]['traits'], $traits);
-                    }
-                    break;
-
-                case T_CLASS:
-                    if ($currentName) {
-                        break;
-                    }
-
-                    if ($lastToken && is_array($lastToken) && $lastToken[0] === T_DOUBLE_COLON) {
-                        // ::class
-                        break;
-                    }
-
-                    // class name
-                    $token = $this->nextToken($tokens);
-
-                    // unless ...
-                    if (is_string($token) && ($token === '(' || $token === '{')) {
-                        // new class[()] { ... }
-                        if ('{' == $token) {
-                            prev($tokens);
-                        }
-                        break;
-                    } elseif (is_array($token) && in_array($token[1], ['extends', 'implements'])) {
-                        // new class[()] extends { ... }
-                        break;
-                    }
-
-                    $isInterface = false;
-                    $currentName = $namespace . '\\' . $token[1];
-                    $unitLevel = count($stack);
-                    $units[$currentName] = $initUnit($uses);
-                    break;
-
-                case T_INTERFACE:
-                    if ($currentName) {
-                        break;
-                    }
-
-                    $isInterface = true;
-                    $token = $this->nextToken($tokens);
-                    $currentName = $namespace . '\\' . $token[1];
-                    $unitLevel = count($stack);
-                    $units[$currentName] = $initUnit($uses);
-                    break;
-
-                case T_EXTENDS:
-                    $fqns = $this->parseFQNStatement($tokens, $token);
-                    if ($isInterface && $currentName) {
-                        $units[$currentName]['interfaces'] = $this->resolveFQN($fqns, $namespace, $uses);
-                    }
-                    if (!is_array($token) || T_IMPLEMENTS !== $token[0]) {
-                        break;
-                    }
-                    // no break
-                case T_IMPLEMENTS:
-                    $fqns = $this->parseFQNStatement($tokens, $token);
-                    if ($currentName) {
-                        $units[$currentName]['interfaces'] = $this->resolveFQN($fqns, $namespace, $uses);
-                    }
+        $result = [];
+        foreach ($stmts as $stmt) {
+            switch (get_class($stmt)) {
+                case Use_::class:
+                    $uses += $this->collect_uses($stmt);
                     break;
-
-                case T_FUNCTION:
-                    $token = $this->nextToken($tokens);
-                    if ((!is_array($token) && '&' == $token)
-                        || (defined('T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG') && T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG == $token[0])) {
-                        $token = $this->nextToken($tokens);
-                    }
-
-                    if (($unitLevel + 1) == count($stack) && $currentName) {
-                        $units[$currentName]['methods'][] = $token[1];
-                        if (!$isInterface && !$isAbstractFunction) {
-                            // more nesting
-                            $units[$currentName]['properties'] = array_merge(
-                                $units[$currentName]['properties'],
-                                $this->parsePromotedProperties($tokens)
-                            );
-                            $this->skipTo($tokens, '{', true);
-                        } else {
-                            // no function body
-                            $this->skipTo($tokens, ';');
-                            $isAbstractFunction = false;
-                        }
-                    }
+                case Class_::class:
+                    $result += $this->collect_class($stmt, $details(), $resolve);
                     break;
-
-                case T_VARIABLE:
-                    if (($unitLevel + 1) == count($stack) && $currentName) {
-                        $units[$currentName]['properties'][] = substr($token[1], 1);
-                    }
+                case Interface_::class:
+                    $result += $this->collect_interface($stmt, $details(), $resolve);
                     break;
-                default:
-                    // handle trait here too to avoid duplication
-                    if (T_TRAIT === $token[0] || (defined('T_ENUM') && T_ENUM === $token[0])) {
-                        if ($currentName) {
-                            break;
-                        }
-
-                        $isInterface = false;
-                        $token = $this->nextToken($tokens);
-                        $currentName = $namespace . '\\' . $token[1];
-                        $unitLevel = count($stack);
-                        $this->skipTo($tokens, '{', true);
-                        $units[$currentName] = $initUnit($uses);
-                    }
+                case Trait_::class:
+                case Enum_::class:
+                    $result += $this->collect_classlike($stmt, $details(), $resolve);
                     break;
             }
-            $lastToken = $token;
         }
 
-        return $units;
+        return $result;
     }
 
-    /**
-     * Get the next token that is not whitespace or comment.
-     *
-     * @return string|array|false
-     */
-    protected function nextToken(array &$tokens)
+    protected function collect_uses(Use_ $stmt): array
     {
-        $token = true;
-        while ($token) {
-            $token = next($tokens);
-            if (is_array($token)) {
-                if (in_array($token[0], [T_WHITESPACE, T_COMMENT])) {
-                    continue;
-                }
-            }
+        $uses = [];
 
-            return $token;
+        foreach ($stmt->uses as $use) {
+            $uses[(string) $use->getAlias()] = (string) $use->name;
         }
 
-        return $token;
+        return $uses;
     }
 
-    /**
-     * @return array<string>
-     */
-    protected function resolveFQN(array $names, string $namespace, array $uses): array
+    protected function collect_classlike(ClassLike $stmt, array $details, callable $resolve): array
     {
-        $resolve = function ($name) use ($namespace, $uses) {
-            if ('\\' == $name[0]) {
-                return substr($name, 1);
+        foreach ($stmt->getProperties() as $properties) {
+            foreach ($properties->props as $prop) {
+                $details['properties'][] = (string) $prop->name;
             }
+        }
 
-            if (array_key_exists($name, $uses)) {
-                return $uses[$name];
-            }
-
-            return $namespace . '\\' . $name;
-        };
-
-        return array_values(array_map($resolve, $names));
-    }
-
-    protected function skipTo(array &$tokens, string $char, bool $prev = false): void
-    {
-        while (false !== ($token = next($tokens))) {
-            if (is_string($token) && $token == $char) {
-                if ($prev) {
-                    prev($tokens);
-                }
-
-                break;
-            }
+        foreach ($stmt->getMethods() as $method) {
+            $details['methods'][] = (string) $method->name;
         }
-    }
 
-    /**
-     * Read next word.
-     *
-     * Skips leading whitespace.
-     */
-    protected function nextWord(array &$tokens): string
-    {
-        $word = '';
-        while (false !== ($token = next($tokens))) {
-            if (is_array($token)) {
-                if ($token[0] === T_WHITESPACE) {
-                    if ($word) {
-                        break;
-                    }
-                    continue;
-                }
-                $word .= $token[1];
+        foreach ($stmt->getTraitUses() as $traitUse) {
+            foreach ($traitUse->traits as $trait) {
+                $details['traits'][] = $resolve((string) $trait);
             }
         }
 
-        return $word;
+        return [
+            $resolve($stmt->name->name) => $details,
+        ];
     }
 
-    /**
-     * Parse a use statement.
-     */
-    protected function parseFQNStatement(array &$tokens, array &$token): array
+    protected function collect_class(Class_ $stmt, array $details, callable $resolve): array
     {
-        $normalizeAlias = function ($alias): string {
-            $alias = ltrim($alias, '\\');
-            $elements = explode('\\', $alias);
-
-            return array_pop($elements);
-        };
+        foreach ($stmt->implements as $implement) {
+            $details['interfaces'][] = $resolve((string) $implement);
+        }
 
-        $class = '';
-        $alias = '';
-        $statements = [];
-        $explicitAlias = false;
-        $php8NSToken = defined('T_NAME_QUALIFIED') ? [T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED] : [];
-        $nsToken = array_merge([T_STRING, T_NS_SEPARATOR], $php8NSToken);
-        while ($token !== false) {
-            $token = $this->nextToken($tokens);
-            $isNameToken = in_array($token[0], $nsToken);
-            if (!$explicitAlias && $isNameToken) {
-                $class .= $token[1];
-                $alias = $token[1];
-            } elseif ($explicitAlias && $isNameToken) {
-                $alias .= $token[1];
-            } elseif ($token[0] === T_AS) {
-                $explicitAlias = true;
-                $alias = '';
-            } elseif ($token[0] === T_IMPLEMENTS) {
-                $statements[$normalizeAlias($alias)] = $class;
-                break;
-            } elseif ($token === ',') {
-                $statements[$normalizeAlias($alias)] = $class;
-                $class = '';
-                $alias = '';
-                $explicitAlias = false;
-            } elseif ($token === ';') {
-                $statements[$normalizeAlias($alias)] = $class;
-                break;
-            } elseif ($token === '{') {
-                $statements[$normalizeAlias($alias)] = $class;
-                prev($tokens);
-                break;
-            } else {
-                break;
+        // promoted properties
+        if ($ctor = $stmt->getMethod('__construct')) {
+            foreach ($ctor->getParams() as $param) {
+                if ($param->flags) {
+                    $details['properties'][] = $param->var->name;
+                }
             }
         }
 
-        return $statements;
+        return $this->collect_classlike($stmt, $details, $resolve);
     }
 
-    protected function parsePromotedProperties(array &$tokens): array
+    protected function collect_interface(Interface_ $stmt, array $details, callable $resolve): array
     {
-        $properties = [];
-
-        $this->skipTo($tokens, '(');
-        $round = 1;
-        $promoted = false;
-        while (false !== ($token = $this->nextToken($tokens))) {
-            if (is_string($token)) {
-                switch ($token) {
-                    case '(':
-                        ++$round;
-                        break;
-                    case ')':
-                        --$round;
-                        if (0 == $round) {
-                            return $properties;
-                        }
-                }
-            }
-            if (is_array($token)) {
-                switch ($token[0]) {
-                    case T_PUBLIC:
-                    case T_PROTECTED:
-                    case T_PRIVATE:
-                        $promoted = true;
-                        break;
-                    case T_VARIABLE:
-                        if ($promoted) {
-                            $properties[] = ltrim($token[1], '$');
-                            $promoted = false;
-                        }
-                        break;
-                }
-            }
+        foreach ($stmt->extends as $extend) {
+            $details['interfaces'][] = $resolve((string) $extend);
         }
 
-        return $properties;
+        return $this->collect_classlike($stmt, $details, $resolve);
     }
 }
diff --git a/src/Analysis.php b/src/Analysis.php
index e749f8a6..50bd00e9 100644
--- a/src/Analysis.php
+++ b/src/Analysis.php
@@ -17,50 +17,34 @@
  */
 class Analysis
 {
-    /**
-     * @var \SplObjectStorage
-     */
-    public $annotations;
+    public \SplObjectStorage $annotations;
 
     /**
      * Class definitions.
-     *
-     * @var array
      */
-    public $classes = [];
+    public array $classes = [];
 
     /**
      * Interface definitions.
-     *
-     * @var array
      */
-    public $interfaces = [];
+    public array $interfaces = [];
 
     /**
      * Trait definitions.
-     *
-     * @var array
      */
-    public $traits = [];
+    public array $traits = [];
 
     /**
      * Enum definitions.
-     *
-     * @var array
      */
-    public $enums = [];
+    public array $enums = [];
 
     /**
      * The target OpenApi annotation.
-     *
-     * @var OA\OpenApi|null
      */
-    public $openapi = null;
+    public ?OA\OpenApi $openapi = null;
 
-    /**
-     * @var Context|null
-     */
-    public $context = null;
+    public ?Context $context = null;
 
     public function __construct(array $annotations = [], ?Context $context = null)
     {
@@ -150,7 +134,7 @@ public function addAnalysis(Analysis $analysis): void
         $this->interfaces = array_merge($this->interfaces, $analysis->interfaces);
         $this->traits = array_merge($this->traits, $analysis->traits);
         $this->enums = array_merge($this->enums, $analysis->enums);
-        if ($this->openapi === null && $analysis->openapi !== null) {
+        if (!$this->openapi instanceof OA\OpenApi && $analysis->openapi instanceof OA\OpenApi) {
             $this->openapi = $analysis->openapi;
         }
     }
@@ -347,7 +331,7 @@ public function getAnnotationForSource(string $fqdn, string $class): ?OA\Abstrac
                 if (is_iterable($definition['context']->annotations)) {
                     /** @var OA\AbstractAnnotation $annotation */
                     foreach (array_reverse($definition['context']->annotations) as $annotation) {
-                        if (is_a($annotation, $class) && $annotation->isRoot($class) && !$annotation->_context->is('generated')) {
+                        if ($annotation instanceof $class && $annotation->isRoot($class) && !$annotation->_context->is('generated')) {
                             return $annotation;
                         }
                     }
@@ -379,7 +363,7 @@ public function getContext(object $annotation): ?Context
      */
     public function merged(): Analysis
     {
-        if ($this->openapi === null) {
+        if (!$this->openapi instanceof OA\OpenApi) {
             throw new OpenApiException('No openapi target set. Run the MergeIntoOpenApi processor');
         }
         $unmerged = $this->openapi->_unmerged;
@@ -436,7 +420,7 @@ public function process($processors = null): void
 
     public function validate(): bool
     {
-        if ($this->openapi !== null) {
+        if ($this->openapi instanceof OA\OpenApi) {
             return $this->openapi->validate();
         }
 
diff --git a/src/Annotations/AbstractAnnotation.php b/src/Annotations/AbstractAnnotation.php
index e8468549..bd3cc994 100644
--- a/src/Annotations/AbstractAnnotation.php
+++ b/src/Annotations/AbstractAnnotation.php
@@ -38,7 +38,7 @@ abstract class AbstractAnnotation implements \JsonSerializable
     /**
      * @var Context|null
      */
-    public $_context = null;
+    public $_context;
 
     /**
      * Annotations that couldn't be merged by mapping or postprocessing.
@@ -241,7 +241,7 @@ public function mergeProperties($object): void
                 $identity = method_exists($object, 'identity') ? $object->identity() : get_class($object);
                 $context1 = $this->_context;
                 $context2 = property_exists($object, '_context') ? $object->_context : 'unknown';
-                if (is_object($this->{$property}) && $this->{$property} instanceof AbstractAnnotation) {
+                if ($this->{$property} instanceof AbstractAnnotation) {
                     $context1 = $this->{$property}->_context;
                 }
                 $this->_context->logger->error('Multiple definitions for ' . $identity . '->' . $property . "\n     Using: " . $context1 . "\n  Skipping: " . $context2);
@@ -251,6 +251,8 @@ public function mergeProperties($object): void
 
     /**
      * Generate the documentation in YAML format.
+     *
+     * @param int-mask-of<Yaml::PARSE_*>|null $flags A bit field of PARSE_* constants to customize the YAML parser behavior
      */
     public function toYaml(?int $flags = null): string
     {
@@ -307,7 +309,7 @@ public function jsonSerialize()
 
         // Correct empty array to empty objects.
         foreach (static::$_types as $property => $type) {
-            if ($type === 'object' && is_array($data->{$property}) && empty($data->{$property})) {
+            if ($type === 'object' && is_array($data->{$property}) && $data->{$property} === []) {
                 $data->{$property} = new \stdClass();
             }
         }
@@ -338,11 +340,7 @@ public function jsonSerialize()
                 } else {
                     $key = $item->{$keyField};
                     if (!Generator::isDefault($key) && empty($object->{$key})) {
-                        if ($item instanceof \JsonSerializable) {
-                            $object->{$key} = $item->jsonSerialize();
-                        } else {
-                            $object->{$key} = $item;
-                        }
+                        $object->{$key} = $item instanceof \JsonSerializable ? $item->jsonSerialize() : $item;
                         unset($object->{$key}->{$keyField});
                     }
                 }
@@ -374,7 +372,7 @@ public function jsonSerialize()
 
                 // preserve other properties
                 foreach (get_object_vars($this) as $property => $value) {
-                    if ('_' == $property[0] || in_array($property, ['ref', 'nullable'])) {
+                    if ('_' === $property[0] || in_array($property, ['ref', 'nullable'])) {
                         continue;
                     }
                     if (!Generator::isDefault($value)) {
@@ -503,7 +501,7 @@ public function validate(array $stack = [], array $skip = [], string $ref = '',
         }
 
         if (property_exists($this, 'ref') && !Generator::isDefault($this->ref) && is_string($this->ref)) {
-            if (substr($this->ref, 0, 2) === '#/' && count($stack) > 0 && $stack[0] instanceof OpenApi) {
+            if (substr($this->ref, 0, 2) === '#/' && $stack !== [] && $stack[0] instanceof OpenApi) {
                 // Internal reference
                 try {
                     $stack[0]->ref($this->ref);
@@ -562,7 +560,7 @@ public function validate(array $stack = [], array $skip = [], string $ref = '',
             }
         }
 
-        return self::_validate($this, $stack, $skip, $ref, $context) ? $valid : false;
+        return self::_validate($this, $stack, $skip, $ref, $context) && $valid;
     }
 
     /**
@@ -668,7 +666,7 @@ public function getRoot(): string
      */
     public function isRoot(string $rootClass): bool
     {
-        return get_class($this) == $rootClass || $this->getRoot() == $rootClass;
+        return get_class($this) === $rootClass || $this->getRoot() === $rootClass;
     }
 
     /**
@@ -700,7 +698,7 @@ private function validateType(string $type, $value): bool
                 return false;
             }
             $itemType = substr($type, 1, -1);
-            foreach ($value as $i => $item) {
+            foreach ($value as $item) {
                 if ($this->validateType($itemType, $item) === false) {
                     return false;
                 }
@@ -764,7 +762,7 @@ private function validateArrayType($value): bool
             return false;
         }
         $count = 0;
-        foreach ($value as $i => $item) {
+        foreach (array_keys($value) as $i) {
             // not a array, but a hash/map
             if ($count !== $i) {
                 return false;
@@ -801,8 +799,6 @@ protected function combine(...$args): array
             }
         }
 
-        return array_filter($combined, function ($value) {
-            return !Generator::isDefault($value) && $value !== null;
-        });
+        return array_filter($combined, fn ($value) => !Generator::isDefault($value) && $value !== null);
     }
 }
diff --git a/src/Annotations/Flow.php b/src/Annotations/Flow.php
index 54092062..c94f9446 100644
--- a/src/Annotations/Flow.php
+++ b/src/Annotations/Flow.php
@@ -97,7 +97,7 @@ class Flow extends AbstractAnnotation
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
-        if (is_array($this->scopes) && empty($this->scopes)) {
+        if ($this->scopes === []) {
             $this->scopes = new \stdClass();
         }
 
diff --git a/src/Annotations/OpenApi.php b/src/Annotations/OpenApi.php
index 5351a6e8..42e1af12 100644
--- a/src/Annotations/OpenApi.php
+++ b/src/Annotations/OpenApi.php
@@ -179,11 +179,7 @@ public function saveAs(string $filename, string $format = 'auto'): void
             $format = strtolower(substr($filename, -5)) === '.json' ? 'json' : 'yaml';
         }
 
-        if (strtolower($format) === 'json') {
-            $content = $this->toJson();
-        } else {
-            $content = $this->toYaml();
-        }
+        $content = strtolower($format) === 'json' ? $this->toJson() : $this->toYaml();
 
         if (file_put_contents($filename, $content) === false) {
             throw new OpenApiException('Failed to saveAs("' . $filename . '", "' . $format . '")');
@@ -230,11 +226,9 @@ private static function resolveRef(string $ref, string $resolved, $container, ar
                 return $container->{$property};
             }
             $mapping = [];
-            if ($container instanceof AbstractAnnotation) {
-                foreach ($container::$_nested as $nestedClass => $nested) {
-                    if (is_string($nested) === false && count($nested) === 2 && $nested[0] === $property) {
-                        $mapping[$nestedClass] = $nested[1];
-                    }
+            foreach ($container::$_nested as $nestedClass => $nested) {
+                if (is_string($nested) === false && count($nested) === 2 && $nested[0] === $property) {
+                    $mapping[$nestedClass] = $nested[1];
                 }
             }
 
diff --git a/src/Annotations/Operation.php b/src/Annotations/Operation.php
index bc089dc1..17407269 100644
--- a/src/Annotations/Operation.php
+++ b/src/Annotations/Operation.php
@@ -224,7 +224,7 @@ public function validate(array $stack = [], array $skip = [], string $ref = '',
 
         if (!Generator::isDefault($this->responses)) {
             foreach ($this->responses as $response) {
-                if (!Generator::isDefault($response->response) && $response->response !== 'default' && preg_match('/^([12345]{1}[0-9]{2})|([12345]{1}XX)$/', (string) $response->response) === 0) {
+                if (!Generator::isDefault($response->response) && $response->response !== 'default' && preg_match('/^([12345]{1}\d{2})|([12345]{1}XX)$/', (string) $response->response) === 0) {
                     $this->_context->logger->warning('Invalid value "' . $response->response . '" for ' . $response->_identity([]) . '->response, expecting "default", a HTTP Status Code or HTTP Status Code range definition in ' . $response->_context);
                     $valid = false;
                 }
diff --git a/src/Context.php b/src/Context.php
index 907617c1..763b57a3 100644
--- a/src/Context.php
+++ b/src/Context.php
@@ -47,18 +47,8 @@ class Context
 {
     /**
      * Prototypical inheritance for properties.
-     *
-     * @var Context|null
      */
-    private $parent;
-
-    /**
-     * @deprecated
-     */
-    public function clone()
-    {
-        return new Context(get_object_vars($this), $this->parent);
-    }
+    private ?Context $parent;
 
     public function __construct(array $properties = [], ?Context $parent = null)
     {
@@ -117,7 +107,7 @@ public function with(string $property): ?Context
         if ($this->is($property)) {
             return $this;
         }
-        if ($this->parent !== null) {
+        if ($this->parent instanceof Context) {
             return $this->parent->with($property);
         }
 
@@ -129,7 +119,7 @@ public function with(string $property): ?Context
      */
     public function root(): Context
     {
-        if ($this->parent !== null) {
+        if ($this->parent instanceof Context) {
             return $this->parent->root();
         }
 
@@ -196,7 +186,7 @@ public function getDebugLocation(): string
      */
     public function __get(string $property)
     {
-        if ($this->parent !== null) {
+        if ($this->parent instanceof Context) {
             return $this->parent->{$property};
         }
 
@@ -213,41 +203,6 @@ public function __debugInfo()
         return ['-' => $this->getDebugLocation()];
     }
 
-    /**
-     * Create a Context based on `debug_backtrace`.
-     *
-     * @deprecated
-     */
-    public static function detect(int $index = 0): Context
-    {
-        $context = new Context();
-        $backtrace = debug_backtrace();
-        $position = $backtrace[$index];
-        if (isset($position['file'])) {
-            $context->filename = $position['file'];
-        }
-        if (isset($position['line'])) {
-            $context->line = $position['line'];
-        }
-        $caller = $backtrace[$index + 1] ?? null;
-        if (isset($caller['function'])) {
-            $context->method = $caller['function'];
-            if (isset($caller['type']) && $caller['type'] === '::') {
-                $context->static = true;
-            }
-        }
-        if (isset($caller['class'])) {
-            $fqn = explode('\\', $caller['class']);
-            $context->class = array_pop($fqn);
-            if (count($fqn)) {
-                $context->namespace = implode('\\', $fqn);
-            }
-        }
-
-        // @todo extract namespaces and use statements
-        return $context;
-    }
-
     /**
      * Resolve the fully qualified name.
      */
@@ -257,12 +212,7 @@ public function fullyQualifiedName(?string $source): string
             return '';
         }
 
-        if ($this->namespace) {
-            $namespace = str_replace('\\\\', '\\', '\\' . $this->namespace . '\\');
-        } else {
-            // global namespace
-            $namespace = '\\';
-        }
+        $namespace = $this->namespace ? str_replace('\\\\', '\\', '\\' . $this->namespace . '\\') : '\\';
 
         $thisSource = $this->class ?? $this->interface ?? $this->trait;
         if ($thisSource && strcasecmp($source, $thisSource) === 0) {
diff --git a/src/Generator.php b/src/Generator.php
index 10460511..160dbab3 100644
--- a/src/Generator.php
+++ b/src/Generator.php
@@ -6,14 +6,12 @@
 
 namespace OpenApi;
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use OpenApi\Analysers\AnalyserInterface;
 use OpenApi\Analysers\AttributeAnnotationFactory;
 use OpenApi\Analysers\DocBlockAnnotationFactory;
 use OpenApi\Analysers\ReflectionAnalyser;
 use OpenApi\Annotations as OA;
 use OpenApi\Loggers\DefaultLogger;
-use OpenApi\Processors\ProcessorInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -28,10 +26,8 @@ class Generator
 {
     /**
      * Allows Annotation classes to know the context of the annotation that is being processed.
-     *
-     * @var Context|null
      */
-    public static $context;
+    public static ?Context $context;
 
     /** @var string Magic value to differentiate between null and undefined. */
     public const UNDEFINED = '@OA\Generator::UNDEFINED🙈';
@@ -42,22 +38,19 @@ class Generator
     public const DEFAULT_NAMESPACES = ['OpenApi\\Annotations\\'];
 
     /** @var array<string,string> Map of namespace aliases to be supported by doctrine. */
-    protected $aliases;
+    protected array $aliases;
 
     /** @var array<string>|null List of annotation namespaces to be autoloaded by doctrine. */
-    protected $namespaces;
+    protected ?array $namespaces;
 
-    /** @var AnalyserInterface|null The configured analyzer. */
-    protected $analyser = null;
+    protected ?AnalyserInterface $analyser = null;
 
     /** @var array<string,mixed> */
-    protected $config = [];
+    protected array $config = [];
 
-    /** @var Pipeline|null */
-    protected $processorPipeline = null;
+    protected ?Pipeline $processorPipeline = null;
 
-    /** @var LoggerInterface|null PSR logger. */
-    protected $logger = null;
+    protected ?LoggerInterface $logger = null;
 
     /**
      * OpenApi version override.
@@ -66,12 +59,8 @@ class Generator
      *
      * Due to the order of processing any conditional code using this (via `Context::$version`)
      * must come only after the analysis is finished.
-     *
-     * @var string|null
      */
-    protected $version = null;
-
-    private $configStack;
+    protected ?string $version = null;
 
     public function __construct(?LoggerInterface $logger = null)
     {
@@ -79,49 +68,6 @@ public function __construct(?LoggerInterface $logger = null)
 
         $this->setAliases(self::DEFAULT_ALIASES);
         $this->setNamespaces(self::DEFAULT_NAMESPACES);
-
-        // kinda config stack to stay BC...
-        // @deprecated Can be removed once doctrine/annotations 2.0 becomes mandatory
-        $this->configStack = new class() {
-            protected $generator;
-
-            public function push(Generator $generator): void
-            {
-                $this->generator = $generator;
-                /* @phpstan-ignore-next-line */
-                if (class_exists(AnnotationRegistry::class, true) && method_exists(AnnotationRegistry::class, 'registerLoader')) {
-                    // keeping track of &this->generator allows to 'disable' the loader after we are done;
-                    // no unload, unfortunately :/
-                    $gref = &$this->generator;
-                    AnnotationRegistry::registerLoader(
-                        function (string $class) use (&$gref): bool {
-                            if ($gref) {
-                                foreach ($gref->getNamespaces() as $namespace) {
-                                    if (strtolower(substr($class, 0, strlen($namespace))) === strtolower($namespace)) {
-                                        $loaded = class_exists($class);
-                                        if (!$loaded && $namespace === 'OpenApi\\Annotations\\') {
-                                            if (in_array(strtolower(substr($class, 20)), ['definition', 'path'])) {
-                                                // Detected an 2.x annotation?
-                                                throw new OpenApiException('The annotation @SWG\\' . substr($class, 20) . '() is deprecated. Found in ' . Generator::$context . "\nFor more information read the migration guide: https://github.com/zircote/swagger-php/blob/master/docs/Migrating-to-v3.md");
-                                            }
-                                        }
-
-                                        return $loaded;
-                                    }
-                                }
-                            }
-
-                            return false;
-                        }
-                    );
-                }
-            }
-
-            public function pop(): void
-            {
-                $this->generator = null;
-            }
-        };
     }
 
     public static function isDefault($value): bool
@@ -176,7 +122,7 @@ public function setNamespaces(?array $namespaces): Generator
 
     public function getAnalyser(): AnalyserInterface
     {
-        $this->analyser = $this->analyser ?: new ReflectionAnalyser([new DocBlockAnnotationFactory(), new AttributeAnnotationFactory()]);
+        $this->analyser = $this->analyser ?: new ReflectionAnalyser([new AttributeAnnotationFactory(), new DocBlockAnnotationFactory()]);
         $this->analyser->setGenerator($this);
 
         return $this->analyser;
@@ -219,7 +165,7 @@ protected function normaliseConfig(array $config): array
                 $value = 'true' == $value;
             }
 
-            if ($isList = ('[]' == substr($key, -2))) {
+            if ($isList = ('[]' === substr($key, -2))) {
                 $key = substr($key, 0, -2);
             }
             $token = explode('.', $key);
@@ -257,7 +203,7 @@ public function setConfig(array $config): Generator
 
     public function getProcessorPipeline(): Pipeline
     {
-        if (null === $this->processorPipeline) {
+        if (!$this->processorPipeline instanceof Pipeline) {
             $this->processorPipeline = new Pipeline([
                 new Processors\DocBlockDescriptions(),
                 new Processors\MergeIntoOpenApi(),
@@ -320,87 +266,6 @@ public function withProcessor(callable $with): Generator
         return $this;
     }
 
-    /**
-     * @return array<ProcessorInterface|callable>
-     *
-     * @deprecated
-     */
-    public function getProcessors(): array
-    {
-        return $this->getProcessorPipeline()->pipes();
-    }
-
-    /**
-     * @param array<ProcessorInterface|callable>|null $processors
-     *
-     * @deprecated
-     */
-    public function setProcessors(?array $processors): Generator
-    {
-        $this->processorPipeline = null !== $processors ? new Pipeline($processors) : null;
-
-        return $this;
-    }
-
-    /**
-     * @param callable|ProcessorInterface $processor
-     * @param class-string|null           $before
-     *
-     * @deprecated
-     */
-    public function addProcessor($processor, ?string $before = null): Generator
-    {
-        $processors = $this->processorPipeline ?: $this->getProcessorPipeline();
-        if (!$before) {
-            $processors->add($processor);
-        } else {
-            $processors->insert($processor, $before);
-        }
-
-        $this->processorPipeline = $processors;
-
-        return $this;
-    }
-
-    /**
-     * @param callable|ProcessorInterface $processor
-     *
-     * @deprecated
-     */
-    public function removeProcessor($processor, bool $silent = false): Generator
-    {
-        $processors = $this->processorPipeline ?: $this->getProcessorPipeline();
-        $processors->remove($processor);
-        $this->processorPipeline = $processors;
-
-        return $this;
-    }
-
-    /**
-     * Update/replace an existing processor with a new one.
-     *
-     * @param ProcessorInterface|callable $processor the new processor
-     * @param null|callable               $matcher   Optional matcher callable to identify the processor to replace.
-     *                                               If none given, matching is based on the processors class.
-     *
-     * @deprecated
-     */
-    public function updateProcessor($processor, ?callable $matcher = null): Generator
-    {
-        $matcher = $matcher ?: function ($other) use ($processor): bool {
-            $otherClass = get_class($other);
-
-            return $processor instanceof $otherClass;
-        };
-
-        $processors = array_map(function ($other) use ($processor, $matcher) {
-            return $matcher($other) ? $processor : $other;
-        }, $this->getProcessors());
-        $this->setProcessors($processors);
-
-        return $this;
-    }
-
     public function getLogger(): ?LoggerInterface
     {
         return $this->logger ?: new DefaultLogger();
@@ -463,12 +328,7 @@ public function withContext(callable $callable)
         ]);
         $analysis = new Analysis([], $rootContext);
 
-        $this->configStack->push($this);
-        try {
-            return $callable($this, $analysis, $rootContext);
-        } finally {
-            $this->configStack->pop();
-        }
+        return $callable($this, $analysis, $rootContext);
     }
 
     /**
@@ -492,26 +352,21 @@ public function generate(iterable $sources, ?Analysis $analysis = null, bool $va
         $analysis = $analysis ?: new Analysis([], $rootContext);
         $analysis->context = $analysis->context ?: $rootContext;
 
-        $this->configStack->push($this);
-        try {
-            $this->scanSources($sources, $analysis, $rootContext);
+        $this->scanSources($sources, $analysis, $rootContext);
 
-            // post-processing
-            $this->getProcessorPipeline()->process($analysis);
+        // post-processing
+        $this->getProcessorPipeline()->process($analysis);
 
-            if ($analysis->openapi) {
-                // overwrite default/annotated version
-                $analysis->openapi->openapi = $this->getVersion() ?: $analysis->openapi->openapi;
-                // update context to provide the same to validation/serialisation code
-                $rootContext->version = $analysis->openapi->openapi;
-            }
+        if ($analysis->openapi) {
+            // overwrite default/annotated version
+            $analysis->openapi->openapi = $this->getVersion() ?: $analysis->openapi->openapi;
+            // update context to provide the same to validation/serialisation code
+            $rootContext->version = $analysis->openapi->openapi;
+        }
 
-            // validation
-            if ($validate) {
-                $analysis->validate();
-            }
-        } finally {
-            $this->configStack->pop();
+        // validation
+        if ($validate) {
+            $analysis->validate();
         }
 
         return $analysis->openapi;
diff --git a/src/Loggers/ConsoleLogger.php b/src/Loggers/ConsoleLogger.php
index 3bcd5c6e..a85232a7 100644
--- a/src/Loggers/ConsoleLogger.php
+++ b/src/Loggers/ConsoleLogger.php
@@ -25,8 +25,7 @@ class ConsoleLogger extends AbstractLogger implements LoggerInterface
     /** @var bool */
     protected $loggedMessageAboveNotice = false;
 
-    /** @var bool */
-    protected $debug;
+    protected bool $debug;
 
     public function __construct(bool $debug = false)
     {
@@ -64,7 +63,7 @@ public function log($level, $message, array $context = []): void
                 $color = static::COLOR_ERROR;
                 break;
         }
-        $stop = !empty($color) ? static::COLOR_STOP : '';
+        $stop = empty($color) ? '' : static::COLOR_STOP;
 
         if (!in_array($level, self::LOG_LEVELS_UP_TO_NOTICE, true)) {
             $this->loggedMessageAboveNotice = true;
@@ -83,7 +82,7 @@ public function log($level, $message, array $context = []): void
         if ($this->debug) {
             if ($exception) {
                 error_log($exception->getTraceAsString());
-            } elseif (!empty($logLine)) {
+            } elseif ($logLine !== '' && $logLine !== '0') {
                 $stack = explode(PHP_EOL, (new \Exception())->getTraceAsString());
                 // self
                 array_shift($stack);
diff --git a/src/Loggers/DefaultLogger.php b/src/Loggers/DefaultLogger.php
index d4118f0d..75be1833 100644
--- a/src/Loggers/DefaultLogger.php
+++ b/src/Loggers/DefaultLogger.php
@@ -18,15 +18,7 @@ public function log($level, $message, array $context = []): void
             return;
         }
 
-        if ($message instanceof \Exception) {
-            $message = $message->getMessage();
-        }
-
-        if (in_array($level, [LogLevel::NOTICE, LogLevel::INFO])) {
-            $error_level = E_USER_NOTICE;
-        } else {
-            $error_level = E_USER_WARNING;
-        }
+        $error_level = in_array($level, [LogLevel::NOTICE, LogLevel::INFO]) ? E_USER_NOTICE : E_USER_WARNING;
 
         trigger_error($message, $error_level);
     }
diff --git a/src/OpenApiException.php b/src/OpenApiException.php
index c3320da3..1198d368 100644
--- a/src/OpenApiException.php
+++ b/src/OpenApiException.php
@@ -8,5 +8,4 @@
 
 class OpenApiException extends \Exception
 {
-
 }
diff --git a/src/Pipeline.php b/src/Pipeline.php
index 754f2afa..d00b42f3 100644
--- a/src/Pipeline.php
+++ b/src/Pipeline.php
@@ -18,14 +18,6 @@ public function __construct(array $pipes = [])
         $this->pipes = $pipes;
     }
 
-    /**
-     * @deprecated This will be removed in 5.0
-     */
-    public function pipes(): array
-    {
-        return $this->pipes;
-    }
-
     public function add(callable $pipe): Pipeline
     {
         $this->pipes[] = $pipe;
diff --git a/src/Processors/AugmentParameters.php b/src/Processors/AugmentParameters.php
index 2c882ba6..fbe0f579 100644
--- a/src/Processors/AugmentParameters.php
+++ b/src/Processors/AugmentParameters.php
@@ -18,7 +18,7 @@ class AugmentParameters implements ProcessorInterface
 {
     use DocblockTrait;
 
-    protected $augmentOperationParameters = true;
+    protected bool $augmentOperationParameters;
 
     public function __construct(bool $augmentOperationParameters = true)
     {
diff --git a/src/Processors/AugmentSchemas.php b/src/Processors/AugmentSchemas.php
index a07b2aa3..ebc4d0b7 100644
--- a/src/Processors/AugmentSchemas.php
+++ b/src/Processors/AugmentSchemas.php
@@ -93,13 +93,13 @@ protected function augmentType(Analysis $analysis, array $schemas): void
     {
         foreach ($schemas as $schema) {
             if (Generator::isDefault($schema->type)) {
-                if (is_array($schema->properties) && count($schema->properties) > 0) {
+                if (is_array($schema->properties) && $schema->properties !== []) {
                     $schema->type = 'object';
-                } elseif (is_array($schema->additionalProperties) && count($schema->additionalProperties) > 0) {
+                } elseif (is_array($schema->additionalProperties) && $schema->additionalProperties !== []) {
                     $schema->type = 'object';
-                } elseif (is_array($schema->patternProperties) && count($schema->patternProperties) > 0) {
+                } elseif (is_array($schema->patternProperties) && $schema->patternProperties !== []) {
                     $schema->type = 'object';
-                } elseif (is_array($schema->propertyNames) && count($schema->propertyNames) > 0) {
+                } elseif (is_array($schema->propertyNames) && $schema->propertyNames !== []) {
                     $schema->type = 'object';
                 }
             } else {
diff --git a/src/Processors/AugmentTags.php b/src/Processors/AugmentTags.php
index 22a2e49f..4a450b9c 100644
--- a/src/Processors/AugmentTags.php
+++ b/src/Processors/AugmentTags.php
@@ -15,9 +15,8 @@
  */
 class AugmentTags implements ProcessorInterface
 {
-
     /** @var array<string> */
-    protected $whitelist = [];
+    protected array $whitelist = [];
 
     public function __construct(array $whitelist = [])
     {
diff --git a/src/Processors/CleanUnmerged.php b/src/Processors/CleanUnmerged.php
index dacdaa10..6b3e2147 100644
--- a/src/Processors/CleanUnmerged.php
+++ b/src/Processors/CleanUnmerged.php
@@ -20,9 +20,9 @@ public function __invoke(Analysis $analysis)
         /** @var OA\AbstractAnnotation $annotation */
         foreach ($analysis->annotations as $annotation) {
             if (property_exists($annotation, '_unmerged')) {
-                foreach ($annotation->_unmerged as $i => $item) {
+                foreach ($annotation->_unmerged as $ii => $item) {
                     if ($merged->contains($item)) {
-                        unset($annotation->_unmerged[$i]); // Property was merged
+                        unset($annotation->_unmerged[$ii]); // Property was merged
                     }
                 }
             }
diff --git a/src/Processors/CleanUnusedComponents.php b/src/Processors/CleanUnusedComponents.php
index 1871c81f..ecd4b0c6 100644
--- a/src/Processors/CleanUnusedComponents.php
+++ b/src/Processors/CleanUnusedComponents.php
@@ -17,7 +17,7 @@ class CleanUnusedComponents implements ProcessorInterface
 {
     use Concerns\AnnotationTrait;
 
-    protected $enabled = false;
+    protected bool $enabled;
 
     public function __construct(bool $enabled = false)
     {
diff --git a/src/Processors/Concerns/DocblockTrait.php b/src/Processors/Concerns/DocblockTrait.php
index 7c00c886..dd6590b6 100644
--- a/src/Processors/Concerns/DocblockTrait.php
+++ b/src/Processors/Concerns/DocblockTrait.php
@@ -95,8 +95,8 @@ public function extractContent(?string $docblock, ?array &$tags = null): string
 
         $comment = preg_split('/(\n|\r\n)/', (string) $docblock);
         $comment[0] = preg_replace('/[ \t]*\\/\*\*/', '', $comment[0]); // strip '/**'
-        $i = count($comment) - 1;
-        $comment[$i] = preg_replace('/\*\/[ \t]*$/', '', $comment[$i]); // strip '*/'
+        $ii = count($comment) - 1;
+        $comment[$ii] = preg_replace('/\*\/[ \t]*$/', '', $comment[$ii]); // strip '*/'
         $lines = [];
         $append = false;
         $skip = false;
@@ -110,8 +110,8 @@ public function extractContent(?string $docblock, ?array &$tags = null): string
                 continue;
             }
             if ($append) {
-                $i = count($lines) - 1;
-                $lines[$i] = substr($lines[$i], 0, -1) . $line;
+                $ii = count($lines) - 1;
+                $lines[$ii] = substr($lines[$ii], 0, -1) . $line;
             } else {
                 $lines[] = $line;
             }
@@ -182,14 +182,10 @@ public function extractVarTypeAndDescription(?string $docblock): array
 
         return array_merge(
             ['type' => null, 'description' => null],
-            array_filter($matches, function ($key) {
-                return in_array($key, ['type', 'description']);
-            }, ARRAY_FILTER_USE_KEY)
+            array_filter($matches, fn ($key) => in_array($key, ['type', 'description']), ARRAY_FILTER_USE_KEY)
         );
     }
 
-    // ------------------------------------------------------------------------
-
     /**
      * Extract example text from a `@example` dockblock line.
      */
diff --git a/src/Processors/ExpandClasses.php b/src/Processors/ExpandClasses.php
index 6ede741c..9ba65973 100644
--- a/src/Processors/ExpandClasses.php
+++ b/src/Processors/ExpandClasses.php
@@ -33,7 +33,7 @@ public function __invoke(Analysis $analysis)
                 foreach ($ancestors as $ancestor) {
                     $ancestorSchema = $analysis->getSchemaForSource($ancestor['context']->fullyQualifiedName($ancestor['class']));
                     if ($ancestorSchema) {
-                        $refPath = !Generator::isDefault($ancestorSchema->schema) ? $ancestorSchema->schema : $ancestor['class'];
+                        $refPath = Generator::isDefault($ancestorSchema->schema) ? $ancestor['class'] : $ancestorSchema->schema;
                         $this->inheritFrom($analysis, $schema, $ancestorSchema, $refPath, $ancestor['context']);
 
                         // one ancestor is enough
diff --git a/src/Processors/ExpandEnums.php b/src/Processors/ExpandEnums.php
index c9199b92..c3ce831e 100644
--- a/src/Processors/ExpandEnums.php
+++ b/src/Processors/ExpandEnums.php
@@ -38,7 +38,7 @@ protected function expandContextEnum(Analysis $analysis): void
         foreach ($schemas as $schema) {
             if ($schema->_context->is('enum')) {
                 $re = new \ReflectionEnum($schema->_context->fullyQualifiedName($schema->_context->enum));
-                $schema->schema = !Generator::isDefault($schema->schema) ? $schema->schema : $re->getShortName();
+                $schema->schema = Generator::isDefault($schema->schema) ? $re->getShortName() : $schema->schema;
 
                 $schemaType = $schema->type;
                 $enumType = null;
@@ -100,11 +100,7 @@ protected function expandSchemaEnum(Analysis $analysis): void
 
             $enums = [];
             foreach ($cases as $enum) {
-                if (is_a($enum, \UnitEnum::class)) {
-                    $enums[] = $enum->value ?? $enum->name;
-                } else {
-                    $enums[] = $enum;
-                }
+                $enums[] = is_a($enum, \UnitEnum::class) ? $enum->value ?? $enum->name : $enum;
             }
 
             $schema->enum = $enums;
diff --git a/src/Processors/ExpandInterfaces.php b/src/Processors/ExpandInterfaces.php
index 8bcc3c25..2d89ce1b 100644
--- a/src/Processors/ExpandInterfaces.php
+++ b/src/Processors/ExpandInterfaces.php
@@ -43,7 +43,7 @@ public function __invoke(Analysis $analysis)
                     $interfaceName = $interface['context']->fullyQualifiedName($interface['interface']);
                     $interfaceSchema = $analysis->getSchemaForSource($interfaceName);
                     if ($interfaceSchema) {
-                        $refPath = !Generator::isDefault($interfaceSchema->schema) ? $interfaceSchema->schema : $interface['interface'];
+                        $refPath = Generator::isDefault($interfaceSchema->schema) ? $interface['interface'] : $interfaceSchema->schema;
                         $this->inheritFrom($analysis, $schema, $interfaceSchema, $refPath, $interface['context']);
                     } else {
                         $this->mergeMethods($schema, $interface, $existing);
diff --git a/src/Processors/ExpandTraits.php b/src/Processors/ExpandTraits.php
index cd1b4aca..5cd7e2a4 100644
--- a/src/Processors/ExpandTraits.php
+++ b/src/Processors/ExpandTraits.php
@@ -32,7 +32,7 @@ public function __invoke(Analysis $analysis)
                 foreach ($traits as $trait) {
                     $traitSchema = $analysis->getSchemaForSource($trait['context']->fullyQualifiedName($trait['trait']));
                     if ($traitSchema) {
-                        $refPath = !Generator::isDefault($traitSchema->schema) ? $traitSchema->schema : $trait['trait'];
+                        $refPath = Generator::isDefault($traitSchema->schema) ? $trait['trait'] : $traitSchema->schema;
                         $this->inheritFrom($analysis, $schema, $traitSchema, $refPath, $trait['context']);
                     } else {
                         $this->mergeMethods($schema, $trait, $existing);
@@ -50,7 +50,7 @@ public function __invoke(Analysis $analysis)
                 foreach ($traits as $trait) {
                     $traitSchema = $analysis->getSchemaForSource($trait['context']->fullyQualifiedName($trait['trait']));
                     if ($traitSchema) {
-                        $refPath = !Generator::isDefault($traitSchema->schema) ? $traitSchema->schema : $trait['trait'];
+                        $refPath = Generator::isDefault($traitSchema->schema) ? $trait['trait'] : $traitSchema->schema;
                         $this->inheritFrom($analysis, $schema, $traitSchema, $refPath, $trait['context']);
                     } else {
                         $this->mergeMethods($schema, $trait, $existing);
diff --git a/src/Processors/OperationId.php b/src/Processors/OperationId.php
index b6aff2ca..84d7ac60 100644
--- a/src/Processors/OperationId.php
+++ b/src/Processors/OperationId.php
@@ -15,7 +15,7 @@
  */
 class OperationId implements ProcessorInterface
 {
-    protected $hash = true;
+    protected bool $hash;
 
     public function __construct(bool $hash = true)
     {
@@ -57,11 +57,7 @@ public function __invoke(Analysis $analysis)
                 $operationId = null;
                 if ($source) {
                     $method = $context->method ? ('::' . $context->method) : '';
-                    if ($context->namespace) {
-                        $operationId = $context->namespace . '\\' . $source . $method;
-                    } else {
-                        $operationId = $source . $method;
-                    }
+                    $operationId = $context->namespace ? $context->namespace . '\\' . $source . $method : $source . $method;
                 } elseif ($context->method) {
                     $operationId = $context->method;
                 }
diff --git a/src/Processors/PathFilter.php b/src/Processors/PathFilter.php
index b393d468..079a098d 100644
--- a/src/Processors/PathFilter.php
+++ b/src/Processors/PathFilter.php
@@ -20,9 +20,9 @@ class PathFilter implements ProcessorInterface
 {
     use AnnotationTrait;
 
-    protected $tags = [];
+    protected array $tags;
 
-    protected $paths = [];
+    protected array $paths;
 
     public function __construct(array $tags = [], array $paths = [])
     {
diff --git a/src/Serializer.php b/src/Serializer.php
index ca02e1c4..80799ac1 100644
--- a/src/Serializer.php
+++ b/src/Serializer.php
@@ -90,7 +90,7 @@ public function deserializeFile(string $filename, string $format = 'json', strin
         $contents = file_get_contents($filename);
 
         $ext = pathinfo($filename, PATHINFO_EXTENSION);
-        if ('yaml' == $format || in_array($ext, ['yml', 'yaml'])) {
+        if ('yaml' === $format || in_array($ext, ['yml', 'yaml'])) {
             $contents = json_encode(Yaml::parse($contents));
         }
 
diff --git a/src/Util.php b/src/Util.php
index be329af7..edb32bf9 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -34,13 +34,13 @@ public static function getRelativePath(string $fullPath, $basePaths): string
         } else { // an array of paths
             foreach ($basePaths as $basePath) {
                 $relativePath = self::removePrefix($fullPath, $basePath);
-                if (!empty($relativePath)) {
+                if ($relativePath !== null && $relativePath !== '' && $relativePath !== '0') {
                     break;
                 }
             }
         }
 
-        return !empty($relativePath) ? trim($relativePath, '/') : $fullPath;
+        return $relativePath === null || $relativePath === '' || $relativePath === '0' ? $fullPath : trim($relativePath, '/');
     }
 
     /**
@@ -48,7 +48,7 @@ public static function getRelativePath(string $fullPath, $basePaths): string
      */
     private static function removePrefix(string $str, string $prefix): ?string
     {
-        if (substr($str, 0, strlen($prefix)) == $prefix) {
+        if (substr($str, 0, strlen($prefix)) === $prefix) {
             return substr($str, strlen($prefix));
         }
 
diff --git a/tests/Analysers/ReflectionAnalyserTest.php b/tests/Analysers/ReflectionAnalyserTest.php
index d4b676c6..fa731788 100644
--- a/tests/Analysers/ReflectionAnalyserTest.php
+++ b/tests/Analysers/ReflectionAnalyserTest.php
@@ -24,7 +24,7 @@ class ReflectionAnalyserTest extends OpenApiTestCase
 {
     protected function collectingAnnotationFactory(): AnnotationFactoryInterface
     {
-        return new class() implements AnnotationFactoryInterface {
+        return new class () implements AnnotationFactoryInterface {
             public $reflectors = [];
 
             public function build(\Reflector $reflector, Context $context): array
@@ -182,8 +182,6 @@ public function testApiMixedBasic(AnalyserInterface $analyser): void
      */
     public function testPhp8PromotedProperties(): void
     {
-        $this->skipLegacy();
-
         $analysis = $this->analysisFromFixtures(['PHP/Php8PromotedProperties.php']);
         $schemas = $analysis->getAnnotationsOfType(OA\Schema::class, true);
 
diff --git a/tests/Analysers/TokenAnalyserTest.php b/tests/Analysers/TokenAnalyserTest.php
deleted file mode 100644
index dac65837..00000000
--- a/tests/Analysers/TokenAnalyserTest.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php declare(strict_types=1);
-
-/**
- * @license Apache 2.0
- */
-
-namespace OpenApi\Tests\Analysers;
-
-use OpenApi\Analysis;
-use OpenApi\Annotations as OA;
-use OpenApi\Context;
-use OpenApi\Generator;
-use OpenApi\Analysers\TokenAnalyser;
-use OpenApi\Processors\CleanUnusedComponents;
-use OpenApi\Tests\Fixtures\Parser\User;
-use OpenApi\Tests\OpenApiTestCase;
-
-class TokenAnalyserTest extends OpenApiTestCase
-{
-    protected function analysisFromCode(string $code): Analysis
-    {
-        $analyser = new TokenAnalyser();
-        $analyser->setGenerator(new Generator());
-
-        return $analyser->fromCode('<?php ' . $code, $this->getContext());
-    }
-
-    public static function singleDefinitionCases(): iterable
-    {
-        return [
-            'global-class' => ['class AClass {}', '\AClass', 'AClass', 'classes', 'class'],
-            'global-interface' => ['interface AInterface {}', '\AInterface', 'AInterface', 'interfaces', 'interface'],
-            'global-trait' => ['trait ATrait {}', '\ATrait', 'ATrait', 'traits', 'trait'],
-
-            'namespaced-class' => ['namespace SNS\Foo; class AClass {}', '\SNS\Foo\AClass', 'AClass', 'classes', 'class'],
-            'namespaced-interface' => ['namespace SNS\Foo; interface AInterface {}', '\SNS\Foo\AInterface', 'AInterface', 'interfaces', 'interface'],
-            'namespaced-trait' => ['namespace SNS\Foo; trait ATrait {}', '\SNS\Foo\ATrait', 'ATrait', 'traits', 'trait'],
-        ];
-    }
-
-    /**
-     * @dataProvider singleDefinitionCases
-     */
-    public function testSingleDefinition(string $code, string $fqdn, string $name, string $type, string $typeKey): void
-    {
-        $analysis = $this->analysisFromCode($code);
-
-        $this->assertSame([$fqdn], array_keys($analysis->$type));
-        $definition = $analysis->{$type}[$fqdn];
-        $this->assertSame($name, $definition[$typeKey]);
-        $this->assertTrue(!array_key_exists('extends', $definition) || !$definition['extends']);
-        $this->assertSame([], $definition['properties']);
-        $this->assertSame([], $definition['methods']);
-    }
-
-    public static function extendsDefinitionCases(): iterable
-    {
-        return [
-            'global-class' => ['class BClass extends Other {}', '\BClass', 'BClass', '\Other', 'classes', 'class'],
-            'namespaced-class' => ['namespace NC\Foo; class BClass extends \Other {}', '\NC\Foo\BClass', 'BClass', '\Other', 'classes', 'class'],
-            'global-class-explicit' => ['class EClass extends \Bar\Other {}', '\EClass', 'EClass', '\Bar\Other', 'classes', 'class'],
-            'namespaced-class-explicit' => ['namespace NCE\Foo; class AClass extends \Bar\Other {}', '\NCE\Foo\AClass', 'AClass', '\Bar\Other', 'classes', 'class'],
-            'global-class-use' => ['use XBar\Other; class XClass extends Other {}', '\XClass', 'XClass', '\XBar\Other', 'classes', 'class'],
-            'namespaced-class-use' => ['namespace NCU\Foo; use YBar\Other; class AClass extends Other {}', '\NCU\Foo\AClass', 'AClass', '\YBar\Other', 'classes', 'class'],
-            'namespaced-class-as' => ['namespace NCA\Foo; use Bar\Some as Other; class AClass extends Other {}', '\NCA\Foo\AClass', 'AClass', '\Bar\Some', 'classes', 'class'],
-            'namespaced-class-same' => ['namespace NCS\Foo; class AClass extends Other {}', '\NCS\Foo\AClass', 'AClass', '\NCS\Foo\Other', 'classes', 'class'],
-
-            'global-interface' => ['interface BInterface extends Other {}', '\BInterface', 'BInterface', ['\Other'], 'interfaces', 'interface'],
-            'namespaced-interface' => ['namespace NI\Foo; interface AInterface extends \Other {}', '\NI\Foo\AInterface', 'AInterface', ['\Other'], 'interfaces', 'interface'],
-            'global-interface-explicit' => ['interface XInterface extends \ZBar\Other {}', '\XInterface', 'XInterface', ['\ZBar\Other'], 'interfaces', 'interface'],
-            'namespaced-interface-explicit' => ['namespace NIE\Foo; interface AInterface extends \ABar\Other {}', '\NIE\Foo\AInterface', 'AInterface', ['\ABar\Other'], 'interfaces', 'interface'],
-            'global-interface-use' => ['use BBar\Other; interface YInterface extends Other {}', '\YInterface', 'YInterface', ['\BBar\Other'], 'interfaces', 'interface'],
-            'namespaced-interface-use' => ['namespace NIU\Foo; use EBar\Other; interface AInterface extends Other {}', '\NIU\Foo\AInterface', 'AInterface', ['\EBar\Other'], 'interfaces', 'interface'],
-            'namespaced-interface-use-multi' => ['namespace NIUM\Foo; use FBar\Other; interface AInterface extends Other, \More {}', '\NIUM\Foo\AInterface', 'AInterface', ['\FBar\Other', '\More'], 'interfaces', 'interface'],
-            'namespaced-interface-as' => ['namespace NIA\Foo; use Bar\Some as Other; interface AInterface extends Other {}', '\NIA\Foo\AInterface', 'AInterface', ['\Bar\Some'], 'interfaces', 'interface'],
-        ];
-    }
-
-    /**
-     * @dataProvider extendsDefinitionCases
-     *
-     * @param string|array $extends
-     */
-    public function testExtendsDefinition(string $code, string $fqdn, string $name, $extends, string $type, string $typeKey): void
-    {
-        $analysis = $this->analysisFromCode($code);
-
-        $this->assertSame([$fqdn], array_keys($analysis->$type));
-        $definition = $analysis->{$type}[$fqdn];
-        $this->assertSame($name, $definition[$typeKey]);
-        $this->assertSame($extends, $definition['extends']);
-    }
-
-    public static function usesDefinitionCases(): iterable
-    {
-        return [
-            'global-class-use' => ['class YClass { use Other; }', '\YClass', 'YClass', ['\Other'], 'classes', 'class'],
-            'namespaced-class-use' => ['namespace UNCU\Foo; class AClass { use \Other; }', '\UNCU\Foo\AClass', 'AClass', ['\Other'], 'classes', 'class'],
-            'namespaced-class-use-namespaced' => ['namespace UNCUN\Foo; use GBar\Other; class AClass { use Other; }', '\UNCUN\Foo\AClass', 'AClass', ['\GBar\Other'], 'classes', 'class'],
-            'namespaced-class-use-namespaced-as' => ['namespace UNCUNA\Foo; use HBar\Other as Some; class AClass { use Some; }', '\UNCUNA\Foo\AClass', 'AClass', ['\HBar\Other'], 'classes', 'class'],
-
-            'global-trait-use' => ['trait ATrait { use Other; }', '\ATrait', 'ATrait', ['\Other'], 'traits', 'trait'],
-            'namespaced-trait-use' => ['namespace UNTU\Foo; trait ATrait { use \Other; }', '\UNTU\Foo\ATrait', 'ATrait', ['\Other'], 'traits', 'trait'],
-            'namespaced-trait-use-explicit' => ['namespace UNTUE\Foo; trait ATrait { use \DBar\Other; }', '\UNTUE\Foo\ATrait', 'ATrait', ['\DBar\Other'], 'traits', 'trait'],
-            'namespaced-trait-use-multi' => ['namespace UNTUEM\Foo; trait ATrait { use \Other; use \More; }', '\UNTUEM\Foo\ATrait', 'ATrait', ['\Other', '\More'], 'traits', 'trait'],
-            'namespaced-trait-use-mixed' => ['namespace UNTUEX\Foo; use TBar\Other; trait ATrait { use Other, \More; }', '\UNTUEX\Foo\ATrait', 'ATrait', ['\TBar\Other', '\More'], 'traits', 'trait'],
-            'namespaced-trait-use-as' => ['namespace UNTUEA\Foo; use MBar\Other as Some; trait ATrait { use Some; }', '\UNTUEA\Foo\ATrait', 'ATrait', ['\MBar\Other'], 'traits', 'trait'],
-        ];
-    }
-
-    /**
-     * @dataProvider usesDefinitionCases
-     */
-    public function testUsesDefinition(string $code, string $fqdn, string $name, array $traits, string $type, string $typeKey): void
-    {
-        $analysis = $this->analysisFromCode($code);
-
-        $this->assertSame([$fqdn], array_keys($analysis->$type));
-        $definition = $analysis->{$type}[$fqdn];
-        $this->assertSame($name, $definition[$typeKey]);
-        $this->assertSame($traits, $definition['traits']);
-    }
-
-    public function testWrongCommentType(): void
-    {
-        $analyser = new TokenAnalyser();
-        $this->assertOpenApiLogEntryContains('Annotations are only parsed inside `/**` DocBlocks');
-        $analyser->fromCode("<?php\n/*\n * @OA\Parameter() */", $this->getContext());
-    }
-
-    public function testThirdPartyAnnotations(): void
-    {
-        $generator = (new Generator())
-            ->setAnalyser(new TokenAnalyser());
-        $generator
-            ->withContext(function (Generator $generator, Analysis $analysis, Context $context) {
-                $defaultAnalysis = $generator->getAnalyser()->fromFile($this->fixture('ThirdPartyAnnotations.php'), $this->getContext());
-                $this->assertCount(3, $defaultAnalysis->annotations, 'Only read the @OA annotations, skip the others.');
-            });
-
-        // Allow the analyser to parse 3rd party annotations, which might
-        // contain useful info that could be extracted with a custom processor
-        $generator->addNamespace('AnotherNamespace\\Annotations\\');
-        $openapi = $generator
-            ->generate([$this->fixture('ThirdPartyAnnotations.php')]);
-        $this->assertSame('api/3rd-party', $openapi->paths[0]->path);
-        $this->assertCount(4, $openapi->_unmerged);
-
-        $analysis = $openapi->_analysis;
-        $annotations = $analysis->getAnnotationsOfType('AnotherNamespace\Annotations\Unrelated');
-        $this->assertCount(4, $annotations);
-        $context = $analysis->getContext($annotations[0]);
-        $this->assertInstanceOf('OpenApi\Context', $context);
-        $this->assertSame('ThirdPartyAnnotations', $context->class);
-        $this->assertSame('\OpenApi\Tests\Fixtures\ThirdPartyAnnotations', $context->fullyQualifiedName($context->class));
-        $this->assertCount(1, $context->annotations);
-    }
-
-    public function testAnonymousClassProducesNoError(): void
-    {
-        try {
-            $analyser = new TokenAnalyser();
-            $analysis = $analyser->fromFile($this->fixture('PHP/php7.php'), $this->getContext());
-            $this->assertNotNull($analysis);
-        } catch (\Throwable $t) {
-            $this->fail("Analyser produced an error: {$t->getMessage()}");
-        }
-    }
-
-    public static function descriptions(): iterable
-    {
-        return [
-            'class' => [
-                ['classes', 'class'],
-                'User',
-                'Parser/User.php',
-                '\OpenApi\Tests\Fixtures\Parser\User',
-                '\OpenApi\Tests\Fixtures\Parser\Sub\SubClass',
-                ['getFirstName'],
-                null,
-                ['\OpenApi\Tests\Fixtures\Parser\HelloTrait'], // use ... as ...
-            ],
-            'interface' => [
-                ['interfaces', 'interface'],
-                'UserInterface',
-                'Parser/UserInterface.php',
-                '\OpenApi\Tests\Fixtures\Parser\UserInterface',
-                ['\OpenApi\Tests\Fixtures\Parser\OtherInterface'],
-                null,
-                null,
-                null,
-            ],
-            'trait' => [
-                ['traits', 'trait'],
-                'HelloTrait',
-                'Parser/HelloTrait.php',
-                '\OpenApi\Tests\Fixtures\Parser\HelloTrait',
-                null,
-                null,
-                null,
-                ['\OpenApi\Tests\Fixtures\Parser\OtherTrait', '\OpenApi\Tests\Fixtures\Parser\AsTrait'],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider descriptions
-     *
-     * @param string|array $extends
-     */
-    public function testDescription(array $type, string $name, string $fixture, string $fqdn, $extends, ?array $methods, ?array $interfaces, ?array $traits): void
-    {
-        $analysis = $this->analysisFromFixtures([$fixture]);
-
-        list($pType, $sType) = $type;
-        $description = $analysis->$pType[$fqdn];
-
-        $this->assertSame($name, $description[$sType]);
-        if (null !== $extends) {
-            $this->assertSame($extends, $description['extends']);
-        }
-        if (null !== $methods) {
-            $this->assertSame($methods, array_keys($description['methods']));
-        }
-        if (null !== $interfaces) {
-            $this->assertSame($interfaces, $description['interfaces']);
-        }
-        if (null !== $traits) {
-            $this->assertSame($traits, $description['traits']);
-        }
-    }
-
-    public function testNamespacedConstAccess(): void
-    {
-        $analysis = $this->analysisFromFixtures(['Parser/User.php']);
-        /** @var OA\Schema[] $schemas */
-        $schemas = $analysis->getAnnotationsOfType(OA\Schema::class, true);
-
-        $this->assertCount(1, $schemas);
-        $this->assertEquals(User::CONSTANT, $schemas[0]->example);
-    }
-
-    /**
-     * @requires PHP 8
-     */
-    public function testPhp8AttributeMix(): void
-    {
-        $analysis = $this->analysisFromFixtures(['PHP/Label.php', 'PHP/Php8AttrMix.php']);
-        /** @var OA\Schema[] $schemas */
-        $schemas = $analysis->getAnnotationsOfType(OA\Schema::class, true);
-
-        $this->assertCount(1, $schemas);
-        $analysis->process($this->processors([CleanUnusedComponents::class]));
-
-        /** @var OA\Property[] $properties */
-        $properties = $analysis->getAnnotationsOfType(OA\Property::class, true);
-        $this->assertCount(2, $properties);
-        $this->assertEquals('id', $properties[0]->property);
-        $this->assertEquals('otherId', $properties[1]->property);
-    }
-
-    /**
-     * @requires PHP 8
-     */
-    public function testPhp8PromotedProperties(): void
-    {
-        $analysis = $this->analysisFromFixtures(['PHP/Php8PromotedProperties.php'], [], new TokenAnalyser());
-        $schemas = $analysis->getAnnotationsOfType(OA\Schema::class, true);
-
-        $this->assertCount(1, $schemas);
-        $analysis->process($this->processors([CleanUnusedComponents::class]));
-
-        /** @var OA\Property[] $properties */
-        $properties = $analysis->getAnnotationsOfType(OA\Property::class);
-        // ignores the attribute on $id
-        $this->assertCount(1, $properties);
-        $this->assertEquals('labels', $properties[0]->property);
-    }
-
-    public function testAnonymousFunctions(): void
-    {
-        $analysis = $this->analysisFromFixtures(['PHP/AnonymousFunctions.php'], [], new TokenAnalyser());
-        (new Generator())->getProcessorPipeline()->process($analysis);
-
-        $infos = $analysis->getAnnotationsOfType(OA\Info::class, true);
-        $this->assertCount(1, $infos);
-    }
-
-    /**
-     * @requires PHP 8
-     */
-    public function testPhp8NamedArguments(): void
-    {
-        $analysis = $this->analysisFromFixtures(['PHP/Php8NamedArguments.php'], [], new TokenAnalyser());
-        $schemas = $analysis->getAnnotationsOfType(OA\Schema::class, true);
-
-        $this->assertCount(1, $schemas);
-        (new Generator())->getProcessorPipeline()->process($analysis);
-    }
-}
diff --git a/tests/Analysers/TokenScannerTest.php b/tests/Analysers/TokenScannerTest.php
index db198d96..1b6c7d79 100644
--- a/tests/Analysers/TokenScannerTest.php
+++ b/tests/Analysers/TokenScannerTest.php
@@ -48,7 +48,7 @@ public static function scanCases(): iterable
                         'traits' => ['OpenApi\\Tests\\Fixtures\\Apis\\DocBlocks\\NameTrait'],
                         'enums' => [],
                         'methods' => ['__construct'],
-                        'properties' => ['quantity', 'brand', 'colour', 'id', 'releasedAt'],
+                        'properties' => ['releasedAt', 'quantity', 'brand', 'colour', 'id'],
                     ],
                     'OpenApi\\Tests\\Fixtures\\Apis\\DocBlocks\\ProductController' => [
                         'uses' => ['OA' => 'OpenApi\\Annotations'],
@@ -195,7 +195,10 @@ public static function scanCases(): iterable
                 'OpenApi\\Tests\\Fixtures\\Parser\\AllTraits' => [
                     'uses' => [],
                     'interfaces' => [],
-                    'traits' => ['OpenApi\\Tests\\Fixtures\\Parser\\AsTrait', 'OpenApi\\Tests\\Fixtures\\Parser\\HelloTrait'],
+                    'traits' => [
+                        'OpenApi\\Tests\\Fixtures\\Parser\\AsTrait',
+                        'OpenApi\\Tests\\Fixtures\\Parser\\HelloTrait',
+                    ],
                     'enums' => [],
                     'methods' => [],
                     'properties' => [],
@@ -220,6 +223,25 @@ public static function scanCases(): iterable
             ],
         ];
 
+        yield 'HelloTrait' => [
+            'Parser/HelloTrait.php',
+            [
+                'OpenApi\\Tests\\Fixtures\\Parser\\HelloTrait' => [
+                    'uses' => [
+                        'Aliased' => 'OpenApi\\Tests\\Fixtures\\Parser\\AsTrait',
+                    ],
+                    'interfaces' => [],
+                    'traits' => [
+                        'OpenApi\\Tests\\Fixtures\\Parser\\OtherTrait',
+                        'OpenApi\\Tests\\Fixtures\\Parser\\AsTrait',
+                    ],
+                    'enums' => [],
+                    'methods' => [],
+                    'properties' => ['greet'],
+                ],
+            ],
+        ];
+
         yield 'Php8PromotedProperties' => [
             'PHP/Php8PromotedProperties.php',
             [
@@ -360,6 +382,20 @@ public static function scanCases(): iterable
             ],
         ];
 
+        yield 'namespaces3' => [
+            'PHP/namespaces3.php',
+            [
+                '\\BarClass' => [
+                    'uses' => [],
+                    'interfaces' => [],
+                    'traits' => [],
+                    'enums' => [],
+                    'methods' => [],
+                    'properties' => [],
+                ],
+            ],
+        ];
+
         if (\PHP_VERSION_ID >= 80100) {
             yield 'enum' => [
                 'PHP/Enums/StatusEnum.php',
diff --git a/tests/Annotations/AbstractAnnotationTest.php b/tests/Annotations/AbstractAnnotationTest.php
index 7dbc837f..b516becb 100644
--- a/tests/Annotations/AbstractAnnotationTest.php
+++ b/tests/Annotations/AbstractAnnotationTest.php
@@ -148,8 +148,6 @@ public function testIsRoot(): void
      */
     public function testValidateExamples(): void
     {
-        $this->skipLegacy();
-
         $analysis = $this->analysisFromFixtures(['BadExampleParameter.php']);
         (new Generator())->getProcessorPipeline()->process($analysis);
 
diff --git a/tests/Annotations/AnnotationPropertiesDefinedTest.php b/tests/Annotations/AnnotationPropertiesDefinedTest.php
index 38bc7b91..08e9eca3 100644
--- a/tests/Annotations/AnnotationPropertiesDefinedTest.php
+++ b/tests/Annotations/AnnotationPropertiesDefinedTest.php
@@ -6,7 +6,6 @@
 
 namespace OpenApi\Tests\Annotations;
 
-use function \get_class_vars;
 use OpenApi\Annotations as OA;
 use OpenApi\Tests\OpenApiTestCase;
 
diff --git a/tests/ConstantsTest.php b/tests/ConstantsTest.php
index a6acad28..67a0486b 100644
--- a/tests/ConstantsTest.php
+++ b/tests/ConstantsTest.php
@@ -6,9 +6,6 @@
 
 namespace OpenApi\Tests;
 
-use OpenApi\Analysers\TokenAnalyser;
-use OpenApi\Generator;
-
 class ConstantsTest extends OpenApiTestCase
 {
     public const URL = 'http://example.com';
@@ -51,12 +48,4 @@ public function testAutoloadConstant(): void
         $annotations = $this->annotationsFromDocBlockParser('@OA\Contact(name=AnotherNamespace\Annotations\Constants::INVALID_TIMEZONE_LOCATION)');
         $this->assertSame('invalidTimezoneLocation', $annotations[0]->name);
     }
-
-    public function testDynamicImports(): void
-    {
-        $analyser = new TokenAnalyser();
-        $analyser->setGenerator((new Generator())->setNamespaces(null));
-        $analyser->fromFile($this->fixture('Customer.php'), $this->getContext());
-        $analyser->fromFile($this->fixture('ThirdPartyAnnotations.php'), $this->getContext());
-    }
 }
diff --git a/tests/ContextTest.php b/tests/ContextTest.php
index e2c8d108..b3b8b0f9 100644
--- a/tests/ContextTest.php
+++ b/tests/ContextTest.php
@@ -7,30 +7,17 @@
 namespace OpenApi\Tests;
 
 use OpenApi\Annotations as OA;
-use OpenApi\Analysers\TokenAnalyser;
 use OpenApi\Context;
 use OpenApi\Generator;
 use Psr\Log\NullLogger;
 
 class ContextTest extends OpenApiTestCase
 {
-    public function testDetect(): void
-    {
-        $context = Context::detect();
-        $line = __LINE__ - 1;
-        $this->assertSame('ContextTest', $context->class);
-        $this->assertSame('\\OpenApi\\Tests\\ContextTest', $context->fullyQualifiedName($context->class));
-        $this->assertSame('testDetect', $context->method);
-        $this->assertSame(__FILE__, $context->filename);
-        $this->assertSame($line, $context->line);
-        $this->assertSame('OpenApi\\Tests', $context->namespace);
-    }
-
     public function testFullyQualifiedName(): void
     {
         $this->assertOpenApiLogEntryContains('Required @OA\PathItem() not found');
         $openapi = (new Generator($this->getTrackingLogger()))
-            ->setAnalyser(new TokenAnalyser())
+            ->setAnalyser($this->getAnalyzer())
             ->generate([$this->fixture('Customer.php')]);
         $context = $openapi->components->schemas[0]->_context;
         // resolve with namespace
diff --git a/tests/ExamplesTest.php b/tests/ExamplesTest.php
index a7fea5ed..5899a195 100644
--- a/tests/ExamplesTest.php
+++ b/tests/ExamplesTest.php
@@ -11,7 +11,6 @@
 use OpenApi\Analysers\AttributeAnnotationFactory;
 use OpenApi\Analysers\DocBlockAnnotationFactory;
 use OpenApi\Analysers\ReflectionAnalyser;
-use OpenApi\Analysers\TokenAnalyser;
 use OpenApi\Annotations as OA;
 use OpenApi\Generator;
 use OpenApi\Serializer;
@@ -26,7 +25,7 @@ public static function exampleDetails(): iterable
             'example-object.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'misc' => [
@@ -35,7 +34,7 @@ public static function exampleDetails(): iterable
             'misc.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'nesting' => [
@@ -44,7 +43,7 @@ public static function exampleDetails(): iterable
             'nesting.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'petstore-3.0' => [
@@ -53,7 +52,7 @@ public static function exampleDetails(): iterable
             'petstore-3.0.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'petstore.swagger.io' => [
@@ -62,7 +61,7 @@ public static function exampleDetails(): iterable
             'petstore.swagger.io.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'swagger-spec/petstore' => [
@@ -71,7 +70,7 @@ public static function exampleDetails(): iterable
             'petstore.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'swagger-spec/petstore-simple' => [
@@ -80,7 +79,7 @@ public static function exampleDetails(): iterable
             'petstore-simple.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'swagger-spec/petstore-simple-3.1.0' => [
@@ -89,7 +88,7 @@ public static function exampleDetails(): iterable
             'petstore-simple-3.1.0.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'swagger-spec/petstore-with-external-docs' => [
@@ -98,7 +97,7 @@ public static function exampleDetails(): iterable
             'petstore-with-external-docs.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'polymorphism' => [
@@ -125,7 +124,7 @@ public static function exampleDetails(): iterable
             'using-interfaces.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'using-traits' => [
@@ -134,7 +133,7 @@ public static function exampleDetails(): iterable
             'using-traits.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         yield 'using-links' => [
@@ -143,7 +142,7 @@ public static function exampleDetails(): iterable
             'using-links.yaml',
             'debug' => false,
             'expectedLog' => [],
-            'analysers' => ['token', 'reflection'],
+            'analysers' => ['reflection'],
         ];
 
         if (\PHP_VERSION_ID >= 80100) {
@@ -162,7 +161,7 @@ public static function exampleDetails(): iterable
                 'webhooks.yaml',
                 'debug' => false,
                 'expectedLog' => [],
-                'analysers' => ['token','reflection'],
+                'analysers' => ['reflection'],
             ];
 
             yield 'webhooks81' => [
@@ -188,7 +187,6 @@ public static function exampleDetails(): iterable
     public static function exampleMappings(): iterable
     {
         $analysers = [
-            'token' => new TokenAnalyser(),
             'reflection' => new ReflectionAnalyser([new DocBlockAnnotationFactory(), new AttributeAnnotationFactory()]),
         ];
 
diff --git a/tests/Fixtures/BadExampleParameter.php b/tests/Fixtures/BadExampleParameter.php
index c8a4763b..a176c987 100644
--- a/tests/Fixtures/BadExampleParameter.php
+++ b/tests/Fixtures/BadExampleParameter.php
@@ -15,5 +15,4 @@
 )]
 class BadExampleParameter
 {
-
 }
diff --git a/tests/Fixtures/PHP/AnonymousFunctions.php b/tests/Fixtures/PHP/AnonymousFunctions.php
index c5a8ac86..3b5d2431 100644
--- a/tests/Fixtures/PHP/AnonymousFunctions.php
+++ b/tests/Fixtures/PHP/AnonymousFunctions.php
@@ -22,7 +22,7 @@ public function index($ding)
 
     protected function query()
     {
-        return new class() {
+        return new class () {
             public function leftJoin(string $foo, callable $callback)
             {
                 return $this;
diff --git a/tests/Fixtures/PHP/namespaces3.php b/tests/Fixtures/PHP/namespaces3.php
new file mode 100644
index 00000000..b647b797
--- /dev/null
+++ b/tests/Fixtures/PHP/namespaces3.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+class BarClass
+{
+}
diff --git a/tests/Fixtures/PHP/php7.php b/tests/Fixtures/PHP/php7.php
index 074d1172..8e2eb2d9 100644
--- a/tests/Fixtures/PHP/php7.php
+++ b/tests/Fixtures/PHP/php7.php
@@ -8,49 +8,49 @@
 
 use PHPUnit\Framework\TestCase;
 
-$a = new class {
+$a = new class () {
     public function foo()
     {
     }
 };
 
-$b = new class() {
+$b = new class () {
     public function bar()
     {
     }
 };
 
-$c = new class extends \stdClass {
+$c = new class () extends \stdClass {
     public function baz()
     {
     }
 };
 
-$d = new class() extends \stdClass {
+$d = new class () extends \stdClass {
     public function boz()
     {
     }
 };
 
-new class implements i1 {
+new class () implements i1 {
     public function biz()
     {
     }
 };
 
-new class() implements i1 {
+new class () implements i1 {
     public function buz()
     {
     }
 };
 
-$e = new class() extends \stdClass {
+$e = new class () extends \stdClass {
     public function fuz()
     {
     }
 };
 
-$f = new class() implements i2 {
+$f = new class () implements i2 {
     public function fuu()
     {
     }
diff --git a/tests/Fixtures/Scratch/ExclusiveMinMax.php b/tests/Fixtures/Scratch/ExclusiveMinMax.php
index 1cce4dff..d88c5868 100644
--- a/tests/Fixtures/Scratch/ExclusiveMinMax.php
+++ b/tests/Fixtures/Scratch/ExclusiveMinMax.php
@@ -4,6 +4,8 @@
  * @license Apache 2.0
  */
 
+namespace OpenApi\Tests\Fixtures\Scratch;
+
 use OpenApi\Attributes as OAT;
 
 #[OAT\Schema(schema: 'minMaxClass')]
diff --git a/tests/Fixtures/Scratch/ExclusiveMinMax3.0.0.yaml b/tests/Fixtures/Scratch/ExclusiveMinMax3.0.0.yaml
index 0c3e258d..adbe4b0a 100644
--- a/tests/Fixtures/Scratch/ExclusiveMinMax3.0.0.yaml
+++ b/tests/Fixtures/Scratch/ExclusiveMinMax3.0.0.yaml
@@ -6,7 +6,7 @@ paths:
   /api/endpoint:
     get:
       description: 'An endpoint'
-      operationId: ef57acec977120506db6b2cf1c500c15
+      operationId: 196df2e45989ede264698d505424af54
       responses:
         '200':
           description: OK
diff --git a/tests/Fixtures/Scratch/ExclusiveMinMax3.1.0.yaml b/tests/Fixtures/Scratch/ExclusiveMinMax3.1.0.yaml
index fc27050b..c9c61d8a 100644
--- a/tests/Fixtures/Scratch/ExclusiveMinMax3.1.0.yaml
+++ b/tests/Fixtures/Scratch/ExclusiveMinMax3.1.0.yaml
@@ -6,7 +6,7 @@ paths:
   /api/endpoint:
     get:
       description: 'An endpoint'
-      operationId: ef57acec977120506db6b2cf1c500c15
+      operationId: 196df2e45989ede264698d505424af54
       responses:
         '200':
           description: OK
diff --git a/tests/Fixtures/Scratch/NullRef.php b/tests/Fixtures/Scratch/NullRef.php
index b7435318..55b5ab54 100644
--- a/tests/Fixtures/Scratch/NullRef.php
+++ b/tests/Fixtures/Scratch/NullRef.php
@@ -4,6 +4,8 @@
  * @license Apache 2.0
  */
 
+namespace OpenApi\Tests\Fixtures\Scratch;
+
 use OpenApi\Attributes as OAT;
 
 #[OAT\Schema(schema: 'repository')]
diff --git a/tests/Fixtures/Scratch/ParameterContent.php b/tests/Fixtures/Scratch/ParameterContent.php
index 2d388934..82914363 100644
--- a/tests/Fixtures/Scratch/ParameterContent.php
+++ b/tests/Fixtures/Scratch/ParameterContent.php
@@ -4,6 +4,8 @@
  * @license Apache 2.0
  */
 
+namespace OpenApi\Tests\Fixtures\Scratch;
+
 use OpenApi\Attributes as OAT;
 
 /**
diff --git a/tests/Fixtures/Scratch/ThirdPartyAnnotation.php b/tests/Fixtures/Scratch/ThirdPartyAnnotation.php
index 300cca53..5282ac9f 100644
--- a/tests/Fixtures/Scratch/ThirdPartyAnnotation.php
+++ b/tests/Fixtures/Scratch/ThirdPartyAnnotation.php
@@ -1,6 +1,10 @@
 <?php declare(strict_types=1);
 
-// intentionally none: namespace OpenApi\Tests\Fixtures\Scratch;
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Tests\Fixtures\Scratch;
 
 use OpenApi\Annotations as OA;
 
diff --git a/tests/Fixtures/Scratch/ThirdPartyAnnotation3.0.0.yaml b/tests/Fixtures/Scratch/ThirdPartyAnnotation3.0.0.yaml
index 5abdd6a3..dbc026ce 100644
--- a/tests/Fixtures/Scratch/ThirdPartyAnnotation3.0.0.yaml
+++ b/tests/Fixtures/Scratch/ThirdPartyAnnotation3.0.0.yaml
@@ -5,7 +5,7 @@ info:
 paths:
   /api/endpoint:
     get:
-      operationId: d5f395c872bfd6677e6c30c55c7d5463
+      operationId: 4d13477a1abdf05116ad243f8d869c0a
       responses:
         '200':
           description: 'successful operation'
diff --git a/tests/Fixtures/Scratch/ThirdPartyAnnotation3.1.0.yaml b/tests/Fixtures/Scratch/ThirdPartyAnnotation3.1.0.yaml
index 496ebf3e..64bec9cb 100644
--- a/tests/Fixtures/Scratch/ThirdPartyAnnotation3.1.0.yaml
+++ b/tests/Fixtures/Scratch/ThirdPartyAnnotation3.1.0.yaml
@@ -5,7 +5,7 @@ info:
 paths:
   /api/endpoint:
     get:
-      operationId: d5f395c872bfd6677e6c30c55c7d5463
+      operationId: 4d13477a1abdf05116ad243f8d869c0a
       responses:
         '200':
           description: 'successful operation'
diff --git a/tests/GeneratorTest.php b/tests/GeneratorTest.php
index 9c70a3b0..7c458370 100644
--- a/tests/GeneratorTest.php
+++ b/tests/GeneratorTest.php
@@ -6,7 +6,6 @@
 
 namespace OpenApi\Tests;
 
-use OpenApi\Analysis;
 use OpenApi\Generator;
 use OpenApi\Processors\OperationId;
 use OpenApi\Util;
@@ -64,35 +63,11 @@ public static function processorCases(): iterable
     {
         return [
             [new OperationId(), true],
-            [new class(false) extends OperationId {
+            [new class (false) extends OperationId {
             }, false],
         ];
     }
 
-    /**
-     * @dataProvider processorCases
-     */
-    public function testUpdateProcessor($p, bool $expected): void
-    {
-        $generator = (new Generator())
-            ->updateProcessor($p);
-        foreach ($generator->getProcessors() as $processor) {
-            if ($processor instanceof OperationId) {
-                $this->assertEquals($expected, $processor->isHash());
-            }
-        }
-    }
-
-    public function testAddProcessor(): void
-    {
-        $generator = new Generator();
-        $processors = $generator->getProcessors();
-        $generator->addProcessor(function (Analysis $analysis) {
-        });
-
-        $this->assertLessThan(count($generator->getProcessors()), count($processors));
-    }
-
     public function testAddAlias(): void
     {
         $generator = new Generator();
@@ -109,18 +84,6 @@ public function testAddNamespace(): void
         $this->assertEquals(['OpenApi\\Annotations\\', 'Foo\\Bar\\'], $generator->getNamespaces());
     }
 
-    public function testRemoveProcessor(): void
-    {
-        $generator = new Generator();
-        $processors = $generator->getProcessors();
-        $processor = function (Analysis $analysis): void {
-        };
-        $generator->addProcessor($processor);
-        $generator->removeProcessor($processor);
-
-        $this->assertEquals($processors, $generator->getProcessors());
-    }
-
     protected function assertOperationIdHash(Generator $generator, bool $expected): void
     {
         $generator->getProcessorPipeline()->walk(function ($processor) use ($expected) {
@@ -151,17 +114,4 @@ public function testConfig(array $config, bool $expected): void
         $generator->setConfig($config);
         $this->assertOperationIdHash($generator, $expected);
     }
-
-    public function testCallableProcessor(): void
-    {
-        $generator = new Generator();
-        // not the default
-        $operationId = new OperationId(false);
-        $generator->addProcessor(function (Analysis $analysis) use ($operationId) {
-            $operationId($analysis);
-        });
-
-        $this->assertOperationIdHash($generator, true);
-        $this->assertFalse($operationId->isHash());
-    }
 }
diff --git a/tests/OpenApiTestCase.php b/tests/OpenApiTestCase.php
index 9980ba0a..30f08b1c 100644
--- a/tests/OpenApiTestCase.php
+++ b/tests/OpenApiTestCase.php
@@ -14,7 +14,6 @@
 use OpenApi\Analysis;
 use OpenApi\Annotations as OA;
 use OpenApi\Context;
-use OpenApi\Analysers\TokenAnalyser;
 use OpenApi\Generator;
 use OpenApi\Pipeline;
 use PHPUnit\Framework\TestCase;
@@ -55,7 +54,7 @@ protected function tearDown(): void
 
     public function getTrackingLogger(bool $debug = false): ?LoggerInterface
     {
-        return new class($this, $debug) extends AbstractLogger {
+        return new class ($this, $debug) extends AbstractLogger {
             /** @var OpenApiTestCase */
             protected $testCase;
 
@@ -85,13 +84,6 @@ public function log($level, $message, array $context = []): void
         };
     }
 
-    public function skipLegacy(): void
-    {
-        if ($this->getAnalyzer() instanceof TokenAnalyser) {
-            $this->markTestSkipped();
-        }
-    }
-
     public function getContext(array $properties = [], ?string $version = OA\OpenApi::DEFAULT_VERSION): Context
     {
         return new Context(
@@ -104,11 +96,7 @@ public function getContext(array $properties = [], ?string $version = OA\OpenApi
 
     public function getAnalyzer(): AnalyserInterface
     {
-        $legacyAnalyser = getenv('PHPUNIT_ANALYSER') === 'legacy';
-
-        return $legacyAnalyser
-            ? new TokenAnalyser()
-            : new ReflectionAnalyser([new DocBlockAnnotationFactory(), new AttributeAnnotationFactory()]);
+        return new ReflectionAnalyser([new DocBlockAnnotationFactory(), new AttributeAnnotationFactory()]);
     }
 
     public function assertOpenApiLogEntryContains(string $needle, string $message = ''): void
diff --git a/tests/PipelineTest.php b/tests/PipelineTest.php
index 76ca929d..4cc01a5a 100644
--- a/tests/PipelineTest.php
+++ b/tests/PipelineTest.php
@@ -17,7 +17,7 @@ public function __invoke($payload)
 
     protected function pipe(string $add)
     {
-        return new class($add) {
+        return new class ($add) {
             protected $add;
 
             public function __construct(string $add)
@@ -25,8 +25,6 @@ public function __construct(string $add)
                 $this->add = $add;
             }
 
-            // ------------------------------------------------------------------------
-
             public function __invoke($payload)
             {
                 return $payload . $this->add;
diff --git a/tests/Processors/AugmentTagsTest.php b/tests/Processors/AugmentTagsTest.php
index 2d049efe..43c90bfb 100644
--- a/tests/Processors/AugmentTagsTest.php
+++ b/tests/Processors/AugmentTagsTest.php
@@ -15,8 +15,6 @@ class AugmentTagsTest extends OpenApiTestCase
      */
     public function testFilteredAugmentTags(): void
     {
-        $this->skipLegacy();
-
         $config = [
             'pathFilter' => ['paths' => ['#^/hello/#']],
             'cleanUnusedComponents' => ['enabled' => true],
@@ -31,8 +29,6 @@ public function testFilteredAugmentTags(): void
      */
     public function testDedupedAugmentTags(): void
     {
-        $this->skipLegacy();
-
         $analysis = $this->analysisFromFixtures(['SurplusTag.php'], static::processors());
 
         $this->assertCount(3, $analysis->openapi->tags, 'Expecting 3 unique tags');
@@ -43,8 +39,6 @@ public function testDedupedAugmentTags(): void
      */
     public function testAllowUnusedTags(): void
     {
-        $this->skipLegacy();
-
         $analysis = $this->analysisFromFixtures(
             ['UnusedTags.php'],
             static::processors(),
@@ -62,8 +56,6 @@ public function testAllowUnusedTags(): void
      */
     public function testAllowUnusedTagsWildcard(): void
     {
-        $this->skipLegacy();
-
         $analysis = $this->analysisFromFixtures(
             ['UnusedTags.php'],
             static::processors(),
diff --git a/tests/Processors/ExpandEnumsTest.php b/tests/Processors/ExpandEnumsTest.php
index da946cac..0af7ccae 100644
--- a/tests/Processors/ExpandEnumsTest.php
+++ b/tests/Processors/ExpandEnumsTest.php
@@ -21,13 +21,6 @@
  */
 class ExpandEnumsTest extends OpenApiTestCase
 {
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->skipLegacy();
-    }
-
     public function testExpandUnitEnum(): void
     {
         $analysis = $this->analysisFromFixtures(['PHP/Enums/StatusEnum.php']);
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index bf4c9529..f739db05 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -6,40 +6,12 @@
 
 namespace OpenApi\Tests;
 
-use OpenApi\Analysers\TokenAnalyser;
 use OpenApi\Annotations as OA;
-use OpenApi\Generator;
 use OpenApi\Util;
 use Symfony\Component\Finder\Finder;
 
 class UtilTest extends OpenApiTestCase
 {
-    public function testExclude(): void
-    {
-        $exclude = [
-            'Customer.php',
-            'CustomerInterface.php',
-            'GrandAncestor.php',
-            'InheritProperties',
-            'Apis',
-            'PHP',
-            'Parser',
-            'Analysers',
-            'Processors',
-            'Scratch',
-            'TypedProperties.php',
-            'Unreferenced.php',
-            'UsingRefs.php',
-            'UsingPhpDoc.php',
-            'UsingCustomAttachables',
-            'DuplicateOperationId',
-        ];
-        $openapi = (new Generator())
-            ->setAnalyser(new TokenAnalyser())
-            ->generate(Util::finder($this->fixture(''), $exclude));
-        $this->assertSame('Fixture for ParserTest', $openapi->info->title, 'No errors about duplicate @OA\Info() annotations');
-    }
-
     public function testRefEncode(): void
     {
         $this->assertSame('#/paths/~1blogs~1{blog_id}~1new~0posts', '#/paths/' . Util::refEncode('/blogs/{blog_id}/new~posts'));
diff --git a/tools/src/Docs/RefGenerator.php b/tools/src/Docs/RefGenerator.php
index 0d8bca8d..d9fd94ab 100644
--- a/tools/src/Docs/RefGenerator.php
+++ b/tools/src/Docs/RefGenerator.php
@@ -159,8 +159,6 @@ public function formatAnnotationsDetails(string $name, string $fqdn, string $fil
         return ob_get_clean();
     }
 
-    // ------------------------------------------------------------------------
-
     protected function getPropertyDocumentation(string $fqdn, string $name): array
     {
         /** @var class-string<AbstractAnnotation> $class */