Fix missing required check for required referenced property inside a composition

Author: wol-soft

src/Model/Property/PropertyProxy.php

@@ -21,8 +21,6 @@ class PropertyProxy extends AbstractProperty
 {
     /** @var string */
     protected $key;
-    /** @var string */
-    protected $name;
     /** @var ResolvedDefinitionsCollection */
     protected $definitionsCollection;
 
@@ -249,4 +247,11 @@ public function isInternal(): bool
     {
         return $this->getProperty()->isInternal();
     }
+
+    public function __clone()
+    {
+        $cloneKey = $this->key . uniqid();
+        $this->definitionsCollection->offsetSet($cloneKey, clone $this->definitionsCollection->offsetGet($this->key));
+        $this->key = $cloneKey;
+    }
 }

tests/Objects/RequiredPropertyTest.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace PHPModelGenerator\Tests\Basic;
+namespace PHPModelGenerator\Tests\Objects;
 
+use PHPModelGenerator\Exception\ErrorRegistryException;
 use PHPModelGenerator\Exception\FileSystemException;
 use PHPModelGenerator\Exception\ValidationException;
 use PHPModelGenerator\Exception\RenderException;
@@ -41,6 +42,7 @@ public function requiredDefinitionsDataProvider(): array
             [
                 'Defined property' => ['RequiredStringProperty.json'],
                 'Undefined property' => ['RequiredUndefinedProperty.json'],
+                'Reference in composition' => ['RequiredReferencePropertyInComposition.json'],
             ]
         );
     }
@@ -67,12 +69,12 @@ public function validStringPropertyValueProvider(): array
      */
     public function testNotProvidedRequiredPropertyThrowsAnException(bool $implicitNull, string $file): void
     {
-        $this->expectException(ValidationException::class);
-        $this->expectExceptionMessage("Missing required value for property");
+        $this->expectException(ErrorRegistryException::class);
+        $this->expectExceptionMessageMatches("/Missing required value for property/");
 
         $className = $this->generateClassFromFile(
             $file,
-            (new GeneratorConfiguration())->setCollectErrors(false),
+            (new GeneratorConfiguration())->setCollectErrors(true),
             false,
             $implicitNull
         );
@@ -81,14 +83,14 @@ public function testNotProvidedRequiredPropertyThrowsAnException(bool $implicitN
     }
 
     /**
-     * @dataProvider implicitNullDataProvider
+     * @dataProvider requiredStringPropertyDataProvider
      *
      * @param bool $implicitNull
      */
-    public function testRequiredPropertyType(bool $implicitNull): void
+    public function testRequiredPropertyType(bool $implicitNull, string $schemaFile): void
     {
         $className = $this->generateClassFromFile(
-            'RequiredStringProperty.json',
+            $schemaFile,
             (new GeneratorConfiguration())->setImmutable(false),
             false,
             $implicitNull
@@ -125,26 +127,37 @@ public function testUndefinedRequiredPropertyType(bool $implicitNull): void
     }
 
     /**
-     * @dataProvider implicitNullDataProvider
+     * @dataProvider requiredStringPropertyDataProvider
      *
      * @param bool $implicitNull
      *
      * @throws FileSystemException
      * @throws RenderException
      * @throws SchemaException
      */
-    public function testNullProvidedForRequiredPropertyThrowsAnException(bool $implicitNull): void
+    public function testNullProvidedForRequiredPropertyThrowsAnException(bool $implicitNull, string $schemaFile): void
     {
-        $this->expectException(ValidationException::class);
-        $this->expectExceptionMessage("Invalid type for property");
+        $this->expectException(ErrorRegistryException::class);
+        $this->expectExceptionMessageMatches("/Invalid type for property/");
 
         $className = $this->generateClassFromFile(
-            'RequiredStringProperty.json',
-            (new GeneratorConfiguration())->setCollectErrors(false),
+            $schemaFile,
+            (new GeneratorConfiguration())->setCollectErrors(true),
             false,
             $implicitNull
         );
 
         new $className(['property' => null]);
     }
+
+    public function requiredStringPropertyDataProvider(): array
+    {
+        return $this->combineDataProvider(
+            $this->implicitNullDataProvider(),
+            [
+                'RequiredStringProperty' => ['RequiredStringProperty.json'],
+                'RequiredReferencePropertyInComposition' => ['RequiredReferencePropertyInComposition.json'],
+            ]
+        );
+    }
 }

tests/Schema/RequiredPropertyTest/RequiredReferencePropertyInComposition.json

@@ -0,0 +1,21 @@
+{
+  "type": "object",
+  "definitions": {
+    "property": {
+      "type": "string"
+    }
+  },
+  "allOf": [
+    {
+      "type": "object",
+      "properties": {
+        "property": {
+          "$ref": "#/definitions/property"
+        }
+      },
+      "required": [
+        "property"
+      ]
+    }
+  ]
+}