summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/psalm-baseline.xml6
-rw-r--r--lib/public/Log/functions.php1
2 files changed, 1 insertions, 6 deletions
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index e77d3cbee80..b4162099598 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1789,12 +1789,6 @@
<code>getAppsNeedingUpgrade</code>
<code>getIncompatibleApps</code>
</InternalMethod>
- <InvalidArgument occurrences="1">
- <code>$restrictions</code>
- </InvalidArgument>
- <RedundantCondition occurrences="1">
- <code>((array)$request-&gt;getParam('appid')) !== ''</code>
- </RedundantCondition>
</file>
<file src="lib/private/Accounts/AccountManager.php">
<InvalidArgument occurrences="1">
diff --git a/lib/public/Log/functions.php b/lib/public/Log/functions.php
index cc6961d8fba..ac043b4d958 100644
--- a/lib/public/Log/functions.php
+++ b/lib/public/Log/functions.php
@@ -49,6 +49,7 @@ use function class_exists;
* @since 24.0.0
*/
function logger(string $appId = null): LoggerInterface {
+ /** @psalm-suppress TypeDoesNotContainNull false-positive, it may contain null if we are logging from initialization */
if (!class_exists(OC::class) || OC::$server === null) {
// If someone calls this log before Nextcloud is initialized, there is
// no logging available. In that case we return a noop implementation