tools(deps-dev): Update vimeo/psalm requirement from 5.26.1 to 6.0.0 …

…in /tools/psalm (#499) Signed-off-by: Jan Kowalleck <[email protected]>
CycloneDX · Jan 27, 2025 · e7c61ba · e7c61ba
1 parent 9660c47
commit e7c61ba
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/Core/Validation/BaseValidator.php b/src/Core/Validation/BaseValidator.php
@@ -51,8 +51,9 @@ protected function getSchemaFile(): string
         if (false === \is_string($schemaFile)) {
             throw new Exceptions\FailedLoadingSchemaException("Schema file unknown for specVersion: $specVersion->name");
         }
-        if (is_file($schemaFile) && is_readable($schemaFile)) {
-            return realpath($schemaFile);
+        $schemaPath = realpath($schemaFile);
+        if (\is_string($schemaPath) && is_file($schemaPath) && is_readable($schemaPath)) {
+            return $schemaPath;
         }
         // @codeCoverageIgnoreStart
         throw new Exceptions\FailedLoadingSchemaException("Schema file not readable: $schemaFile");

diff --git a/src/Core/Validation/Errors/JsonValidationError.php b/src/Core/Validation/Errors/JsonValidationError.php
@@ -37,12 +37,12 @@ class JsonValidationError extends ValidationError
     public static function fromSchemaValidationError(JsonSchema\Errors\ValidationError $error): static
     {
         $formatter = new JsonSchema\Errors\ErrorFormatter();
-        $instance = new static(
-            json_encode(
-                $formatter->format($error, true),
-                \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES
-            )
+        $message = json_encode(
+            $formatter->format($error, true),
+            \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES
         );
+        \assert(\is_string($message));
+        $instance = new static($message);
         $instance->error = $error;
 
         return $instance;

diff --git a/src/Core/Validation/Validators/XmlValidator.php b/src/Core/Validation/Validators/XmlValidator.php
@@ -88,7 +88,7 @@ private function validateDomWithSchema(DOMDocument $doc): ?LibXMLError
         libxml_clear_errors();
 
         $valid = $doc->schemaValidate($schema);
-        $error = $valid ? null : libxml_get_last_error();
+        $error = $valid ? null : (libxml_get_last_error() ?: null);
 
         libxml_clear_errors();
         libxml_use_internal_errors($prevXmlUIE);

diff --git a/tools/psalm/composer.json b/tools/psalm/composer.json
@@ -7,7 +7,7 @@
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
-        "vimeo/psalm": "5.26.1"
+        "vimeo/psalm": "^6.0.0"
     },
     "prefer-stable": true,
     "config": {