Refactor enum fixtures into separate namespace (#1380)

tests/Analysers/TokenScannerTest.php

@@ -323,9 +323,9 @@ public function scanCases(): iterable
 
         if (\PHP_VERSION_ID >= 80100) {
             yield 'enum' => [
-                'PHP/StatusEnum.php',
+                'PHP/Enums/StatusEnum.php',
                 [
-                    'OpenApi\\Tests\\Fixtures\\PHP\\StatusEnum' => [
+                    'OpenApi\\Tests\\Fixtures\\PHP\\Enums\\StatusEnum' => [
                         'uses' => ['Schema' => 'OpenApi\\Attributes\\Schema'],
                         'interfaces' => [],
                         'enums' => [],
@@ -337,9 +337,9 @@ public function scanCases(): iterable
             ];
 
             yield 'enum-backed' => [
-                'PHP/StatusEnumBacked.php',
+                'PHP/Enums/StatusEnumBacked.php',
                 [
-                    'OpenApi\\Tests\\Fixtures\\PHP\\StatusEnumBacked' => [
+                    'OpenApi\\Tests\\Fixtures\\PHP\\Enums\\StatusEnumBacked' => [
                         'uses' => ['Schema' => 'OpenApi\\Attributes\\Schema'],
                         'interfaces' => [],
                         'enums' => [],

tests/Fixtures/PHP/Enums/ReferencesEnum.php

@@ -0,0 +1,108 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Tests\Fixtures\PHP\Enums;
+
+use OpenApi\Annotations as OA;
+use OpenApi\Attributes\Items;
+use OpenApi\Attributes\Property;
+use OpenApi\Attributes\Schema;
+
+#[Schema()]
+class ReferencesEnum
+{
+    #[Property(
+        title: 'statusEnum',
+        description: 'Status enum',
+        type: 'string',
+        enum: StatusEnum::class,
+        nullable: false
+    )]
+    public string $statusEnum;
+
+    #[Property(
+        title: 'statusEnumMixed',
+        description: 'Status enum mixed',
+        type: 'string',
+        enum: [StatusEnum::DRAFT, StatusEnum::ARCHIVED, 'OTHER'],
+        nullable: false
+    )]
+    public string $statusEnumMixed;
+
+    /**
+     * @OA\Property(title="statusEnumBacked",
+     *     description="Status enum backed",
+     *     type="int",
+     *     enum="\OpenApi\Tests\Fixtures\PHP\Enums\StatusEnumBacked",
+     *     nullable="false"
+     * )
+     */
+    public int $statusEnumBacked;
+
+    #[Property(
+        title: 'statusEnumBackedMixed',
+        description: 'Status enum backed mixed',
+        type: 'int',
+        enum: [StatusEnumBacked::DRAFT, StatusEnumBacked::ARCHIVED, 9],
+        nullable: false
+    )]
+    public int $statusEnumBackedMixed;
+
+    #[Property(
+        title: 'statusEnumIntegerBacked',
+        description: 'Status enum integer backed',
+        type: 'int',
+        enum: StatusEnumIntegerBacked::class,
+        nullable: true
+    )]
+    public ?int $statusEnumIntegerBacked;
+
+    /**
+     * @OA\Property(
+     *     title="statusEnumStringBacked",
+     *     description="Status enum string backed",
+     *     type="string",
+     *     enum="\OpenApi\Tests\Fixtures\PHP\Enums\StatusEnumStringBacked",
+     *     nullable="true"
+     * )
+     */
+    public ?string $statusEnumStringBacked;
+
+    #[Property(
+        title: 'statusEnumStringBackedMixed',
+        description: 'Status enum string backed mixed',
+        type: 'string',
+        enum: [StatusEnumStringBacked::DRAFT, StatusEnumStringBacked::ARCHIVED, 'other'],
+        nullable: true
+    )]
+    public ?string $statusEnumStringBackedMixed;
+
+    /** @var list<string> StatusEnumStringBacked array */
+    #[Property(
+        title: 'statusEnums',
+        description: 'StatusEnumStringBacked array',
+        type: 'array',
+        items: new Items(
+            title: 'itemsStatusEnumStringBacked',
+            type: 'string',
+            enum: StatusEnumStringBacked::class
+        )
+    )]
+    public array $statusEnums;
+
+    /** @var list<string> StatusEnumStringBacked array */
+    #[Property(
+        title: 'statusEnumsMixed',
+        description: 'StatusEnumStringBacked array mixed',
+        type: 'array',
+        items: new Items(
+            title: 'itemsStatusEnumStringBackedMixed',
+            type: 'string',
+            enum: [StatusEnumStringBacked::DRAFT, StatusEnumStringBacked::ARCHIVED, 'other']
+        )
+    )]
+    public array $statusEnumsMixed;
+}

tests/Fixtures/PHP/StatusEnum.php → tests/Fixtures/PHP/Enums/StatusEnum.php

@@ -4,7 +4,7 @@
  * @license Apache 2.0
  */
 
-namespace OpenApi\Tests\Fixtures\PHP;
+namespace OpenApi\Tests\Fixtures\PHP\Enums;
 
 use OpenApi\Attributes\Schema;
 

tests/Fixtures/PHP/StatusEnumBacked.php → tests/Fixtures/PHP/Enums/StatusEnumBacked.php

@@ -4,7 +4,7 @@
  * @license Apache 2.0
  */
 
-namespace OpenApi\Tests\Fixtures\PHP;
+namespace OpenApi\Tests\Fixtures\PHP\Enums;
 
 use OpenApi\Attributes\Schema;
 

