From 0eea1baad4204b017f4a5ea6591be037a8e4d133 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Tue, 9 Jul 2019 14:53:05 +0200
Subject: [PATCH] Fix Psalm-issues in Configuration.php
---
lib/SimpleSAML/Configuration.php | 3 ++-
psalm.xml | 15 +--------------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index dbc37ebc2..25627f565 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -608,11 +608,12 @@ class Configuration implements Utils\ClearableState
$path = $this->configuration[$name];
}
+ $path = $this->resolvePath($path);
if ($path === null) {
return null;
}
- return $this->resolvePath($path).'/';
+ return $path.'/';
}
diff --git a/psalm.xml b/psalm.xml
index da1d4dbae..3a016ea55 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,20 +8,7 @@
allowStringToStandInForClass="true"
>
<projectFiles>
- <directory name="lib/SimpleSAML/Auth" />
- <directory name="lib/SimpleSAML/Bindings" />
- <directory name="lib/SimpleSAML/Error" />
- <directory name="lib/SimpleSAML/HTTP" />
- <directory name="lib/SimpleSAML/IdP" />
- <directory name="lib/SimpleSAML/Locale" />
- <directory name="lib/SimpleSAML/Logger" />
- <directory name="lib/SimpleSAML/Metadata" />
- <directory name="lib/SimpleSAML/Module" />
- <directory name="lib/SimpleSAML/Stats" />
- <directory name="lib/SimpleSAML/Store" />
- <directory name="lib/SimpleSAML/Utils" />
- <directory name="lib/SimpleSAML/XHTML" />
- <directory name="lib/SimpleSAML/XML" />
+ <directory name="lib/SimpleSAML" />
<!-- Replaces all modules/... with this one-liner for 2.0
<directory name="modules" />
--
GitLab