Resolve class names to refs in Discriminator::mapping (#1736)

Author: DerManoMann

docs/examples/specs/polymorphism/attributes/AbstractResponsible.php

@@ -17,8 +17,8 @@
     discriminator: new OAT\Discriminator(
         propertyName: 'type',
         mapping: [
-            'fl' => '#/components/schemas/FlResponsible',
-            'employee' => '#/components/schemas/EmployeeResponsible',
+            'fl' => Fl::class,
+            'employee' => Employee::class,
         ]
     )
 )]

src/Attributes/Schema.php

@@ -6,7 +6,6 @@
 
 namespace OpenApi\Attributes;
 
-use OpenApi\Annotations\Examples;
 use OpenApi\Generator;
 use OpenApi\Annotations as OA;
 

src/Generator.php

@@ -215,6 +215,7 @@ public function getProcessorPipeline(): Pipeline
                 new Processors\AugmentSchemas(),
                 new Processors\AugmentRequestBody(),
                 new Processors\AugmentProperties(),
+                new Processors\AugmentDiscriminators(),
                 new Processors\BuildPaths(),
                 new Processors\AugmentParameters(),
                 new Processors\AugmentRefs(),

src/Processors/AugmentDiscriminators.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Processors;
+
+use OpenApi\Analysis;
+use OpenApi\Annotations as OA;
+use OpenApi\Generator;
+
+/**
+ * Use the property context to extract useful information and inject that into the annotation.
+ */
+class AugmentDiscriminators
+{
+    public function __invoke(Analysis $analysis)
+    {
+        /** @var OA\Discriminator[] $discriminators */
+        $discriminators = $analysis->getAnnotationsOfType(OA\Discriminator::class);
+
+        foreach ($discriminators as $discriminator) {
+            if (!Generator::isDefault($discriminator->mapping)) {
+                foreach ($discriminator->mapping as $value => $type) {
+                    if (is_string($type) && $typeSchema = $analysis->getSchemaForSource($type)) {
+                        $discriminator->mapping[$value] = OA\Components::ref($typeSchema);
+                    }
+                }
+            }
+        }
+    }
+}

src/Processors/AugmentProperties.php

@@ -8,7 +8,6 @@
 
 use OpenApi\Analysis;
 use OpenApi\Annotations as OA;
-use OpenApi\Annotations\Components;
 use OpenApi\Context;
 use OpenApi\Generator;
 
@@ -82,15 +81,15 @@ protected function augmentType(Analysis $analysis, OA\Property $property, Contex
             if (!$this->mapNativeType($property, $type)) {
                 $schema = $analysis->getSchemaForSource($context->fullyQualifiedName($type));
                 if (Generator::isDefault($property->ref) && $schema) {
-                    $property->ref = Components::ref($schema);
+                    $property->ref = OA\Components::ref($schema);
                 }
             }
 
             // ok, so we possibly have a type or ref
             if (!Generator::isDefault($property->ref) && $typeMatches[2] === '' && !Generator::isDefault($property->nullable) && $property->nullable) {
                 $schema = $analysis->getSchemaForSource($context->fullyQualifiedName($type));
                 if ($schema) {
-                    $property->ref = Components::ref($schema);
+                    $property->ref = OA\Components::ref($schema);
                 }
             } elseif ($typeMatches[2] === '[]') {
                 if (Generator::isDefault($property->items)) {
@@ -147,11 +146,11 @@ protected function augmentType(Analysis $analysis, OA\Property $property, Contex
             if (!$this->mapNativeType($property, $type)) {
                 $schema = $analysis->getSchemaForSource($context->fullyQualifiedName($type));
                 if (Generator::isDefault($property->ref) && $schema) {
-                    $this->applyRef($analysis, $property, Components::ref($schema));
+                    $this->applyRef($analysis, $property, OA\Components::ref($schema));
                 } else {
                     if (is_string($context->type) && $typeSchema = $analysis->getSchemaForSource($context->type)) {
                         if (Generator::isDefault($property->format)) {
-                            $property->ref = Components::ref($typeSchema);
+                            $property->ref = OA\Components::ref($typeSchema);
                             $property->type = Generator::UNDEFINED;
                         }
                     }