From 22cd00a7ee5657d843d4d23a321c7f3d1b3734b7 Mon Sep 17 00:00:00 2001
From: Martin Rademacher <mano@radebatz.net>
Date: Fri, 2 Sep 2022 16:09:01 +1200
Subject: [PATCH] Tweak CS rules around global imports and enforce (#1305)

---
 .github/workflows/security-checks.yml            |  2 +-
 .php-cs-fixer.dist.php                           | 16 +++++++++++++---
 Examples/misc/OpenApiSpec.php                    |  9 ++++++---
 Examples/nesting/ActualModel.php                 |  6 ++++++
 Examples/nesting/AlmostModel.php                 |  6 ++++++
 Examples/nesting/ApiController.php               |  6 ++++++
 Examples/nesting/BaseModel.php                   |  6 ++++++
 Examples/nesting/IntermediateModel.php           |  6 ++++++
 Examples/nesting/SoCloseModel.php                |  6 ++++++
 Examples/petstore-3.0/Controllers/Pet.php        |  2 ++
 Examples/petstore-3.0/Controllers/Store.php      |  2 ++
 Examples/petstore-3.0/Controllers/User.php       |  2 ++
 Examples/petstore-3.0/Models/ApiResponse.php     |  2 ++
 Examples/petstore-3.0/Petstore.php               |  2 ++
 Examples/petstore-3.0/Security.php               |  2 ++
 .../Controllers/PetController.php                |  2 ++
 .../Controllers/StoreController.php              |  2 ++
 .../Controllers/UserController.php               |  2 ++
 Examples/petstore.swagger.io/Models/Order.php    |  2 ++
 Examples/petstore.swagger.io/Models/Pet.php      |  4 ++++
 Examples/petstore.swagger.io/Models/User.php     |  4 ++++
 Examples/petstore.swagger.io/OpenApiSpec.php     |  2 ++
 Examples/petstore.swagger.io/OpenApiTags.php     |  2 ++
 Examples/petstore.swagger.io/PetstoreAuth.php    |  2 ++
 .../schema-query-parameter/app/Product.php       |  2 ++
 .../swagger-spec/petstore-simple/OpenApiSpec.php |  2 ++
 .../swagger-spec/petstore-simple/SimplePet.php   |  3 +++
 .../petstore-simple/SimplePetsController.php     |  2 ++
 .../Controllers/PetWithDocsController.php        |  2 ++
 .../Models/ErrorModel.php                        |  2 ++
 .../petstore-with-external-docs/Models/Pet.php   |  2 ++
 .../petstore-with-external-docs/OpenApiSpec.php  |  2 ++
 Examples/swagger-spec/petstore/OpenApiSpec.php   |  2 ++
 .../swagger-spec/petstore/PetsController.php     |  2 ++
 Examples/using-interfaces/ColorInterface.php     |  2 ++
 Examples/using-interfaces/GreenProduct.php       |  2 ++
 Examples/using-interfaces/OpenApiSpec.php        |  2 ++
 Examples/using-interfaces/Product.php            |  1 +
 Examples/using-interfaces/ProductController.php  |  2 ++
 Examples/using-interfaces/ProductInterface.php   |  2 ++
 Examples/using-refs/Model.php                    |  2 ++
 Examples/using-refs/OpenApiSpec.php              |  2 ++
 Examples/using-refs/Product.php                  |  3 +++
 Examples/using-refs/ProductController.php        |  2 ++
 Examples/using-refs/PropertyRefController.php    |  2 ++
 Examples/using-refs/StockLevel.php               |  2 ++
 Examples/using-traits/BellsAndWhistles.php       |  1 +
 Examples/using-traits/Decoration/Whistles.php    |  2 ++
 Examples/using-traits/DeleteEntity.php           |  2 ++
 Examples/using-traits/OpenApiSpec.php            |  2 ++
 Examples/using-traits/Product.php                |  3 +++
 Examples/using-traits/SimpleProduct.php          |  3 +++
 Examples/using-traits/TrickyProduct.php          |  1 +
 src/Util.php                                     |  7 +++----
 .../Analysers/AttributeAnnotationFactoryTest.php |  4 ++++
 tests/Analysers/ReflectionAnalyserTest.php       |  3 +++
 tests/Analysers/TokenScannerTest.php             |  1 +
 tests/Annotations/AttributesSyncTest.php         |  4 ++++
 tests/Annotations/ComponentsTest.php             |  4 ++++
 tests/Fixtures/Annotations/CustomAttachable.php  |  4 ++++
 .../AnotherNamespace/Annotations/Constants.php   |  2 +-
 .../AnotherNamespace/Annotations/Unrelated.php   |  2 +-
 tests/Fixtures/AnotherNamespace/Child.php        |  1 +
 .../AnotherNamespace/ChildWithDocBlocks.php      |  1 +
 tests/Fixtures/Apis/DocBlocks/basic.php          |  1 -
 tests/Fixtures/Attributes/CustomAttachable.php   |  4 ++++
 tests/Fixtures/CustomerInterface.php             |  5 +++++
 tests/Fixtures/ExpandClasses/Base.php            |  2 +-
 tests/Fixtures/ExpandClasses/BaseInterface.php   |  4 +++-
 .../ExpandClasses/BaseThatImplements.php         |  2 +-
 tests/Fixtures/ExpandClasses/Extended.php        |  2 +-
 .../ExpandClasses/ExtendedWithTwoSchemas.php     |  2 +-
 .../ExpandClasses/ExtendedWithoutAllOf.php       |  2 +-
 .../ExpandClasses/ExtendsBaseThatImplements.php  |  4 +++-
 .../TraitUsedByExtendsBaseThatImplements.php     |  4 +++-
 tests/Fixtures/NestedProperty.php                |  1 +
 .../PHP/Inheritance/ExtenedsBaseInterface.php    |  4 ++++
 tests/Fixtures/PHP/Php8PromotedProperties.php    |  2 ++
 tests/Fixtures/PHP/StatusEnumBacked.php          |  4 ++++
 tests/Fixtures/PHP/StatusEnumIntegerBacked.php   |  4 ++++
 tests/Fixtures/PHP/StatusEnumStringBacked.php    |  4 ++++
 tests/Fixtures/PHP/namespaces1.php               |  6 +++++-
 tests/Fixtures/PHP/namespaces2.php               |  6 +++++-
 tests/Fixtures/Parser/AllTraits.php              |  4 ++++
 tests/Fixtures/Parser/UserInterface.php          |  1 +
 .../Processors/EntityControllerClass.php         |  2 ++
 tests/Fixtures/ThirdPartyAnnotations.php         |  1 +
 tests/Fixtures/TypedProperties.php               | 10 ++++++++--
 tests/Fixtures/UsingAttributes.php               |  4 ++++
 tests/Fixtures/UsingCustomAttachables.php        |  6 ++++--
 tests/Fixtures/UsingPhpDoc.php                   |  2 ++
 tests/Fixtures/UsingRefs.php                     |  2 ++
 tests/Fixtures/UsingVar.php                      |  4 ++++
 tests/OpenApiTestCase.php                        |  8 +++-----
 tests/Processors/CleanUnusedComponentsTest.php   |  4 ++++
 95 files changed, 267 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/security-checks.yml b/.github/workflows/security-checks.yml
index 50b0911e7..101f3ff7c 100644
--- a/.github/workflows/security-checks.yml
+++ b/.github/workflows/security-checks.yml
@@ -41,4 +41,4 @@ jobs:
           path: ~/.symfony/cache
           key: security-checker-db
 
-      - uses: symfonycorp/security-checker-action@v2
+      - uses: symfonycorp/security-checker-action@v3
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 4c024e3e0..c0e44d558 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use OpenApi\Tools\CSFixer\ScopedLicenseFixer;
 use OpenApi\Tools\CSFixer\ScopedDeclareStrictTypesFixer;
@@ -6,15 +6,23 @@
 $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');
+        })
     ->path('Examples')->name('*.php')
