Fixed keyword and instance location, if a path fragment is 0

Author: ro-pi

src/EvaluationContext/EvaluationContextTrait.php

@@ -22,7 +22,7 @@ trait EvaluationContextTrait
 
     public function pushSchema(
         \stdClass|bool|null $schema = null,
-        string $keywordLocationFragment = null,
+        ?string $keywordLocationFragment = null,
         ?string $baseUri = null,
         string $schemaLocation = ''
     ): void {
@@ -36,7 +36,7 @@ public function pushSchema(
             $schemaKeywordLocation = $schemaLocation;
         }
 
-        if ($keywordLocationFragment) {
+        if (is_string($keywordLocationFragment) && strlen($keywordLocationFragment)) {
             $schemaKeywordLocation .= '/' . $keywordLocationFragment;
             $keywordLocation = $currentStackEntry['keywordLocation'] . '/' . $keywordLocationFragment;
         } else {
@@ -126,7 +126,7 @@ public function getCurrentAbsoluteKeywordLocation(): ?string
         $currentStackEntry = $this->schemaStack[$this->schemaStackPointer];
 
         $baseUri = $currentStackEntry['baseUri'];
-        if (!$baseUri) {
+        if (!is_string($baseUri) || !strlen($baseUri)) {
             return null;
         }
 

src/EvaluationContext/RuntimeEvaluationContext.php

@@ -44,12 +44,12 @@ public function __construct(
         $this->draft = $staticEvaluationContext->config->defaultDraft;
     }
 
-    public function pushInstance(mixed &$instance, string $instanceLocationFragment = null): void
+    public function pushInstance(mixed &$instance, ?string $instanceLocationFragment = null): void
     {
-        if ($instanceLocationFragment === null) {
-            $instanceLocation = $this->getCurrentInstanceLocation();
-        } else {
+        if (is_string($instanceLocationFragment) && strlen($instanceLocationFragment)) {
             $instanceLocation = $this->getCurrentInstanceLocation() . '/' . $instanceLocationFragment;
+        } else {
+            $instanceLocation = $this->getCurrentInstanceLocation();
         }
 
         $this->instanceStack[++$this->instanceStackPointer] = [