Added support for non required const-properties

src/PropertyProcessor/Property/ConstProcessor.php

@@ -34,7 +34,9 @@ public function process(string $propertyName, JsonSchema $propertySchema): Prope
             $json['description'] ?? '',
         );
 
-        $property->setRequired($this->propertyMetaDataCollection->isAttributeRequired($propertyName));
+        $isAttributeRequired = $this->propertyMetaDataCollection->isAttributeRequired($propertyName);
+        $isImplicitNullAllowed = $this->schemaProcessor->getGeneratorConfiguration()->isImplicitNullAllowed();
+        $property->setRequired($isAttributeRequired || !$isImplicitNullAllowed);
 
         $check = $property->isRequired()
             ? '$value !== ' . var_export($json['const'], true)

tests/Objects/ConstPropertyTest.php

@@ -4,10 +4,12 @@
 
 namespace PHPModelGenerator\Tests\Objects;
 
+use PHPModelGenerator\Exception\ErrorRegistryException;
 use PHPModelGenerator\Exception\FileSystemException;
 use PHPModelGenerator\Exception\ValidationException;
 use PHPModelGenerator\Exception\RenderException;
 use PHPModelGenerator\Exception\SchemaException;
+use PHPModelGenerator\Model\GeneratorConfiguration;
 use PHPModelGenerator\Tests\AbstractPHPModelGeneratorTestCase;
 use stdClass;
 
@@ -33,6 +35,21 @@ public function testProvidedConstPropertyIsValid(): void
         $this->assertSame(42, $object->getIntegerProperty());
     }
 