+        ->filter(function (\SplFileInfo $file) {
+            return !strpos($file->getPathname(), 'Examples/petstore-3.0/Petstore.php')
+                && !strpos($file->getPathname(), 'Examples/misc/OpenApiSpec.php');
+        })
     ->path('tools')->name('*.php')
     ->in(__DIR__)
 ;
 
 return (new PhpCsFixer\Config())
     ->registerCustomFixers([
-        (new ScopedLicenseFixer())->scope(['/src/']),
-        (new ScopedDeclareStrictTypesFixer())->scope(['/src/']),
+        (new ScopedLicenseFixer())->scope(['/src/', '/tests/']), //, '/Examples/']),
+        (new ScopedDeclareStrictTypesFixer())->scope(['/src/', '/tests/']),
     ])
     ->setRules([
         '@PSR2' => true,
@@ -52,6 +60,8 @@
         'trim_array_spaces' => true,
         'single_space_after_construct' => true,
         'single_line_comment_spacing' => true,
+        'fully_qualified_strict_types' => true,
+        'global_namespace_import' => ['import_classes' => false, 'import_constants' => null, 'import_functions' => null],
 
         'no_empty_phpdoc' => true,
         // 7.3 only 'no_superfluous_phpdoc_tags' => true,
diff --git a/Examples/misc/OpenApiSpec.php b/Examples/misc/OpenApiSpec.php
index 00a386582..6397e7297 100644
--- a/Examples/misc/OpenApiSpec.php
+++ b/Examples/misc/OpenApiSpec.php
@@ -1,7 +1,13 @@
 <?php
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Examples\Misc;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\OpenApi(
  *     security={{"bearerAuth": {}}},
@@ -9,7 +15,6 @@
  *         name="endpoints"
  *     )
  * )
- *
  * @OA\Info(
  *     title="Testing annotations from bugreports",
  *     version="1.0.0",
@@ -17,7 +22,6 @@
 This sentence is on a new line",
  *     @OA\Contact(name="Swagger API Team")
  * )
- *
  * @OA\Components(
  *     @OA\SecurityScheme(
  *         securityScheme="bearerAuth",
@@ -26,7 +30,6 @@
  *     ),
  *     @OA\Attachable
  * )
- *
  * @OA\Server(
  *     url="{schema}://host.dev",
  *     description="OpenApi parameters",
diff --git a/Examples/nesting/ActualModel.php b/Examples/nesting/ActualModel.php
index 9fca52d81..fabe6aaf2 100644
--- a/Examples/nesting/ActualModel.php
+++ b/Examples/nesting/ActualModel.php
@@ -1,7 +1,13 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Examples\Nesting;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/Examples/nesting/AlmostModel.php b/Examples/nesting/AlmostModel.php
index d47497b05..86187a8e7 100644
--- a/Examples/nesting/AlmostModel.php
+++ b/Examples/nesting/AlmostModel.php
@@ -1,7 +1,13 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Examples\Nesting;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/Examples/nesting/ApiController.php b/Examples/nesting/ApiController.php
index 02f3fe4e0..2b012c9df 100644
--- a/Examples/nesting/ApiController.php
+++ b/Examples/nesting/ApiController.php
@@ -1,7 +1,13 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Examples\Nesting;
 
+use OpenApi\Annotations as OA;
+
 /**
  * An entity controller class.
  *
diff --git a/Examples/nesting/BaseModel.php b/Examples/nesting/BaseModel.php
index c828b6a7e..8170bb6f0 100644
--- a/Examples/nesting/BaseModel.php
+++ b/Examples/nesting/BaseModel.php
@@ -1,7 +1,13 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Examples\Nesting;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/Examples/nesting/IntermediateModel.php b/Examples/nesting/IntermediateModel.php
index 1bddd22ab..5fd37b1c0 100644
--- a/Examples/nesting/IntermediateModel.php
+++ b/Examples/nesting/IntermediateModel.php
@@ -1,7 +1,13 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Examples\Nesting;
 
+use OpenApi\Annotations as OA;
+
 /**
  * No schema!
  */
diff --git a/Examples/nesting/SoCloseModel.php b/Examples/nesting/SoCloseModel.php
index 5e8bb456d..5181515b7 100644
--- a/Examples/nesting/SoCloseModel.php
+++ b/Examples/nesting/SoCloseModel.php
@@ -1,7 +1,13 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Examples\Nesting;
 
+use OpenApi\Annotations as OA;
+
 /**
  * No schema!
  */
diff --git a/Examples/petstore-3.0/Controllers/Pet.php b/Examples/petstore-3.0/Controllers/Pet.php
index b8da5fae7..172e59ea3 100644
--- a/Examples/petstore-3.0/Controllers/Pet.php
+++ b/Examples/petstore-3.0/Controllers/Pet.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Examples\Petstore30\Controllers;
 
+use OpenApi\Annotations as OA;
+
 /**
  * Class Pet.
  *
diff --git a/Examples/petstore-3.0/Controllers/Store.php b/Examples/petstore-3.0/Controllers/Store.php
index 937ab74aa..67a996890 100644
--- a/Examples/petstore-3.0/Controllers/Store.php
+++ b/Examples/petstore-3.0/Controllers/Store.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Examples\Petstore30\Controllers;
 
+use OpenApi\Annotations as OA;
+
 /**
  * Class Store.
  *
diff --git a/Examples/petstore-3.0/Controllers/User.php b/Examples/petstore-3.0/Controllers/User.php
index 52596be4d..d21d5c3f4 100644
--- a/Examples/petstore-3.0/Controllers/User.php
+++ b/Examples/petstore-3.0/Controllers/User.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Examples\Petstore30\Controllers;
 
+use OpenApi\Annotations as OA;
+
 /**
  * Class User.
  *
diff --git a/Examples/petstore-3.0/Models/ApiResponse.php b/Examples/petstore-3.0/Models/ApiResponse.php
index 29c81725b..6496da495 100644
--- a/Examples/petstore-3.0/Models/ApiResponse.php
+++ b/Examples/petstore-3.0/Models/ApiResponse.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Examples\Petstore30\Models;
 
+use OpenApi\Annotations as OA;
+
 /**
  * Class ApiResponse.
  *
diff --git a/Examples/petstore-3.0/Petstore.php b/Examples/petstore-3.0/Petstore.php
index 1b753f501..aefa2d5cb 100644
--- a/Examples/petstore-3.0/Petstore.php
+++ b/Examples/petstore-3.0/Petstore.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Examples\Petstore30;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Info(
  *     description="This is a sample Petstore server.  You can find
diff --git a/Examples/petstore-3.0/Security.php b/Examples/petstore-3.0/Security.php
index cba45cef6..b3229c53e 100644
--- a/Examples/petstore-3.0/Security.php
+++ b/Examples/petstore-3.0/Security.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Examples\Petstore30;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\SecurityScheme(
  *     type="oauth2",
diff --git a/Examples/petstore.swagger.io/Controllers/PetController.php b/Examples/petstore.swagger.io/Controllers/PetController.php
index b69d28abf..5919f0bc0 100644
--- a/Examples/petstore.swagger.io/Controllers/PetController.php
+++ b/Examples/petstore.swagger.io/Controllers/PetController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\PetstoreSwaggerIo\Controllers;
 
+use OpenApi\Annotations as OA;
+
 final class PetController
 {
     /**
diff --git a/Examples/petstore.swagger.io/Controllers/StoreController.php b/Examples/petstore.swagger.io/Controllers/StoreController.php
index 47a0f1fd5..be1b6b341 100644
--- a/Examples/petstore.swagger.io/Controllers/StoreController.php
+++ b/Examples/petstore.swagger.io/Controllers/StoreController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\PetstoreSwaggerIo\Controllers;
 
+use OpenApi\Annotations as OA;
+
 abstract class StoreController
 {
     /**
diff --git a/Examples/petstore.swagger.io/Controllers/UserController.php b/Examples/petstore.swagger.io/Controllers/UserController.php
index caf7e92c2..ee667d855 100644
--- a/Examples/petstore.swagger.io/Controllers/UserController.php
+++ b/Examples/petstore.swagger.io/Controllers/UserController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\PetstoreSwaggerIo\Controllers;
 
+use OpenApi\Annotations as OA;
+
 class UserController
 {
     /**
diff --git a/Examples/petstore.swagger.io/Models/Order.php b/Examples/petstore.swagger.io/Models/Order.php
index 908596b0d..5f1154ff5 100644
--- a/Examples/petstore.swagger.io/Models/Order.php
+++ b/Examples/petstore.swagger.io/Models/Order.php
@@ -39,6 +39,7 @@ class Order
 
     /**
      * @var \DateTime
+     *
      * @OA\Property
      */
     public $shipDate;
@@ -47,6 +48,7 @@ class Order
      * Order Status.
      *
      * @var string
+     *
      * @OA\Property(enum={"placed", "approved", "delivered"})
      */
     public $status;
diff --git a/Examples/petstore.swagger.io/Models/Pet.php b/Examples/petstore.swagger.io/Models/Pet.php
index 56eced344..fd444cc50 100644
--- a/Examples/petstore.swagger.io/Models/Pet.php
+++ b/Examples/petstore.swagger.io/Models/Pet.php
@@ -25,18 +25,21 @@ class Pet
 
     /**
      * @var Category
+     *
      * @OA\Property
      */
     public $category;
 
     /**
      * @var string[]
+     *
      * @OA\Property(@OA\Xml(name="photoUrl", wrapped=true))
      */
     public $photoUrls;
 
     /**
      * @var Tag[]
+     *
      * @OA\Property(@OA\Xml(name="tag", wrapped=true))
      */
     public $tags;
@@ -45,6 +48,7 @@ class Pet
      * pet status in the store.
      *
      * @var string
+     *
      * @OA\Property(enum={"available", "pending", "sold"})
      */
     public $status;
diff --git a/Examples/petstore.swagger.io/Models/User.php b/Examples/petstore.swagger.io/Models/User.php
index b7f6533e0..fa3c13ec9 100644
--- a/Examples/petstore.swagger.io/Models/User.php
+++ b/Examples/petstore.swagger.io/Models/User.php
@@ -39,18 +39,21 @@ class User
 
     /**
      * @var string
+     *
      * @OA\Property
      */
     public $email;
 
     /**
      * @var string
+     *
      * @OA\Property
      */
     public $password;
 
     /**
      * @var string
+     *
      * @OA\Property
      */
     public $phone;
@@ -59,6 +62,7 @@ class User
      * User Status.
      *
      * @var int
+     *
      * @OA\Property(format="int32")
      */
     public $userStatus;
diff --git a/Examples/petstore.swagger.io/OpenApiSpec.php b/Examples/petstore.swagger.io/OpenApiSpec.php
index 5574bb8a7..65e8664d2 100644
--- a/Examples/petstore.swagger.io/OpenApiSpec.php
+++ b/Examples/petstore.swagger.io/OpenApiSpec.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\PetstoreSwaggerIo;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\OpenApi(
  *     @OA\Info(
diff --git a/Examples/petstore.swagger.io/OpenApiTags.php b/Examples/petstore.swagger.io/OpenApiTags.php
index d93275882..0dc5322fa 100644
--- a/Examples/petstore.swagger.io/OpenApiTags.php
+++ b/Examples/petstore.swagger.io/OpenApiTags.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\PetstoreSwaggerIo;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Tag(
  *     name="pet",
diff --git a/Examples/petstore.swagger.io/PetstoreAuth.php b/Examples/petstore.swagger.io/PetstoreAuth.php
index 11759f1d4..02da87802 100644
--- a/Examples/petstore.swagger.io/PetstoreAuth.php
+++ b/Examples/petstore.swagger.io/PetstoreAuth.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\PetstoreSwaggerIo;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\SecurityScheme(
  *     securityScheme="api_key",
diff --git a/Examples/processors/schema-query-parameter/app/Product.php b/Examples/processors/schema-query-parameter/app/Product.php
index 85158e297..b250bfe4d 100644
--- a/Examples/processors/schema-query-parameter/app/Product.php
+++ b/Examples/processors/schema-query-parameter/app/Product.php
@@ -16,12 +16,14 @@ class Product
      * The unique identifier of a product in our catalog.
      *
      * @var int
+     *
      * @OA\Property(format="int64", example=1)
      */
     public $id;
 
     /**
      * @var string
+     *
      * @OA\Property(format="int64", example=1)
      */
     public $name;
diff --git a/Examples/swagger-spec/petstore-simple/OpenApiSpec.php b/Examples/swagger-spec/petstore-simple/OpenApiSpec.php
index 8fa6f9bcd..e4a39e686 100644
--- a/Examples/swagger-spec/petstore-simple/OpenApiSpec.php
+++ b/Examples/swagger-spec/petstore-simple/OpenApiSpec.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\PetstoreSimple;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\OpenApi(
  *     @OA\Server(
diff --git a/Examples/swagger-spec/petstore-simple/SimplePet.php b/Examples/swagger-spec/petstore-simple/SimplePet.php
index c5b3195e6..30cb45e28 100644
--- a/Examples/swagger-spec/petstore-simple/SimplePet.php
+++ b/Examples/swagger-spec/petstore-simple/SimplePet.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\PetstoreSimple;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(schema="NewPet", required={"name"})
  */
@@ -18,6 +20,7 @@ class SimplePet
 
     /**
      * @var string
+     *
      * @OA\Property
      */
     public $tag;
diff --git a/Examples/swagger-spec/petstore-simple/SimplePetsController.php b/Examples/swagger-spec/petstore-simple/SimplePetsController.php
index 2e0e6f5ff..725984f32 100644
--- a/Examples/swagger-spec/petstore-simple/SimplePetsController.php
+++ b/Examples/swagger-spec/petstore-simple/SimplePetsController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\PetstoreSimple;
 
+use OpenApi\Annotations as OA;
+
 class SimplePetsController
 {
     /**
diff --git a/Examples/swagger-spec/petstore-with-external-docs/Controllers/PetWithDocsController.php b/Examples/swagger-spec/petstore-with-external-docs/Controllers/PetWithDocsController.php
index 05f775f3e..26c985e19 100644
--- a/Examples/swagger-spec/petstore-with-external-docs/Controllers/PetWithDocsController.php
+++ b/Examples/swagger-spec/petstore-with-external-docs/Controllers/PetWithDocsController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\PetstoreWithExternalDocs\Controllers;
 
+use OpenApi\Annotations as OA;
+
 class PetWithDocsController
 {
     /**
diff --git a/Examples/swagger-spec/petstore-with-external-docs/Models/ErrorModel.php b/Examples/swagger-spec/petstore-with-external-docs/Models/ErrorModel.php
index 20a4b19cc..735cc861e 100644
--- a/Examples/swagger-spec/petstore-with-external-docs/Models/ErrorModel.php
+++ b/Examples/swagger-spec/petstore-with-external-docs/Models/ErrorModel.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\PetstoreWithExternalDocs\Models;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(required={"code", "message"})
  */
diff --git a/Examples/swagger-spec/petstore-with-external-docs/Models/Pet.php b/Examples/swagger-spec/petstore-with-external-docs/Models/Pet.php
index ef9b5fce6..6fa95f20c 100644
--- a/Examples/swagger-spec/petstore-with-external-docs/Models/Pet.php
+++ b/Examples/swagger-spec/petstore-with-external-docs/Models/Pet.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\PetstoreWithExternalDocs\Models;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(
  *     schema="Pet",
diff --git a/Examples/swagger-spec/petstore-with-external-docs/OpenApiSpec.php b/Examples/swagger-spec/petstore-with-external-docs/OpenApiSpec.php
index 7cedba6a3..398895bd8 100644
--- a/Examples/swagger-spec/petstore-with-external-docs/OpenApiSpec.php
+++ b/Examples/swagger-spec/petstore-with-external-docs/OpenApiSpec.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\PetstoreWithExternalDocs;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Info(
  *     title="Swagger Petstore",
diff --git a/Examples/swagger-spec/petstore/OpenApiSpec.php b/Examples/swagger-spec/petstore/OpenApiSpec.php
index a597ac32a..29419ca63 100644
--- a/Examples/swagger-spec/petstore/OpenApiSpec.php
+++ b/Examples/swagger-spec/petstore/OpenApiSpec.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\Petstore;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\OpenApi(
  *     @OA\Info(
diff --git a/Examples/swagger-spec/petstore/PetsController.php b/Examples/swagger-spec/petstore/PetsController.php
index 9dbc4cbef..84c5ecd96 100644
--- a/Examples/swagger-spec/petstore/PetsController.php
+++ b/Examples/swagger-spec/petstore/PetsController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\SwaggerSpec\Petstore;
 
+use OpenApi\Annotations as OA;
+
 class PetsController
 {
     /**
diff --git a/Examples/using-interfaces/ColorInterface.php b/Examples/using-interfaces/ColorInterface.php
index 7ec53f941..f1388e317 100644
--- a/Examples/using-interfaces/ColorInterface.php
+++ b/Examples/using-interfaces/ColorInterface.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingInterfaces;
 
+use OpenApi\Annotations as OA;
+
 /**
  * Not a schema.
  */
diff --git a/Examples/using-interfaces/GreenProduct.php b/Examples/using-interfaces/GreenProduct.php
index bd612aa35..019ca0042 100644
--- a/Examples/using-interfaces/GreenProduct.php
+++ b/Examples/using-interfaces/GreenProduct.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingInterfaces;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(title="GreenProduct")
  */
diff --git a/Examples/using-interfaces/OpenApiSpec.php b/Examples/using-interfaces/OpenApiSpec.php
index df57ddcfc..ad38e7ac3 100644
--- a/Examples/using-interfaces/OpenApiSpec.php
+++ b/Examples/using-interfaces/OpenApiSpec.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingInterfaces;
 
+use OpenApi\Annotations as OA;
+
 /**
  * Merging of interfaces got a bit of an overhaul in 3.0.4/5.
  *
diff --git a/Examples/using-interfaces/Product.php b/Examples/using-interfaces/Product.php
index 3bbc8b4bf..576fae18b 100644
--- a/Examples/using-interfaces/Product.php
+++ b/Examples/using-interfaces/Product.php
@@ -13,6 +13,7 @@ class Product implements ProductInterface
      * The unique identifier of a product in our catalog.
      *
      * @var int
+     *
      * @OA\Property(format="int64", example=1)
      */
     public $id;
diff --git a/Examples/using-interfaces/ProductController.php b/Examples/using-interfaces/ProductController.php
index 7aaa17087..1cd23f894 100644
--- a/Examples/using-interfaces/ProductController.php
+++ b/Examples/using-interfaces/ProductController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingInterfaces;
 
+use OpenApi\Annotations as OA;
+
 class ProductController
 {
     /**
diff --git a/Examples/using-interfaces/ProductInterface.php b/Examples/using-interfaces/ProductInterface.php
index 3de8397fc..6959e2104 100644
--- a/Examples/using-interfaces/ProductInterface.php
+++ b/Examples/using-interfaces/ProductInterface.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingInterfaces;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/Examples/using-refs/Model.php b/Examples/using-refs/Model.php
index a474ecf57..97c318d0a 100644
--- a/Examples/using-refs/Model.php
+++ b/Examples/using-refs/Model.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingRefs;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(description="A model")
  *
diff --git a/Examples/using-refs/OpenApiSpec.php b/Examples/using-refs/OpenApiSpec.php
index 4bc954851..6bddcfb4e 100644
--- a/Examples/using-refs/OpenApiSpec.php
+++ b/Examples/using-refs/OpenApiSpec.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingRefs;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Info(
  *     version="1.0.0",
diff --git a/Examples/using-refs/Product.php b/Examples/using-refs/Product.php
index 58f2c957c..d36d58d71 100644
--- a/Examples/using-refs/Product.php
+++ b/Examples/using-refs/Product.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingRefs;
 
+use OpenApi\Annotations as OA;
+
 /**
  * A common scenario is to let swagger-php generate a definition based on your model class.
  * These definitions can then be referenced with `ref="#/components/schemas/$classname".
@@ -20,6 +22,7 @@ class Product extends Model
      * The unique identifier of a product in our catalog.
      *
      * @var int
+     *
      * @OA\Property(format="int64", example=1)
      */
     public $id;
diff --git a/Examples/using-refs/ProductController.php b/Examples/using-refs/ProductController.php
index ba65ad3f6..885bf2ce5 100644
--- a/Examples/using-refs/ProductController.php
+++ b/Examples/using-refs/ProductController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingRefs;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\PathItem(
  *     path="/products/{product_id}",
diff --git a/Examples/using-refs/PropertyRefController.php b/Examples/using-refs/PropertyRefController.php
index ba0e311bd..aac3f6265 100644
--- a/Examples/using-refs/PropertyRefController.php
+++ b/Examples/using-refs/PropertyRefController.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingRefs;
 
+use OpenApi\Annotations as OA;
+
 class PropertyRefController
 {
     /**
diff --git a/Examples/using-refs/StockLevel.php b/Examples/using-refs/StockLevel.php
index 0d81fc11f..38c9b4a0e 100644
--- a/Examples/using-refs/StockLevel.php
+++ b/Examples/using-refs/StockLevel.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingRefs;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/Examples/using-traits/BellsAndWhistles.php b/Examples/using-traits/BellsAndWhistles.php
index e6d14e410..13ed1e672 100644
--- a/Examples/using-traits/BellsAndWhistles.php
+++ b/Examples/using-traits/BellsAndWhistles.php
@@ -3,6 +3,7 @@
 namespace OpenApi\Examples\UsingTraits;
 
 use OpenApi\Examples\UsingTraits\Decoration\Bells;
+use OpenApi\Annotations as OA;
 
 /**
  * @OA\Schema(title="Bells and Whistles trait")
diff --git a/Examples/using-traits/Decoration/Whistles.php b/Examples/using-traits/Decoration/Whistles.php
index e225bf118..0eedac0ef 100644
--- a/Examples/using-traits/Decoration/Whistles.php
+++ b/Examples/using-traits/Decoration/Whistles.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingTraits\Decoration;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(title="Whistles trait")
  */
diff --git a/Examples/using-traits/DeleteEntity.php b/Examples/using-traits/DeleteEntity.php
index 6f83bedcb..cc57a8093 100644
--- a/Examples/using-traits/DeleteEntity.php
+++ b/Examples/using-traits/DeleteEntity.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingTraits;
 
+use OpenApi\Annotations as OA;
+
 trait DeleteEntity
 {
     /**
diff --git a/Examples/using-traits/OpenApiSpec.php b/Examples/using-traits/OpenApiSpec.php
index b5b15b3a4..0e590e994 100644
--- a/Examples/using-traits/OpenApiSpec.php
+++ b/Examples/using-traits/OpenApiSpec.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingTraits;
 
+use OpenApi\Annotations as OA;
+
 /**
  * Merging of traits got a bit of an overhaul in 3.0.4/5.
  *
diff --git a/Examples/using-traits/Product.php b/Examples/using-traits/Product.php
index 0073184f7..2d2d22727 100644
--- a/Examples/using-traits/Product.php
+++ b/Examples/using-traits/Product.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingTraits;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(title="Product model")
  */
@@ -14,6 +16,7 @@ class Product
      * The unique identifier of a product in our catalog.
      *
      * @var int
+     *
      * @OA\Property(format="int64", example=1)
      */
     public $id;
diff --git a/Examples/using-traits/SimpleProduct.php b/Examples/using-traits/SimpleProduct.php
index 6998c8e9c..b55c083de 100644
--- a/Examples/using-traits/SimpleProduct.php
+++ b/Examples/using-traits/SimpleProduct.php
@@ -2,6 +2,8 @@
 
 namespace OpenApi\Examples\UsingTraits;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(title="SimpleProduct model")
  * )
@@ -15,6 +17,7 @@ class SimpleProduct
      * The unique identifier of a simple product in our catalog.
      *
      * @var int
+     *
      * @OA\Property(format="int64", example=1)
      */
     public $id;
diff --git a/Examples/using-traits/TrickyProduct.php b/Examples/using-traits/TrickyProduct.php
index ea311b9a5..be42404fd 100644
--- a/Examples/using-traits/TrickyProduct.php
+++ b/Examples/using-traits/TrickyProduct.php
@@ -3,6 +3,7 @@
 namespace OpenApi\Examples\UsingTraits;
 
 use OpenApi\Examples\UsingTraits\Blink as TheBlink;
+use OpenApi\Annotations as OA;
 
 /**
  * @OA\Schema(title="TrickyProduct model")
diff --git a/src/Util.php b/src/Util.php
index d6a7d1ca5..be427b43e 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -6,7 +6,6 @@
 
 namespace OpenApi;
 
-use InvalidArgumentException;
 use Symfony\Component\Finder\Finder;
 
 /**
@@ -63,7 +62,7 @@ private static function removePrefix(string $str, string $prefix): ?string
      * @param null|array|string   $exclude   The directory(s) or filename(s) to exclude (as absolute or relative paths)
      * @param null|string         $pattern   The pattern of the files to scan
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public static function finder($directory, $exclude = null, $pattern = null): Finder
     {
@@ -94,7 +93,7 @@ public static function finder($directory, $exclude = null, $pattern = null): Fin
                 }
             }
         } else {
-            throw new InvalidArgumentException('Unexpected $directory value:' . gettype($directory));
+            throw new \InvalidArgumentException('Unexpected $directory value:' . gettype($directory));
         }
         if ($exclude !== null) {
             if (is_string($exclude)) {
@@ -104,7 +103,7 @@ public static function finder($directory, $exclude = null, $pattern = null): Fin
                     $finder->notPath(Util::getRelativePath($path, $directory));
                 }
             } else {
-                throw new InvalidArgumentException('Unexpected $exclude value:' . gettype($exclude));
+                throw new \InvalidArgumentException('Unexpected $exclude value:' . gettype($exclude));
             }
         }
 
diff --git a/tests/Analysers/AttributeAnnotationFactoryTest.php b/tests/Analysers/AttributeAnnotationFactoryTest.php
index d68c2026f..dcc1fe2c9 100644
--- a/tests/Analysers/AttributeAnnotationFactoryTest.php
+++ b/tests/Analysers/AttributeAnnotationFactoryTest.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Analysers;
 
 use OpenApi\Analysers\AttributeAnnotationFactory;
diff --git a/tests/Analysers/ReflectionAnalyserTest.php b/tests/Analysers/ReflectionAnalyserTest.php
index 4b6ecb5ce..6be2409c9 100644
--- a/tests/Analysers/ReflectionAnalyserTest.php
+++ b/tests/Analysers/ReflectionAnalyserTest.php
@@ -83,6 +83,7 @@ public function analysers(): iterable
 
     /**
      * @dataProvider analysers
+     *
      * @requires     PHP 8.1
      */
     public function testApiDocBlockBasic(AnalyserInterface $analyser): void
@@ -110,6 +111,7 @@ public function testApiDocBlockBasic(AnalyserInterface $analyser): void
 
     /**
      * @dataProvider analysers
+     *
      * @requires     PHP 8.1
      */
     public function testApiAttributesBasic(AnalyserInterface $analyser): void
@@ -152,6 +154,7 @@ public function testApiAttributesBasic(AnalyserInterface $analyser): void
 
     /**
      * @dataProvider analysers
+     *
      * @requires     PHP 8.1
      */
     public function testApiMixedBasic(AnalyserInterface $analyser): void
diff --git a/tests/Analysers/TokenScannerTest.php b/tests/Analysers/TokenScannerTest.php
index f35dd48b6..dadd31646 100644
--- a/tests/Analysers/TokenScannerTest.php
+++ b/tests/Analysers/TokenScannerTest.php
@@ -209,6 +209,7 @@ public function scanCases(): iterable
                 'OpenApi\\Tests\\Fixtures\\PHP\\Php8PromotedProperties' => [
                     'uses' => [
                         'Property' => 'OpenApi\\Attributes\\Property',
+                        'OA' => 'OpenApi\Annotations',
                     ],
                     'interfaces' => [],
                     'traits' => [],
diff --git a/tests/Annotations/AttributesSyncTest.php b/tests/Annotations/AttributesSyncTest.php
index 5c5594dbe..7a2a73151 100644
--- a/tests/Annotations/AttributesSyncTest.php
+++ b/tests/Annotations/AttributesSyncTest.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Annotations;
 
 use OpenApi\Annotations as OA;
diff --git a/tests/Annotations/ComponentsTest.php b/tests/Annotations/ComponentsTest.php
index 5702d56f8..2f868993d 100644
--- a/tests/Annotations/ComponentsTest.php
+++ b/tests/Annotations/ComponentsTest.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Annotations;
 
 use OpenApi\Annotations\Examples;
diff --git a/tests/Fixtures/Annotations/CustomAttachable.php b/tests/Fixtures/Annotations/CustomAttachable.php
index da2ab7c8c..888d5b434 100644
--- a/tests/Fixtures/Annotations/CustomAttachable.php
+++ b/tests/Fixtures/Annotations/CustomAttachable.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures\Annotations;
 
 use OpenApi\Annotations\Attachable;
diff --git a/tests/Fixtures/AnotherNamespace/Annotations/Constants.php b/tests/Fixtures/AnotherNamespace/Annotations/Constants.php
index 3176933e1..7b61a13bb 100644
--- a/tests/Fixtures/AnotherNamespace/Annotations/Constants.php
+++ b/tests/Fixtures/AnotherNamespace/Annotations/Constants.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
diff --git a/tests/Fixtures/AnotherNamespace/Annotations/Unrelated.php b/tests/Fixtures/AnotherNamespace/Annotations/Unrelated.php
index 7211d892b..ba2885c3d 100644
--- a/tests/Fixtures/AnotherNamespace/Annotations/Unrelated.php
+++ b/tests/Fixtures/AnotherNamespace/Annotations/Unrelated.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
diff --git a/tests/Fixtures/AnotherNamespace/Child.php b/tests/Fixtures/AnotherNamespace/Child.php
index a1168ab55..1ecdcdcc2 100644
--- a/tests/Fixtures/AnotherNamespace/Child.php
+++ b/tests/Fixtures/AnotherNamespace/Child.php
@@ -17,6 +17,7 @@ class Child extends Ancestor
 {
     /**
      * @var bool
+     *
      * @OA\Property
      */
     public $isBaby;
diff --git a/tests/Fixtures/AnotherNamespace/ChildWithDocBlocks.php b/tests/Fixtures/AnotherNamespace/ChildWithDocBlocks.php
index 5e23f1443..49effef29 100644
--- a/tests/Fixtures/AnotherNamespace/ChildWithDocBlocks.php
+++ b/tests/Fixtures/AnotherNamespace/ChildWithDocBlocks.php
@@ -16,6 +16,7 @@ class ChildWithDocBlocks extends AncestorWithoutDocBlocks
 {
     /**
      * @var bool
+     *
      * @OA\Property
      */
     public $isBaby;
diff --git a/tests/Fixtures/Apis/DocBlocks/basic.php b/tests/Fixtures/Apis/DocBlocks/basic.php
index b9828f387..6801b6d5e 100644
--- a/tests/Fixtures/Apis/DocBlocks/basic.php
+++ b/tests/Fixtures/Apis/DocBlocks/basic.php
@@ -14,7 +14,6 @@
  * @OA\OpenApi(
  *     security={{"bearerAuth": {}}}
  * )
- *
  * @OA\Info(
  *     version="1.0.0",
  *     title="Basic single file API",
diff --git a/tests/Fixtures/Attributes/CustomAttachable.php b/tests/Fixtures/Attributes/CustomAttachable.php
index b58f76fbb..bb78077c5 100644
--- a/tests/Fixtures/Attributes/CustomAttachable.php
+++ b/tests/Fixtures/Attributes/CustomAttachable.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures\Attributes;
 
 use OpenApi\Attributes\Attachable;
diff --git a/tests/Fixtures/CustomerInterface.php b/tests/Fixtures/CustomerInterface.php
index 970f612e2..32957d942 100644
--- a/tests/Fixtures/CustomerInterface.php
+++ b/tests/Fixtures/CustomerInterface.php
@@ -19,6 +19,7 @@ interface CustomerInterface
      * @var string
      *
      * @example John
+     *
      * @OA\Property
      */
     public function firstname();
@@ -27,6 +28,7 @@ public function firstname();
      * @var null|string the second name of the customer
      *
      * @example Allan
+     *
      * @OA\Property
      */
     public function secondname();
@@ -37,6 +39,7 @@ public function secondname();
      * @var string|null
      *
      * @example Peter
+     *
      * @OA\Property
      */
     public function thirdname();
@@ -47,12 +50,14 @@ public function thirdname();
      * @var unknown|null
      *
      * @example Unknown
+     *
      * @OA\Property
      */
     public function fourthname();
 
     /**
      * @var string the lastname of the customer
+     *
      * @OA\Property
      */
     public function lastname();
diff --git a/tests/Fixtures/ExpandClasses/Base.php b/tests/Fixtures/ExpandClasses/Base.php
index 133b61712..6338a35e1 100644
--- a/tests/Fixtures/ExpandClasses/Base.php
+++ b/tests/Fixtures/ExpandClasses/Base.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
diff --git a/tests/Fixtures/ExpandClasses/BaseInterface.php b/tests/Fixtures/ExpandClasses/BaseInterface.php
index 6c0f3545a..219a106ab 100644
--- a/tests/Fixtures/ExpandClasses/BaseInterface.php
+++ b/tests/Fixtures/ExpandClasses/BaseInterface.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Tests\Fixtures\ExpandClasses;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/tests/Fixtures/ExpandClasses/BaseThatImplements.php b/tests/Fixtures/ExpandClasses/BaseThatImplements.php
index 700658bdb..66a1272d8 100644
--- a/tests/Fixtures/ExpandClasses/BaseThatImplements.php
+++ b/tests/Fixtures/ExpandClasses/BaseThatImplements.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
diff --git a/tests/Fixtures/ExpandClasses/Extended.php b/tests/Fixtures/ExpandClasses/Extended.php
index de699c9e3..6cba5bccc 100644
--- a/tests/Fixtures/ExpandClasses/Extended.php
+++ b/tests/Fixtures/ExpandClasses/Extended.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
diff --git a/tests/Fixtures/ExpandClasses/ExtendedWithTwoSchemas.php b/tests/Fixtures/ExpandClasses/ExtendedWithTwoSchemas.php
index a24b4b3a9..b4d041bb1 100644
--- a/tests/Fixtures/ExpandClasses/ExtendedWithTwoSchemas.php
+++ b/tests/Fixtures/ExpandClasses/ExtendedWithTwoSchemas.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
diff --git a/tests/Fixtures/ExpandClasses/ExtendedWithoutAllOf.php b/tests/Fixtures/ExpandClasses/ExtendedWithoutAllOf.php
index 823ed9ba5..ba7cc9be2 100644
--- a/tests/Fixtures/ExpandClasses/ExtendedWithoutAllOf.php
+++ b/tests/Fixtures/ExpandClasses/ExtendedWithoutAllOf.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
diff --git a/tests/Fixtures/ExpandClasses/ExtendsBaseThatImplements.php b/tests/Fixtures/ExpandClasses/ExtendsBaseThatImplements.php
index 0230dc65a..3f1396dbc 100644
--- a/tests/Fixtures/ExpandClasses/ExtendsBaseThatImplements.php
+++ b/tests/Fixtures/ExpandClasses/ExtendsBaseThatImplements.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Tests\Fixtures\ExpandClasses;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/tests/Fixtures/ExpandClasses/TraitUsedByExtendsBaseThatImplements.php b/tests/Fixtures/ExpandClasses/TraitUsedByExtendsBaseThatImplements.php
index bcaeb862b..c85dfc469 100644
--- a/tests/Fixtures/ExpandClasses/TraitUsedByExtendsBaseThatImplements.php
+++ b/tests/Fixtures/ExpandClasses/TraitUsedByExtendsBaseThatImplements.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @license Apache 2.0
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Tests\Fixtures\ExpandClasses;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema
  */
diff --git a/tests/Fixtures/NestedProperty.php b/tests/Fixtures/NestedProperty.php
index b0a1ca8fd..7a5ef38b3 100644
--- a/tests/Fixtures/NestedProperty.php
+++ b/tests/Fixtures/NestedProperty.php
@@ -15,6 +15,7 @@ class NestedProperty
 {
     /**
      * @var bool
+     *
      * @OA\Property(
      *     @OA\Property(
      *         property="babyProperty",
diff --git a/tests/Fixtures/PHP/Inheritance/ExtenedsBaseInterface.php b/tests/Fixtures/PHP/Inheritance/ExtenedsBaseInterface.php
index 17430fc6f..0024923ef 100644
--- a/tests/Fixtures/PHP/Inheritance/ExtenedsBaseInterface.php
+++ b/tests/Fixtures/PHP/Inheritance/ExtenedsBaseInterface.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures\PHP\Inheritance;
 
 interface ExtenedsBaseInterface extends BaseInterface
diff --git a/tests/Fixtures/PHP/Php8PromotedProperties.php b/tests/Fixtures/PHP/Php8PromotedProperties.php
index d4b641db3..2b00854f3 100644
--- a/tests/Fixtures/PHP/Php8PromotedProperties.php
+++ b/tests/Fixtures/PHP/Php8PromotedProperties.php
@@ -7,6 +7,7 @@
 namespace OpenApi\Tests\Fixtures\PHP;
 
 use OpenApi\Attributes\Property;
+use OpenApi\Annotations as OA;
 
 /**
  * @OA\Schema
@@ -18,6 +19,7 @@ public function __construct(
          * Label List.
          *
          * @var Label[]|null $labels
+         *
          * @OA\Property()
          */
         public ?array $labels,
diff --git a/tests/Fixtures/PHP/StatusEnumBacked.php b/tests/Fixtures/PHP/StatusEnumBacked.php
index ceedafd22..d348cb59c 100644
--- a/tests/Fixtures/PHP/StatusEnumBacked.php
+++ b/tests/Fixtures/PHP/StatusEnumBacked.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures\PHP;
 
 use OpenApi\Attributes\Schema;
diff --git a/tests/Fixtures/PHP/StatusEnumIntegerBacked.php b/tests/Fixtures/PHP/StatusEnumIntegerBacked.php
index e71a688a8..62c3a4221 100644
--- a/tests/Fixtures/PHP/StatusEnumIntegerBacked.php
+++ b/tests/Fixtures/PHP/StatusEnumIntegerBacked.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures\PHP;
 
 use OpenApi\Attributes\Schema;
diff --git a/tests/Fixtures/PHP/StatusEnumStringBacked.php b/tests/Fixtures/PHP/StatusEnumStringBacked.php
index bf809d1d8..90b657327 100644
--- a/tests/Fixtures/PHP/StatusEnumStringBacked.php
+++ b/tests/Fixtures/PHP/StatusEnumStringBacked.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures\PHP;
 
 use OpenApi\Attributes\Schema;
diff --git a/tests/Fixtures/PHP/namespaces1.php b/tests/Fixtures/PHP/namespaces1.php
index e15da6f3c..d93d83f04 100644
--- a/tests/Fixtures/PHP/namespaces1.php
+++ b/tests/Fixtures/PHP/namespaces1.php
@@ -1,4 +1,8 @@
-<?php
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
 
 namespace Foo;
 
diff --git a/tests/Fixtures/PHP/namespaces2.php b/tests/Fixtures/PHP/namespaces2.php
index 54cf3e47c..df41caf9d 100644
--- a/tests/Fixtures/PHP/namespaces2.php
+++ b/tests/Fixtures/PHP/namespaces2.php
@@ -1,4 +1,8 @@
-<?php
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
 
 namespace Foo {
     class FooClass
diff --git a/tests/Fixtures/Parser/AllTraits.php b/tests/Fixtures/Parser/AllTraits.php
index 3e49ac7a6..d2d5e89ec 100644
--- a/tests/Fixtures/Parser/AllTraits.php
+++ b/tests/Fixtures/Parser/AllTraits.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures\Parser;
 
 trait AllTraits
diff --git a/tests/Fixtures/Parser/UserInterface.php b/tests/Fixtures/Parser/UserInterface.php
index d8939e24d..bee79d239 100644
--- a/tests/Fixtures/Parser/UserInterface.php
+++ b/tests/Fixtures/Parser/UserInterface.php
@@ -16,6 +16,7 @@ interface UserInterface extends OtherInterface
      * @return string
      *
      * @example John
+     *
      * @OA\Property
      */
     public function getFirstName();
diff --git a/tests/Fixtures/Processors/EntityControllerClass.php b/tests/Fixtures/Processors/EntityControllerClass.php
index 095791205..ab8dbbf9a 100644
--- a/tests/Fixtures/Processors/EntityControllerClass.php
+++ b/tests/Fixtures/Processors/EntityControllerClass.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Tests\Fixtures\Processors;
 
+use OpenApi\Annotations as OA;
+
 /**
  * An entity controller class.
  *
diff --git a/tests/Fixtures/ThirdPartyAnnotations.php b/tests/Fixtures/ThirdPartyAnnotations.php
index 6d1edb63d..f58570fd0 100644
--- a/tests/Fixtures/ThirdPartyAnnotations.php
+++ b/tests/Fixtures/ThirdPartyAnnotations.php
@@ -7,6 +7,7 @@
 namespace OpenApi\Tests\Fixtures;
 
 use AnotherNamespace\Annotations as Annotation;
+use OpenApi\Annotations as OA;
 
 /**
  * @OA\Info(title="Fixture for ParserTest", version="test")
diff --git a/tests/Fixtures/TypedProperties.php b/tests/Fixtures/TypedProperties.php
index f454d299e..69579239b 100644
--- a/tests/Fixtures/TypedProperties.php
+++ b/tests/Fixtures/TypedProperties.php
@@ -6,7 +6,7 @@
 
 namespace OpenApi\Tests\Fixtures;
 
-use DateTime;
+use OpenApi\Annotations as OA;
 
 /**
  * @OA\Schema
@@ -30,6 +30,7 @@ class TypedProperties
 
     /**
      * @var \OpenApi\Tests\Fixtures\TypedProperties[]
+     *
      * @OA\Property()
      */
     public array $arrayType;
@@ -37,7 +38,7 @@ class TypedProperties
     /**
      * @OA\Property
      */
-    public DateTime $dateTime;
+    public \DateTime $dateTime;
 
     /**
      * @OA\Property
@@ -56,12 +57,14 @@ class TypedProperties
 
     /**
      * @var int
+     *
      * @OA\Property
      */
     public string $nativeTrumpsVar;
 
     /**
      * @var int
+     *
      * @OA\Property(
      *     type="integer",
      * )
@@ -70,6 +73,7 @@ class TypedProperties
 
     /**
      * @var string
+     *
      * @OA\Property(
      *     type="integer",
      * )
@@ -90,6 +94,7 @@ class TypedProperties
 
     /**
      * @var int
+     *
      * @OA\Property
      */
     public $onlyVar;
@@ -111,6 +116,7 @@ class TypedProperties
 
     /**
      * @var string[]
+     *
      * @OA\Property()
      */
     public array $nativeArray;
diff --git a/tests/Fixtures/UsingAttributes.php b/tests/Fixtures/UsingAttributes.php
index 7d618243b..255a9f907 100644
--- a/tests/Fixtures/UsingAttributes.php
+++ b/tests/Fixtures/UsingAttributes.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures;
 
 use OpenApi\Attributes as OAT;
diff --git a/tests/Fixtures/UsingCustomAttachables.php b/tests/Fixtures/UsingCustomAttachables.php
index 96dea1056..a4b44ed16 100644
--- a/tests/Fixtures/UsingCustomAttachables.php
+++ b/tests/Fixtures/UsingCustomAttachables.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Fixtures;
 
 use OpenApi\Annotations as OA;
@@ -7,9 +11,7 @@
 
 /**
  * @OA\Info(title="Custom annotation attributes", version="1.0")
- *
  * @OA\PathItem(path="/")
- *
  * @OA\Schema(
  *     schema="UsingCustomAttachables",
  *     required={"name"},
diff --git a/tests/Fixtures/UsingPhpDoc.php b/tests/Fixtures/UsingPhpDoc.php
index 185983ce3..cfb9ae337 100644
--- a/tests/Fixtures/UsingPhpDoc.php
+++ b/tests/Fixtures/UsingPhpDoc.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Tests\Fixtures;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Info(title="Fixture for AugmentOperationTest", version="test")
  */
diff --git a/tests/Fixtures/UsingRefs.php b/tests/Fixtures/UsingRefs.php
index 320c9751d..e31aadcfd 100644
--- a/tests/Fixtures/UsingRefs.php
+++ b/tests/Fixtures/UsingRefs.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Tests\Fixtures;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Info(title="Using a parameter definition", version="unittest")
  */
diff --git a/tests/Fixtures/UsingVar.php b/tests/Fixtures/UsingVar.php
index 5297791a5..a6d60a3d3 100644
--- a/tests/Fixtures/UsingVar.php
+++ b/tests/Fixtures/UsingVar.php
@@ -6,6 +6,8 @@
 
 namespace OpenApi\Tests\Fixtures;
 
+use OpenApi\Annotations as OA;
+
 /**
  * @OA\Schema(
  *     schema="UsingVar",
@@ -18,12 +20,14 @@ class UsingVar
 {
     /**
      * @var string
+     *
      * @OA\Property
      */
     private $name;
 
     /**
      * @var \DateTimeInterface
+     *
      * @OA\Property(ref="#/components/schemas/date")
      */
     private $createdAt;
diff --git a/tests/OpenApiTestCase.php b/tests/OpenApiTestCase.php
index 2ac5e1cc3..44be1201b 100644
--- a/tests/OpenApiTestCase.php
+++ b/tests/OpenApiTestCase.php
@@ -6,8 +6,6 @@
 
 namespace OpenApi\Tests;
 
-use DirectoryIterator;
-use Exception;
 use OpenApi\Analysers\AnalyserInterface;
 use OpenApi\Analysers\AttributeAnnotationFactory;
 use OpenApi\Analysers\DocBlockAnnotationFactory;
@@ -100,7 +98,7 @@ public function getAnalyzer(): AnalyserInterface
     public function assertOpenApiLogEntryContains(string $needle, string $message = ''): void
     {
         $this->expectedLogMessages[] = [function ($entry, $type) use ($needle, $message) {
-            if ($entry instanceof Exception) {
+            if ($entry instanceof \Exception) {
                 $entry = $entry->getMessage();
             }
             $this->assertStringContainsString($needle, $entry, $message);
@@ -255,7 +253,7 @@ protected function annotationsFromDocBlockParser(string $docBlock, array $extraA
     public function allAnnotationClasses(): array
     {
         $classes = [];
-        $dir = new DirectoryIterator(__DIR__ . '/../src/Annotations');
+        $dir = new \DirectoryIterator(__DIR__ . '/../src/Annotations');
         foreach ($dir as $entry) {
             if (!$entry->isFile() || $entry->getExtension() != 'php') {
                 continue;
@@ -278,7 +276,7 @@ public function allAnnotationClasses(): array
     public function allAttributeClasses(): array
     {
         $classes = [];
-        $dir = new DirectoryIterator(__DIR__ . '/../src/Attributes');
+        $dir = new \DirectoryIterator(__DIR__ . '/../src/Attributes');
         foreach ($dir as $entry) {
             if (!$entry->isFile() || $entry->getExtension() != 'php') {
                 continue;
diff --git a/tests/Processors/CleanUnusedComponentsTest.php b/tests/Processors/CleanUnusedComponentsTest.php
index c8c5131a1..bbfd1a459 100644
--- a/tests/Processors/CleanUnusedComponentsTest.php
+++ b/tests/Processors/CleanUnusedComponentsTest.php
@@ -1,5 +1,9 @@
 <?php declare(strict_types=1);
 
+/**
+ * @license Apache 2.0
+ */
+
 namespace OpenApi\Tests\Processors;
 
 use OpenApi\Processors\CleanUnusedComponents;