fix: include $id in schema resolving as draft-06 and upwards use $id as keyword

Author: DannyvdSluijs

src/JsonSchema/SchemaStorage.php

@@ -106,9 +106,10 @@ private function expandRefs(&$schema, ?string $parentId = null): void
                 continue;
             }
 
+            $schemaId = $this->findSchemaIdInObject($schema);
             $childId = $parentId;
-            if (property_exists($schema, 'id') && is_string($schema->id) && $childId !== $schema->id) {
-                $childId = $this->uriResolver->resolve($schema->id, $childId);
+            if (is_string($schemaId) && $childId !== $schemaId) {
+                $childId = $this->uriResolver->resolve($schemaId, $childId);
             }
 
             $this->expandRefs($member, $childId);
@@ -196,17 +197,30 @@ private function scanForSubschemas($schema, string $parentId): void
                 continue;
             }
 
-            if (property_exists($potentialSubSchema, 'id') && is_string($potentialSubSchema->id) && property_exists($potentialSubSchema, 'type')) {
+            $potentialSubSchemaId = $this->findSchemaIdInObject($potentialSubSchema);
+            if (is_string($potentialSubSchemaId) && property_exists($potentialSubSchema, 'type')) {
                 // Enum and const don't allow id as a keyword, see https://github.com/json-schema-org/JSON-Schema-Test-Suite/pull/471
                 if (in_array($propertyName, ['enum', 'const'])) {
                     continue;
                 }
 
                 // Found sub schema
-                $this->addSchema($this->uriResolver->resolve($potentialSubSchema->id, $parentId), $potentialSubSchema);
+                $this->addSchema($this->uriResolver->resolve($potentialSubSchemaId, $parentId), $potentialSubSchema);
             }
 
             $this->scanForSubschemas($potentialSubSchema, $parentId);
         }
     }
+
+    private function findSchemaIdInObject(object $schema): ?string
+    {
+        if (property_exists($schema, 'id') && is_string($schema->id)) {
+            return $schema->id;
+        }
+        if (property_exists($schema, '$id') && is_string($schema->{'$id'})) {
+            return $schema->{'$id'};
+        }
+
+        return null;
+    }
 }

src/JsonSchema/Validator.php

@@ -61,6 +61,9 @@ public function validate(&$value, $schema = null, ?int $checkMode = null): int
         if (LooseTypeCheck::propertyExists($schema, 'id')) {
             $schemaURI = LooseTypeCheck::propertyGet($schema, 'id');
         }
+        if (LooseTypeCheck::propertyExists($schema, '$id')) {
+            $schemaURI = LooseTypeCheck::propertyGet($schema, '$id');
+        }
         $this->factory->getSchemaStorage()->addSchema($schemaURI, $schema);
 
         $validator = $this->factory->createInstanceFor('schema');