use class const fetch

apioo · Nov 4, 2024 · 038a677 · 038a677
1 parent 9b63bbb
commit 038a677
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/src/Generator/Php.php b/src/Generator/Php.php
@@ -301,7 +301,8 @@ private function getAttributesForDefinition(DefinitionTypeAbstract $type, array
             $mapping = $type->getMapping();
             if ($mapping !== null) {
                 foreach ($mapping as $class => $value) {
-                    $result[] = $this->newAttribute('DerivedType', [$this->newScalar($this->normalizer->class($class)), $this->newScalar($value)], $uses);
+                    $className = new Node\Expr\ClassConstFetch(new Node\Name($this->normalizer->class($class)), 'class');
+                    $result[] = $this->newAttribute('DerivedType', [$className, $this->newScalar($value)], $uses);
                 }
             }
         }

diff --git a/tests/Generator/resource/php/complex/CollectionDefinitionType.php b/tests/Generator/resource/php/complex/CollectionDefinitionType.php
@@ -10,8 +10,8 @@
 
 #[Description('Base collection type')]
 #[Discriminator('type')]
-#[DerivedType('MapDefinitionType', 'map')]
-#[DerivedType('ArrayDefinitionType', 'array')]
+#[DerivedType(MapDefinitionType::class, 'map')]
+#[DerivedType(ArrayDefinitionType::class, 'array')]
 abstract class CollectionDefinitionType extends DefinitionType implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     #[Description('')]

diff --git a/tests/Generator/resource/php/complex/DefinitionType.php b/tests/Generator/resource/php/complex/DefinitionType.php
@@ -10,9 +10,9 @@
 
 #[Description('Base definition type')]
 #[Discriminator('type')]
-#[DerivedType('StructDefinitionType', 'struct')]
-#[DerivedType('MapDefinitionType', 'map')]
-#[DerivedType('ArrayDefinitionType', 'array')]
+#[DerivedType(StructDefinitionType::class, 'struct')]
+#[DerivedType(MapDefinitionType::class, 'map')]
+#[DerivedType(ArrayDefinitionType::class, 'array')]
 abstract class DefinitionType implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?string $description = null;

diff --git a/tests/Generator/resource/php/complex/PropertyType.php b/tests/Generator/resource/php/complex/PropertyType.php
@@ -10,15 +10,15 @@
 
 #[Description('Base property type')]
 #[Discriminator('type')]
-#[DerivedType('StringPropertyType', 'string')]
-#[DerivedType('IntegerPropertyType', 'integer')]
-#[DerivedType('NumberPropertyType', 'number')]
-#[DerivedType('BooleanPropertyType', 'boolean')]
-#[DerivedType('MapPropertyType', 'map')]
-#[DerivedType('ArrayPropertyType', 'array')]
-#[DerivedType('AnyPropertyType', 'any')]
-#[DerivedType('GenericPropertyType', 'generic')]
-#[DerivedType('ReferencePropertyType', 'reference')]
+#[DerivedType(StringPropertyType::class, 'string')]
+#[DerivedType(IntegerPropertyType::class, 'integer')]
+#[DerivedType(NumberPropertyType::class, 'number')]
+#[DerivedType(BooleanPropertyType::class, 'boolean')]
+#[DerivedType(MapPropertyType::class, 'map')]
+#[DerivedType(ArrayPropertyType::class, 'array')]
+#[DerivedType(AnyPropertyType::class, 'any')]
+#[DerivedType(GenericPropertyType::class, 'generic')]
+#[DerivedType(ReferencePropertyType::class, 'reference')]
 abstract class PropertyType implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     protected ?string $description = null;

diff --git a/tests/Generator/resource/php/complex/ScalarPropertyType.php b/tests/Generator/resource/php/complex/ScalarPropertyType.php
@@ -10,10 +10,10 @@
 
 #[Description('Base scalar property type')]
 #[Discriminator('type')]
-#[DerivedType('StringPropertyType', 'string')]
-#[DerivedType('IntegerPropertyType', 'integer')]
-#[DerivedType('NumberPropertyType', 'number')]
-#[DerivedType('BooleanPropertyType', 'boolean')]
+#[DerivedType(StringPropertyType::class, 'string')]
+#[DerivedType(IntegerPropertyType::class, 'integer')]
+#[DerivedType(NumberPropertyType::class, 'number')]
+#[DerivedType(BooleanPropertyType::class, 'boolean')]
 abstract class ScalarPropertyType extends PropertyType implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
 }

diff --git a/tests/Generator/resource/php/complex/Security.php b/tests/Generator/resource/php/complex/Security.php
@@ -10,10 +10,10 @@
 
 #[Description('')]
 #[Discriminator('type')]
-#[DerivedType('SecurityHttpBasic', 'httpBasic')]
-#[DerivedType('SecurityHttpBearer', 'httpBearer')]
-#[DerivedType('SecurityApiKey', 'apiKey')]
-#[DerivedType('SecurityOAuth', 'oauth2')]
+#[DerivedType(SecurityHttpBasic::class, 'httpBasic')]
+#[DerivedType(SecurityHttpBearer::class, 'httpBearer')]
+#[DerivedType(SecurityApiKey::class, 'apiKey')]
+#[DerivedType(SecurityOAuth::class, 'oauth2')]
 abstract class Security implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     #[Description('The global security type of the API must be one of: httpBasic, httpBearer, apiKey or oauth2')]