Cleanup imports and improve CS rules

DerManoMann · DerManoMann · commit 80716ba3357c · 2026-02-20T15:49:10.000+13:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -35,6 +35,7 @@
         'OpenApi/declare_strict_types' => true,
         'blank_line_after_opening_tag' => false,
         'array_syntax' => ['syntax' => 'short'],
+        'ordered_imports' => true,
         'no_unused_imports' => true,
         'blank_line_before_statement' => ['statements' => ['return']],
         'visibility_required' => true,
diff --git a/docs/examples/processors/schema-query-parameter/SchemaQueryParameter.php b/docs/examples/processors/schema-query-parameter/SchemaQueryParameter.php
@@ -10,9 +10,9 @@
 
 use OpenApi\Analysis;
 use OpenApi\Annotations\Operation;
-use OpenApi\Generator;
 use OpenApi\Attributes\Parameter;
 use OpenApi\Attributes\Schema;
+use OpenApi\Generator;
 
 /**
  * Custom processor to translate the vendor tag `query-args-$ref` into query parameter annotations.
diff --git a/docs/examples/specs/using-traits/annotations/BellsAndWhistles.php b/docs/examples/specs/using-traits/annotations/BellsAndWhistles.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Examples\Specs\UsingTraits\Annotations;
 
-use OpenApi\Examples\Specs\UsingTraits\Annotations\Decoration\Bells;
 use OpenApi\Annotations as OA;
+use OpenApi\Examples\Specs\UsingTraits\Annotations\Decoration\Bells;
 
 /**
  * @OA\Schema(title="Bells and Whistles trait")
diff --git a/docs/examples/specs/using-traits/annotations/TrickyProduct.php b/docs/examples/specs/using-traits/annotations/TrickyProduct.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Examples\Specs\UsingTraits\Annotations;
 
-use OpenApi\Examples\Specs\UsingTraits\Annotations\Blink as TheBlink;
 use OpenApi\Annotations as OA;
+use OpenApi\Examples\Specs\UsingTraits\Annotations\Blink as TheBlink;
 
 /**
  * @OA\Schema(title="TrickyProduct model")
diff --git a/src/Annotations/AbstractAnnotation.php b/src/Annotations/AbstractAnnotation.php
@@ -6,9 +6,9 @@
 
 namespace OpenApi\Annotations;
 
+use OpenApi\Annotations as OA;
 use OpenApi\Context;
 use OpenApi\Generator;
-use OpenApi\Annotations as OA;
 use OpenApi\OpenApiException;
 use Symfony\Component\Yaml\Yaml;
 
diff --git a/src/Annotations/Operation.php b/src/Annotations/Operation.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Annotations;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 /**
  * Base class for <code>@OA\Get</code>,  <code>@OA\Post</code>,  <code>@OA\Put</code>,  etc.
diff --git a/src/Attributes/AdditionalProperties.php b/src/Attributes/AdditionalProperties.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class AdditionalProperties extends OA\AdditionalProperties
diff --git a/src/Attributes/Components.php b/src/Attributes/Components.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Components extends OA\Components
diff --git a/src/Attributes/Contact.php b/src/Attributes/Contact.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Contact extends OA\Contact
diff --git a/src/Attributes/Discriminator.php b/src/Attributes/Discriminator.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Discriminator extends OA\Discriminator
diff --git a/src/Attributes/Examples.php b/src/Attributes/Examples.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
 class Examples extends OA\Examples
diff --git a/src/Attributes/ExternalDocumentation.php b/src/Attributes/ExternalDocumentation.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class ExternalDocumentation extends OA\ExternalDocumentation
diff --git a/src/Attributes/Flow.php b/src/Attributes/Flow.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Flow extends OA\Flow
diff --git a/src/Attributes/Header.php b/src/Attributes/Header.php
@@ -5,8 +5,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Header extends OA\Header
diff --git a/src/Attributes/Info.php b/src/Attributes/Info.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Info extends OA\Info
diff --git a/src/Attributes/Items.php b/src/Attributes/Items.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class Items extends OA\Items
diff --git a/src/Attributes/JsonContent.php b/src/Attributes/JsonContent.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 /**
  * Shorthand for a json response.
diff --git a/src/Attributes/License.php b/src/Attributes/License.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class License extends OA\License
diff --git a/src/Attributes/Link.php b/src/Attributes/Link.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class Link extends OA\Link
diff --git a/src/Attributes/MediaType.php b/src/Attributes/MediaType.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class MediaType extends OA\MediaType
diff --git a/src/Attributes/OpenApi.php b/src/Attributes/OpenApi.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class OpenApi extends OA\OpenApi
diff --git a/src/Attributes/PathItem.php b/src/Attributes/PathItem.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class PathItem extends OA\PathItem
diff --git a/src/Attributes/Property.php b/src/Attributes/Property.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER | \Attribute::TARGET_CLASS_CONSTANT | \Attribute::IS_REPEATABLE)]
 class Property extends OA\Property
diff --git a/src/Attributes/RequestBody.php b/src/Attributes/RequestBody.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER | \Attribute::IS_REPEATABLE)]
 class RequestBody extends OA\RequestBody
diff --git a/src/Attributes/Schema.php b/src/Attributes/Schema.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
 class Schema extends OA\Schema
diff --git a/src/Attributes/SecurityScheme.php b/src/Attributes/SecurityScheme.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
 class SecurityScheme extends OA\SecurityScheme
diff --git a/src/Attributes/Server.php b/src/Attributes/Server.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
 class Server extends OA\Server
diff --git a/src/Attributes/ServerVariable.php b/src/Attributes/ServerVariable.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class ServerVariable extends OA\ServerVariable
diff --git a/src/Attributes/Tag.php b/src/Attributes/Tag.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Tag extends OA\Tag
diff --git a/src/Attributes/Webhook.php b/src/Attributes/Webhook.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Webhook extends OA\Webhook
diff --git a/src/Attributes/Xml.php b/src/Attributes/Xml.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Xml extends OA\Xml
diff --git a/src/Attributes/XmlContent.php b/src/Attributes/XmlContent.php
@@ -6,8 +6,8 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Generator;
 use OpenApi\Annotations as OA;
+use OpenApi\Generator;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class XmlContent extends OA\XmlContent
diff --git a/tests/Analysers/AttributeAnnotationFactoryTest.php b/tests/Analysers/AttributeAnnotationFactoryTest.php
@@ -7,10 +7,10 @@
 namespace OpenApi\Tests\Analysers;
 
 use OpenApi\Analysers\AttributeAnnotationFactory;
-use OpenApi\Tests\Fixtures\UsingAttributes;
+use OpenApi\Attributes\Property;
 use OpenApi\Tests\Fixtures\InvalidPropertyAttribute;
+use OpenApi\Tests\Fixtures\UsingAttributes;
 use OpenApi\Tests\OpenApiTestCase;
-use OpenApi\Attributes\Property;
 
 final class AttributeAnnotationFactoryTest extends OpenApiTestCase
 {
diff --git a/tests/Analysers/DocBlockParserTest.php b/tests/Analysers/DocBlockParserTest.php
@@ -6,10 +6,10 @@
 
 namespace OpenApi\Tests\Analysers;
 
-use OpenApi\Tests\OpenApiTestCase;
 use OpenApi\Annotations\Contact;
 use OpenApi\Annotations\Parameter;
 use OpenApi\Tests\ConstantsTest;
+use OpenApi\Tests\OpenApiTestCase;
 
 final class DocBlockParserTest extends OpenApiTestCase
 {
diff --git a/tests/Annotations/AbstractAnnotationTest.php b/tests/Annotations/AbstractAnnotationTest.php
@@ -7,7 +7,6 @@
 namespace OpenApi\Tests\Annotations;
 
 use OpenApi\Annotations as OA;
-use OpenApi\Annotations\Response;
 use OpenApi\Tests\OpenApiTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 
@@ -146,9 +145,9 @@ public function testValidateExamples(): void
 
     public static function identityCases(): iterable
     {
-        yield 'default' => [new Response(['response' => 200]), null, '@OA\Response(response=200)'];
-        yield '[]' => [new Response(['response' => 200]), [], '@OA\Response()'];
-        yield 'custom' => [new Response(['response' => 200]), ['response'], '@OA\Response(response=200)'];
+        yield 'default' => [new OA\Response(['response' => 200]), null, '@OA\Response(response=200)'];
+        yield '[]' => [new OA\Response(['response' => 200]), [], '@OA\Response()'];
+        yield 'custom' => [new OA\Response(['response' => 200]), ['response'], '@OA\Response(response=200)'];
     }
 
     #[DataProvider('identityCases')]
diff --git a/tests/DocSnippetsTest.php b/tests/DocSnippetsTest.php
@@ -11,8 +11,8 @@
 use OpenApi\Pipeline;
 use OpenApi\Processors\OperationId;
 use OpenApi\Tests\Concerns\UsesExamples;
-use Symfony\Component\Finder\Finder;
 use PHPUnit\Framework\Attributes\DataProvider;
+use Symfony\Component\Finder\Finder;
 
 final class DocSnippetsTest extends OpenApiTestCase
 {
diff --git a/tests/ExamplesTest.php b/tests/ExamplesTest.php
@@ -6,10 +6,10 @@
 
 namespace OpenApi\Tests;
 
-use OpenApi\Tests\Concerns\UsesExamples;
 use OpenApi\Annotations as OA;
 use OpenApi\Generator;
 use OpenApi\Serializer;
+use OpenApi\Tests\Concerns\UsesExamples;
 use OpenApi\TypeResolverInterface;
 use PHPUnit\Framework\Attributes\DataProvider;
 
diff --git a/tests/Fixtures/AnotherNamespace/Child.php b/tests/Fixtures/AnotherNamespace/Child.php
diff --git a/tests/Fixtures/AnotherNamespace/ChildWithDocBlocks.php b/tests/Fixtures/AnotherNamespace/ChildWithDocBlocks.php
diff --git a/tests/Fixtures/PHP/Php8PromotedProperties.php b/tests/Fixtures/PHP/Php8PromotedProperties.php
diff --git a/tests/Fixtures/UsingCustomAttachables.php b/tests/Fixtures/UsingCustomAttachables.php
diff --git a/tests/Processors/AugmentRefsTest.php b/tests/Processors/AugmentRefsTest.php
diff --git a/tests/Processors/OperationIdTest.php b/tests/Processors/OperationIdTest.php
diff --git a/tests/SerializerTest.php b/tests/SerializerTest.php