+    /**
+     * @throws FileSystemException
+     * @throws RenderException
+     * @throws SchemaException
+     */
+    public function testNotProvidedConstPropertyThrowsAnException(): void
+    {
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessage('Invalid value for stringProperty declined by const constraint');
+
+        $className = $this->generateClassFromFile('ConstProperty.json', null, false, false);
+
+        new $className([]);
+    }
+
     /**
      * @dataProvider invalidPropertyDataProvider
      *
@@ -47,7 +64,7 @@ public function testNotMatchingProvidedDataThrowsAnException($propertyValue): vo
         $this->expectException(ValidationException::class);
         $this->expectExceptionMessage('Invalid value for stringProperty declined by const constraint');
 
-        $className = $this->generateClassFromFile('ConstProperty.json');
+        $className = $this->generateClassFromFile('ConstProperty.json', null, false, false);
 
         new $className(['stringProperty' => $propertyValue]);
     }
@@ -61,9 +78,76 @@ public function invalidPropertyDataProvider(): array
             'array' => [[]],
             'object' => [new stdClass()],
             'string' => ['null'],
+            'null' => [null],
         ];
     }
 
+    /**
+     * @throws FileSystemException
+     * @throws RenderException
+     * @throws SchemaException
+     */
+    public function testProvidedConstOnlyRequiredPropertyIsValid(): void
+    {
+        $className = $this->generateClassFromFile('RequiredAndOptionalConstProperties.json');
+
+        $object = new $className(['requiredProperty' => 'red']);
+
+        $this->assertSame('red', $object->getRequiredProperty());
+        $this->assertNull($object->getOptionalProperty());
+    }
+
+    /**
+     * @throws FileSystemException
+     * @throws RenderException
+     * @throws SchemaException
+     */
+    public function testProvidedNullOptionalPropertyConstPropertyIsValid(): void
+    {
+        $className = $this->generateClassFromFile('RequiredAndOptionalConstProperties.json');
+
+        $object = new $className(['requiredProperty' => 'red', 'optionalProperty' => null]);
+
+        $this->assertSame('red', $object->getRequiredProperty());
+        $this->assertNull($object->getOptionalProperty());
+    }
+
+    /**
+     * @dataProvider requiredAndOptionalPropertiesDataProvider
+     *
+     * @throws FileSystemException
+     * @throws RenderException
+     * @throws SchemaException
+     */
+    public function testProvidedConstPropertiesIsValidWithDifferentImplicitNull(
+        bool $implicitNull,
+        string $reqPropertyValue,
+        string $optPropertyValue
+    ): void
+    {
+        $className = $this->generateClassFromFile(
+            'RequiredAndOptionalConstProperties.json',
+            new GeneratorConfiguration(),
+            false,
+            $implicitNull,
+        );
+
+        $object = new $className(['requiredProperty' => $reqPropertyValue, 'optionalProperty' => $optPropertyValue]);
+
+        $this->assertSame($reqPropertyValue, $object->getRequiredProperty());
+        $this->assertSame($optPropertyValue, $object->getOptionalProperty());
+    }
+
+    public function requiredAndOptionalPropertiesDataProvider(): array
+    {
+        return $this->combineDataProvider(
+            $this->implicitNullDataProvider(),
+            [
+                ['red', 'green'],
+            ],
+        );
+    }
+
     /**
      * @dataProvider invalidRequiredAndOptionalConstPropertiesDataProvider
      *
@@ -72,27 +156,36 @@ public function invalidPropertyDataProvider(): array
      * @throws SchemaException
      */
     public function testNotMatchingRequiredAndOptionalProvidedDataThrowsAnException(
+        bool $implicitNull,
         string $reqPropertyValue,
         ?string $optPropertyValue,
         string $exceptionMessage
     ): void
     {
-        $className = $this->generateClassFromFile('RequiredAndOptionalConstProperties.json');
+        $className = $this->generateClassFromFile(
+            'RequiredAndOptionalConstProperties.json',
+            new GeneratorConfiguration(),
+            false,
+            $implicitNull,
+        );
 
-        $this->expectException(ValidationException::class);
+        $this->expectException(ErrorRegistryException::class);
         $this->expectExceptionMessage($exceptionMessage);
 
         new $className(['requiredProperty' => $reqPropertyValue, 'optionalProperty' => $optPropertyValue]);
     }
 
     public function invalidRequiredAndOptionalConstPropertiesDataProvider(): array
     {
-        return [
-            ['blue', 'green', 'Invalid value for requiredProperty declined by const constraint'],
-            ['blue', null, 'Invalid value for requiredProperty declined by const constraint'],
-            ['red', 'blue', 'Invalid value for optionalProperty declined by const constraint'],
-            ['red', '0', 'Invalid value for optionalProperty declined by const constraint'],
-            ['red', '', 'Invalid value for optionalProperty declined by const constraint'],
-        ];
+        return $this->combineDataProvider(
+            $this->implicitNullDataProvider(),
+            [
+                ['blue', 'green', 'Invalid value for requiredProperty declined by const constraint'],
+                ['blue', null, 'Invalid value for requiredProperty declined by const constraint'],
+                ['red', 'blue', 'Invalid value for optionalProperty declined by const constraint'],
+                ['red', '0', 'Invalid value for optionalProperty declined by const constraint'],
+                ['red', '', 'Invalid value for optionalProperty declined by const constraint'],
+            ],
+        );
     }
 }

tests/Objects/RequiredPropertyTest.php

@@ -162,29 +162,4 @@ public function requiredStringPropertyDataProvider(): array
             ],
         );
     }
-
-    /**
-     * @dataProvider requiredAndOptionalPropertiesDataProvider
-     *
-     * @throws FileSystemException
-     * @throws RenderException
-     * @throws SchemaException
-     */
-    public function testProvidedConstPropertiesIsValid(string $reqPropertyValue, ?string $optPropertyValue): void
-    {
-        $className = $this->generateClassFromFile('RequiredAndOptionalConstProperties.json');
-
-        $object = new $className(['requiredProperty' => $reqPropertyValue, 'optionalProperty' => $optPropertyValue]);
-
-        $this->assertSame($reqPropertyValue, $object->getRequiredProperty());
-        $this->assertSame($optPropertyValue, $object->getOptionalProperty());
-    }
-
-    public function requiredAndOptionalPropertiesDataProvider(): array
-    {
-        return [
-            ['red', 'green'],
-            ['red', null],
-        ];
-    }
 }