Allow references to objects which provide an ID without trailing hash symbol

Author: wol-soft

src/Model/SchemaDefinition/SchemaDefinitionDictionary.php

@@ -70,7 +70,10 @@ public function setUpDefinitionDictionary(
     protected function fetchDefinitionsById(array $propertyData, SchemaProcessor $schemaProcessor, Schema $schema): void
     {
         if (isset($propertyData['$id'])) {
-            $this->addDefinition($propertyData['$id'], new SchemaDefinition($propertyData, $schemaProcessor, $schema));
+            $this->addDefinition(
+                strpos($propertyData['$id'], '#') === 0 ? $propertyData['$id'] : "#{$propertyData['$id']}",
+                new SchemaDefinition($propertyData, $schemaProcessor, $schema)
+            );
         }
 
         foreach ($propertyData as $item) {

src/Utils/ClassNameGenerator.php

@@ -23,7 +23,11 @@ public function getClassName(
         $className = sprintf(
             $isMergeClass ? '%s_Merged_%s' : '%s_%s',
             $currentClassName,
-            ucfirst($schema['$id'] ?? ($propertyName . ($currentClassName ? uniqid() : '')))
+            ucfirst(
+                $schema['$id']
+                    ? str_replace('#', '', $schema['$id'])
+                    : ($propertyName . ($currentClassName ? uniqid() : ''))
+            )
         );
 
         return ucfirst(preg_replace('/\W/', '', trim($className, '_')));

tests/Objects/ReferencePropertyTest.php

@@ -81,6 +81,14 @@ public function testNotProvidedOptionalReferenceObjectPropertyIsValid(string $re
         $this->assertNull($object->getPerson());
     }
 
+    public function testIdWithoutHashSymbolIsResolved(): void
+    {
+        $className = $this->generateClassFromFile('IdWithoutHashSymbolReference.json');
+
+        $object = new $className([]);
+        $this->assertNull($object->getPerson());
+    }
+
     /**
      * @dataProvider validReferenceObjectInputProvider
      *

tests/Schema/ReferencePropertyTest/IdWithoutHashSymbolReference.json

@@ -0,0 +1,22 @@
+{
+  "definitions": {
+    "person": {
+      "$id": "person",
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "age": {
+          "type": "integer"
+        }
+      }
+    }
+  },
+  "type": "object",
+  "properties": {
+    "person": {
+      "$ref": "#person"
+    }
+  }
+}