From 6e7ce556da4cf2169604b88bc2e7aa7348e837c0 Mon Sep 17 00:00:00 2001 From: Tim van Dijen <tvdijen@gmail.com> Date: Tue, 8 Mar 2022 16:56:57 +0100 Subject: [PATCH] Restore original intent - assets / caching settings are mandatory --- lib/SimpleSAML/Module.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php index bd59e4494..c23e4f643 100644 --- a/lib/SimpleSAML/Module.php +++ b/lib/SimpleSAML/Module.php @@ -298,10 +298,9 @@ class Module } } - /** @psalm-var \SimpleSAML\Configuration $assetConfig */ - $assetConfig = $config->getOptionalConfigItem('assets', null); - /** @psalm-var \SimpleSAML\Configuration $cacheConfig */ - $cacheConfig = $assetConfig ?: $assetConfig->getOptionalConfigItem('caching', null); + + $assetConfig = $config->getConfigItem('assets'); + $cacheConfig = $assetConfig->getConfigItem('caching'); $response = new BinaryFileResponse($path); $response->setCache([ // "public" allows response caching even if the request was authenticated, -- GitLab