tests/Fixtures/PHP/StatusEnumIntegerBacked.php → tests/Fixtures/PHP/Enums/StatusEnumIntegerBacked.php

@@ -4,7 +4,7 @@
  * @license Apache 2.0
  */
 
-namespace OpenApi\Tests\Fixtures\PHP;
+namespace OpenApi\Tests\Fixtures\PHP\Enums;
 
 use OpenApi\Attributes\Schema;
 

tests/Fixtures/PHP/StatusEnumStringBacked.php → tests/Fixtures/PHP/Enums/StatusEnumStringBacked.php

@@ -4,7 +4,7 @@
  * @license Apache 2.0
  */
 
-namespace OpenApi\Tests\Fixtures\PHP;
+namespace OpenApi\Tests\Fixtures\PHP\Enums;
 
 use OpenApi\Attributes\Schema;
 

tests/Processors/ExpandEnumsTest.php

@@ -12,10 +12,10 @@
 use OpenApi\Attributes\Property as AttributesProperty;
 use OpenApi\Generator;
 use OpenApi\Processors\ExpandEnums;
-use OpenApi\Tests\Fixtures\PHP\StatusEnum;
-use OpenApi\Tests\Fixtures\PHP\StatusEnumBacked;
-use OpenApi\Tests\Fixtures\PHP\StatusEnumIntegerBacked;
-use OpenApi\Tests\Fixtures\PHP\StatusEnumStringBacked;
+use OpenApi\Tests\Fixtures\PHP\Enums\StatusEnum;
+use OpenApi\Tests\Fixtures\PHP\Enums\StatusEnumBacked;
+use OpenApi\Tests\Fixtures\PHP\Enums\StatusEnumIntegerBacked;
+use OpenApi\Tests\Fixtures\PHP\Enums\StatusEnumStringBacked;
 use OpenApi\Tests\OpenApiTestCase;
 
 class ExpandEnumsTest extends OpenApiTestCase
@@ -31,7 +31,7 @@ public function setUp(): void
 
     public function testExpandUnitEnum(): void
     {
-        $analysis = $this->analysisFromFixtures(['PHP/StatusEnum.php']);
+        $analysis = $this->analysisFromFixtures(['PHP/Enums/StatusEnum.php']);
         $analysis->process([new ExpandEnums()]);
         $schema = $analysis->getSchemaForSource(StatusEnum::class);
 
@@ -40,7 +40,7 @@ public function testExpandUnitEnum(): void
 
     public function testExpandBackedEnum(): void
     {
-        $analysis = $this->analysisFromFixtures(['PHP/StatusEnumBacked.php']);
+        $analysis = $this->analysisFromFixtures(['PHP/Enums/StatusEnumBacked.php']);
         $analysis->process([new ExpandEnums()]);
         $schema = $analysis->getSchemaForSource(StatusEnumBacked::class);
 
@@ -49,7 +49,7 @@ public function testExpandBackedEnum(): void
 
     public function testExpandBackedIntegerEnum(): void
     {
-        $analysis = $this->analysisFromFixtures(['PHP/StatusEnumIntegerBacked.php']);
+        $analysis = $this->analysisFromFixtures(['PHP/Enums/StatusEnumIntegerBacked.php']);
         $analysis->process([new ExpandEnums()]);
         $schema = $analysis->getSchemaForSource(StatusEnumIntegerBacked::class);
 
@@ -58,7 +58,7 @@ public function testExpandBackedIntegerEnum(): void
 
     public function testExpandBackedStringEnum(): void
     {
-        $analysis = $this->analysisFromFixtures(['PHP/StatusEnumStringBacked.php']);
+        $analysis = $this->analysisFromFixtures(['PHP/Enums/StatusEnumStringBacked.php']);
         $analysis->process([new ExpandEnums()]);
         $schema = $analysis->getSchemaForSource(StatusEnumStringBacked::class);
 
@@ -80,57 +80,57 @@ public function expandEnumClassStringFixtures(): iterable
 
         return [
             'statusEnum' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnum',
                 $mapValues(StatusEnum::cases()),
             ],
             'statusEnumMixed' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnumMixed',
                 $mapValues([StatusEnum::DRAFT, StatusEnum::ARCHIVED, 'OTHER']),
             ],
             'statusEnumBacked' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnumBacked',
                 $mapValues(StatusEnumBacked::cases()),
             ],
             'statusEnumBackedMixed' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnumBackedMixed',
                 $mapValues([StatusEnumBacked::DRAFT, StatusEnumBacked::ARCHIVED, 9]),
             ],
             'statusEnumIntegerBacked' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnumIntegerBacked',
                 $mapValues(StatusEnumIntegerBacked::cases()),
             ],
             'statusEnumStringBacked' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnumStringBacked',
                 $mapValues(StatusEnumStringBacked::cases()),
             ],
             'statusEnumStringBackedMixed' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnumStringBackedMixed',
                 $mapValues([StatusEnumStringBacked::DRAFT, StatusEnumStringBacked::ARCHIVED, 'other']),
             ],
             'statusEnums' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnums',
                 Generator::UNDEFINED,
             ],
             'itemsStatusEnumStringBacked' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'itemsStatusEnumStringBacked',
                 $mapValues(StatusEnumStringBacked::cases()),
             ],
             'statusEnumsMixed' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'statusEnumsMixed',
                 Generator::UNDEFINED,
             ],
             'itemsStatusEnumStringBackedMixed' => [
-                ['PHP/ReferencesEnum.php'],
+                ['PHP/Enums/ReferencesEnum.php'],
                 'itemsStatusEnumStringBackedMixed',
                 $mapValues([StatusEnumStringBacked::DRAFT, StatusEnumStringBacked::ARCHIVED, 'other']),
             ],