Restore original intent - assets / caching settings are mandatory

tvdijen · tvdijen · commit 6e7ce556da4c · 2022-03-16T12:43:19.000+01:00
diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
@@ -298,10 +298,9 @@ function ($val) {
             }
         }
 
-        /** @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,

Original file line number	Diff line number	Diff line change
`@@ -298,10 +298,9 @@ function ($val) {`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`301`		`- /** @psalm-var \SimpleSAML\Configuration $assetConfig */`
`302`		`- $assetConfig = $config->getOptionalConfigItem('assets', null);`
`303`		`- /** @psalm-var \SimpleSAML\Configuration $cacheConfig */`
`304`		`- $cacheConfig = $assetConfig ?: $assetConfig->getOptionalConfigItem('caching', null);`
	`301`	`+`
	`302`	`+ $assetConfig = $config->getConfigItem('assets');`
	`303`	`+ $cacheConfig = $assetConfig->getConfigItem('caching');`
`305`	`304`	`$response = new BinaryFileResponse($path);`
`306`	`305`	`$response->setCache([`
`307`	`306`	`// "public" allows response caching even if the request was authenticated,`