Map the result of gettype for const properties to internal types to g…

…enerate valid code (fixes #29)
wol-soft · Jan 28, 2021 · 466523c · 466523c
1 parent 72ace3b
commit 466523c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/src/Model/GeneratorConfiguration.php b/src/Model/GeneratorConfiguration.php
@@ -127,10 +127,14 @@ public function getClassNameGenerator(): ClassNameGeneratorInterface
 
     /**
      * @param ClassNameGeneratorInterface $classNameGenerator
+     *
+     * @return $this
      */
-    public function setClassNameGenerator(ClassNameGeneratorInterface $classNameGenerator): void
+    public function setClassNameGenerator(ClassNameGeneratorInterface $classNameGenerator): self
     {
         $this->classNameGenerator = $classNameGenerator;
+
+        return $this;
     }
 
     /**

diff --git a/src/PropertyProcessor/Property/ConstProcessor.php b/src/PropertyProcessor/Property/ConstProcessor.php
@@ -18,16 +18,23 @@
  */
 class ConstProcessor implements PropertyProcessorInterface
 {
+    const TYPE_MAP = [
+        'boolean' => 'bool',
+        'integer' => 'int',
+        'double' => 'float',
+    ];
+
     /**
      * @inheritdoc
      */
     public function process(string $propertyName, JsonSchema $propertySchema): PropertyInterface
     {
         $json = $propertySchema->getJson();
+        $type = gettype($json['const']);
 
         $property = new Property(
             $propertyName,
-            gettype($json['const']),
+            self::TYPE_MAP[gettype($json['const'])] ?? $type,
             $propertySchema,
             $json['description'] ?? ''
         );

diff --git a/tests/Objects/ConstPropertyTest.php b/tests/Objects/ConstPropertyTest.php
@@ -25,9 +25,10 @@ public function testProvidedConstPropertyIsValid(): void
     {
         $className = $this->generateClassFromFile('ConstProperty.json');
 
-        $object = new $className(['property' => 'MyConstValue']);
+        $object = new $className(['stringProperty' => 'MyConstValue', 'integerProperty' => 42]);
 
-        $this->assertSame('MyConstValue', $object->getProperty());
+        $this->assertSame('MyConstValue', $object->getStringProperty());
+        $this->assertSame(42, $object->getIntegerProperty());
     }
 
     /**
@@ -38,7 +39,7 @@ public function testProvidedConstPropertyIsValid(): void
     public function testNotProvidedConstPropertyThrowsAnException(): void
     {
         $this->expectException(ValidationException::class);
-        $this->expectExceptionMessage('Invalid value for property declined by const constraint');
+        $this->expectExceptionMessage('Invalid value for stringProperty declined by const constraint');
 
         $className = $this->generateClassFromFile('ConstProperty.json');
 
@@ -57,11 +58,11 @@ public function testNotProvidedConstPropertyThrowsAnException(): void
     public function testNotMatchingProvidedDataThrowsAnException($propertyValue): void
     {
         $this->expectException(ValidationException::class);
-        $this->expectExceptionMessage('Invalid value for property declined by const constraint');
+        $this->expectExceptionMessage('Invalid value for stringProperty declined by const constraint');
 
         $className = $this->generateClassFromFile('ConstProperty.json');
 
-        new $className(['property' => $propertyValue]);
+        new $className(['stringProperty' => $propertyValue]);
     }
 
     public function invalidPropertyDataProvider(): array

diff --git a/tests/Schema/ConstPropertyTest/ConstProperty.json b/tests/Schema/ConstPropertyTest/ConstProperty.json
@@ -1,8 +1,11 @@
 {
   "type": "object",
   "properties": {
-    "property": {
+    "stringProperty": {
       "const": "MyConstValue"
+    },
+    "integerProperty": {
+      "const": 42
     }
   }
 }