+
+
+
diff --git a/public/_include.php b/public/_include.php
index 6796668b09..0b2dba0128 100644
--- a/public/_include.php
+++ b/public/_include.php
@@ -24,7 +24,7 @@
Configuration::getInstance();
} catch (Exception $e) {
throw new Error\CriticalConfigurationError(
- $e->getMessage()
+ $e->getMessage(),
);
}
diff --git a/src/SimpleSAML/Auth/AuthenticationFactory.php b/src/SimpleSAML/Auth/AuthenticationFactory.php
index 2266ef17f1..86a33787e3 100644
--- a/src/SimpleSAML/Auth/AuthenticationFactory.php
+++ b/src/SimpleSAML/Auth/AuthenticationFactory.php
@@ -18,7 +18,7 @@ class AuthenticationFactory
*/
public function __construct(
protected Configuration $config,
- protected Session $session
+ protected Session $session,
) {
}
diff --git a/src/SimpleSAML/Auth/ProcessingChain.php b/src/SimpleSAML/Auth/ProcessingChain.php
index cebc80c26a..4a51a1a153 100644
--- a/src/SimpleSAML/Auth/ProcessingChain.php
+++ b/src/SimpleSAML/Auth/ProcessingChain.php
@@ -138,7 +138,7 @@ private static function parseFilterList(array $filterSrc): array
if (!is_array($filter)) {
throw new Exception(
"Invalid authentication processing filter configuration: " .
- "One of the filters wasn't a string or an array."
+ "One of the filters wasn't a string or an array.",
);
}
@@ -166,7 +166,7 @@ private static function parseFilter(array $config, int $priority): ProcessingFil
$className = Module::resolveClass(
$config['class'],
'Auth\Process',
- '\SimpleSAML\Auth\ProcessingFilter'
+ '\SimpleSAML\Auth\ProcessingFilter',
);
$config['%priority'] = $priority;
unset($config['class']);
diff --git a/src/SimpleSAML/Auth/ProcessingFilter.php b/src/SimpleSAML/Auth/ProcessingFilter.php
index 81baf71c0a..e920a68d62 100644
--- a/src/SimpleSAML/Auth/ProcessingFilter.php
+++ b/src/SimpleSAML/Auth/ProcessingFilter.php
@@ -75,7 +75,7 @@ public function checkPrecondition(array &$state): bool
{
$function = /** @return bool */ function (
array &$attributes,
- array &$state
+ array &$state,
) {
return eval($this->precondition);
};
diff --git a/src/SimpleSAML/Auth/Simple.php b/src/SimpleSAML/Auth/Simple.php
index 8275444934..d42c47e3d3 100644
--- a/src/SimpleSAML/Auth/Simple.php
+++ b/src/SimpleSAML/Auth/Simple.php
@@ -36,7 +36,7 @@ class Simple
public function __construct(
protected string $authSource,
Configuration $config = null,
- Session $session = null
+ Session $session = null,
) {
if ($config === null) {
$config = Configuration::getInstance();
@@ -380,7 +380,7 @@ protected function getProcessedURL(?string $url = null): string
$base = trim($this->app_config->getOptionalString(
'baseURL',
- $scheme . '://' . $host . $port
+ $scheme . '://' . $host . $port,
), '/');
return $base . $path . ($query ? '?' . $query : '') . ($fragment ? '#' . $fragment : '');
}
diff --git a/src/SimpleSAML/Auth/Source.php b/src/SimpleSAML/Auth/Source.php
index ef8e54f29e..81af7a2842 100644
--- a/src/SimpleSAML/Auth/Source.php
+++ b/src/SimpleSAML/Auth/Source.php
@@ -174,8 +174,8 @@ public function initLogin(string|array $return, ?string $errorURL = null, array
'\SimpleSAML\Auth\Source.id' => $this->authId,
'\SimpleSAML\Auth\Source.Return' => $return,
'\SimpleSAML\Auth\Source.ErrorURL' => $errorURL,
- 'LoginCompletedHandler' => [get_class(), 'loginCompleted'],
- 'LogoutCallback' => [get_class(), 'logoutCallback'],
+ 'LoginCompletedHandler' => [static::class, 'loginCompleted'],
+ 'LogoutCallback' => [static::class, 'logoutCallback'],
'LogoutCallbackState' => [
'\SimpleSAML\Auth\Source.logoutSource' => $this->authId,
],
@@ -302,7 +302,7 @@ private static function parseAuthSource(string $authId, array $config): Source
$factoryClass = Module::resolveClass(
$id,
'Auth\Source\Factory',
- '\SimpleSAML\Auth\SourceFactory'
+ '\SimpleSAML\Auth\SourceFactory',
);
/** @var SourceFactory $factory */
@@ -346,8 +346,7 @@ public static function getById(string $authId, ?string $type = null): ?Source
if ($authConfig === null) {
if ($type !== null) {
throw new Error\Exception(
- 'No authentication source with id ' .
- var_export($authId, true) . ' found.'
+ 'No authentication source with id ' . var_export($authId, true) . ' found.',
);
}
return null;
@@ -363,7 +362,7 @@ public static function getById(string $authId, ?string $type = null): ?Source
throw new Error\Exception(
'Invalid type of authentication source ' .
var_export($authId, true) . '. Was ' . var_export(get_class($ret), true) .
- ', should be ' . var_export($type, true) . '.'
+ ', should be ' . var_export($type, true) . '.',
);
}
@@ -382,8 +381,7 @@ public static function logoutCallback(array $state): void
$session = Session::getSessionFromRequest();
if (!$session->isValid($source)) {
Logger::warning(
- 'Received logout from an invalid authentication source ' .
- var_export($source, true)
+ 'Received logout from an invalid authentication source ' . var_export($source, true),
);
return;
@@ -430,7 +428,7 @@ protected function addLogoutCallback(string $assoc, array $state): void
'\SimpleSAML\Auth\Source.LogoutCallbacks',
$id,
$data,
- Session::DATA_TIMEOUT_SESSION_END
+ Session::DATA_TIMEOUT_SESSION_END,
);
}
@@ -497,7 +495,7 @@ protected static function validateSource(array $source, string $id): void
if (!array_key_exists(0, $source) || !is_string($source[0])) {
throw new \Exception(
'Invalid authentication source \'' . $id .
- '\': First element must be a string which identifies the authentication source.'
+ '\': First element must be a string which identifies the authentication source.',
);
}
}
diff --git a/src/SimpleSAML/Auth/State.php b/src/SimpleSAML/Auth/State.php
index af88a6a29d..814b4394b6 100644
--- a/src/SimpleSAML/Auth/State.php
+++ b/src/SimpleSAML/Auth/State.php
@@ -128,7 +128,7 @@ public static function getPersistentAuthData(array $state): array
'LogoutState',
'AuthInstant',
'RememberMe',
- 'saml:sp:NameID'
+ 'saml:sp:NameID',
];
foreach ($mandatory as $key) {
if (isset($state[$key])) {
@@ -366,7 +366,7 @@ public static function throwException(array $state, Error\Exception $exception):
// Redirect to the exception handler
$httpUtils->redirectTrustedURL(
$state[self::EXCEPTION_HANDLER_URL],
- [self::EXCEPTION_PARAM => $id]
+ [self::EXCEPTION_PARAM => $id],
);
} elseif (array_key_exists(self::EXCEPTION_HANDLER_FUNC, $state)) {
// Call the exception handler
diff --git a/src/SimpleSAML/Command/RouterDebugCommand.php b/src/SimpleSAML/Command/RouterDebugCommand.php
index 0d26145dbb..34110908c8 100644
--- a/src/SimpleSAML/Command/RouterDebugCommand.php
+++ b/src/SimpleSAML/Command/RouterDebugCommand.php
@@ -26,7 +26,7 @@ class RouterDebugCommand extends Command
* @throws \Symfony\Component\Console\Exception\LogicException When the command name is empty
*/
public function __construct(
- protected RouterInterface $router
+ protected RouterInterface $router,
) {
parent::__construct();
}
@@ -43,7 +43,7 @@ protected function configure(): void
The %command.name% displays the configured routes for a module:
php %command.full_name%
-EOF
+EOF,
)
;
}
diff --git a/src/SimpleSAML/Command/UnusedTranslatableStringsCommand.php b/src/SimpleSAML/Command/UnusedTranslatableStringsCommand.php
index e971098aae..0fbca29db1 100644
--- a/src/SimpleSAML/Command/UnusedTranslatableStringsCommand.php
+++ b/src/SimpleSAML/Command/UnusedTranslatableStringsCommand.php
@@ -45,7 +45,7 @@ protected function configure(): void
'logging.handler' => ArrayLogger::class,
]),
'config.php',
- 'simplesaml'
+ 'simplesaml',
);
$this->setDescription('Generates a list of translations that are no longer in used in PHP or Twig files');
diff --git a/src/SimpleSAML/Command/UpdateTranslatableStringsCommand.php b/src/SimpleSAML/Command/UpdateTranslatableStringsCommand.php
index 24c44e8415..67af854b27 100644
--- a/src/SimpleSAML/Command/UpdateTranslatableStringsCommand.php
+++ b/src/SimpleSAML/Command/UpdateTranslatableStringsCommand.php
@@ -50,7 +50,7 @@ protected function configure(): void
'logging.handler' => ArrayLogger::class,
]),
'config.php',
- 'simplesaml'
+ 'simplesaml',
);
$this->setDescription(
diff --git a/src/SimpleSAML/Configuration.php b/src/SimpleSAML/Configuration.php
index 4fd54f01dd..a77e13ec55 100644
--- a/src/SimpleSAML/Configuration.php
+++ b/src/SimpleSAML/Configuration.php
@@ -40,7 +40,7 @@ class Configuration implements Utils\ClearableState
/**
* The release version of this package
*/
- public const VERSION = '2.1.6';
+ public const VERSION = '2.1.7';
/**
* A default value which means that the given option is required.
@@ -61,7 +61,7 @@ class Configuration implements Utils\ClearableState
"style-src 'self'; " .
"font-src 'self'; " .
"connect-src 'self'; " .
- "media-src data:;" .
+ "media-src data:; " .
"img-src 'self' data:; " .
"base-uri 'none'",
'X-Frame-Options' => 'SAMEORIGIN',
@@ -171,7 +171,7 @@ private static function loadFromFile(string $filename, bool $required): Configur
if (!isset($config)) {
throw new Error\ConfigurationError(
'$config is not defined in the configuration file.',
- $filename
+ $filename,
);
}
@@ -179,7 +179,7 @@ private static function loadFromFile(string $filename, bool $required): Configur
if (!is_array($config)) {
throw new Error\ConfigurationError(
'$config is not an array.',
- $filename
+ $filename,
);
}
@@ -187,7 +187,7 @@ private static function loadFromFile(string $filename, bool $required): Configur
if (empty($config)) {
throw new Error\ConfigurationError(
'$config is empty.',
- $filename
+ $filename,
);
}
} elseif ($required) {
@@ -207,7 +207,7 @@ private static function loadFromFile(string $filename, bool $required): Configur
if ($spurious_output) {
Logger::warning(
- "The configuration file '$filename' generates output. Please review your configuration."
+ "The configuration file '$filename' generates output. Please review your configuration.",
);
}
@@ -241,7 +241,7 @@ public static function setConfigDir(string $path, string $configSet = 'simplesam
public static function setPreLoadedConfig(
Configuration $config,
string $filename = 'config.php',
- string $configSet = 'simplesaml'
+ string $configSet = 'simplesaml',
): void {
if (!array_key_exists($configSet, self::$configDirs)) {
if ($configSet !== 'simplesaml') {
@@ -269,7 +269,7 @@ public static function setPreLoadedConfig(
*/
public static function getConfig(
string $filename = 'config.php',
- string $configSet = 'simplesaml'
+ string $configSet = 'simplesaml',
): Configuration {
if (!array_key_exists($configSet, self::$configDirs)) {
if ($configSet !== 'simplesaml') {
@@ -299,7 +299,7 @@ public static function getConfig(
*/
public static function getOptionalConfig(
string $filename = 'config.php',
- string $configSet = 'simplesaml'
+ string $configSet = 'simplesaml',
): Configuration {
if (!array_key_exists($configSet, self::$configDirs)) {
if ($configSet !== 'simplesaml') {
@@ -330,7 +330,7 @@ public static function getOptionalConfig(
public static function loadFromArray(
array $config,
string $location = '[ARRAY]',
- ?string $instance = null
+ ?string $instance = null,
): Configuration {
$c = new Configuration($config, $location);
if ($instance !== null) {
@@ -371,7 +371,7 @@ public static function getInstance(string $instancename = 'simplesaml'): Configu
}
throw new Error\CriticalConfigurationError(
- 'Configuration with name ' . $instancename . ' is not initialized.'
+ 'Configuration with name ' . $instancename . ' is not initialized.',
);
}
@@ -504,7 +504,7 @@ public function getBasePath(): string
$this->getOptionalString('baseurlpath', 'simplesaml/') . '". Valid format is in the form' .
' [(http|https)://(hostname|fqdn)[:port]]/[path/to/simplesaml/].',
$this->filename,
- $c
+ $c,
);
}
@@ -668,7 +668,7 @@ public function getOptionalBoolean(string $name, ?bool $default): ?bool
sprintf(
'%s: The option %s is not a valid boolean value or null.',
$this->location,
- var_export($name, true)
+ var_export($name, true),
),
);
@@ -722,7 +722,7 @@ public function getOptionalString(string $name, ?string $default): ?string
sprintf(
'%s: The option %s is not a valid string value or null.',
$this->location,
- var_export($name, true)
+ var_export($name, true),
),
);
@@ -776,7 +776,7 @@ public function getOptionalInteger(string $name, ?int $default): ?int
sprintf(
'%s: The option %s is not a valid integer value or null.',
$this->location,
- var_export($name, true)
+ var_export($name, true),
),
);
@@ -1440,7 +1440,7 @@ public function getPublicKeys(?string $use = null, bool $required = false, strin
if ($data === null) {
throw new Exception(
- $this->location . ': Unable to load certificate/public key from location "' . $location . '".'
+ $this->location . ': Unable to load certificate/public key from location "' . $location . '".',
);
}
@@ -1448,7 +1448,7 @@ public function getPublicKeys(?string $use = null, bool $required = false, strin
$pattern = '/^-----BEGIN CERTIFICATE-----([^-]*)^-----END CERTIFICATE-----/m';
if (!preg_match($pattern, $data, $matches)) {
throw new Error\Exception(
- $this->location . ': Could not find PEM encoded certificate in "' . $location . '".'
+ $this->location . ': Could not find PEM encoded certificate in "' . $location . '".',
);
}
$certData = preg_replace('/\s+/', '', $matches[1]);
diff --git a/src/SimpleSAML/Console/Application.php b/src/SimpleSAML/Console/Application.php
index d4e5fb8c4c..c5dd8af612 100644
--- a/src/SimpleSAML/Console/Application.php
+++ b/src/SimpleSAML/Console/Application.php
@@ -19,7 +19,7 @@ public function __construct(Kernel $kernel)
$inputDefinition = $this->getDefinition();
$inputDefinition->addOption(
- new InputOption('--module', '-m', InputOption::VALUE_REQUIRED, 'The module name', $kernel->getModule())
+ new InputOption('--module', '-m', InputOption::VALUE_REQUIRED, 'The module name', $kernel->getModule()),
);
}
}
diff --git a/src/SimpleSAML/Database.php b/src/SimpleSAML/Database.php
index c7caa1cf80..094ff03670 100644
--- a/src/SimpleSAML/Database.php
+++ b/src/SimpleSAML/Database.php
@@ -94,7 +94,7 @@ private function __construct(Configuration $config)
$config->getString('database.dsn'),
$config->getOptionalString('database.username', null),
$config->getOptionalString('database.password', null),
- $driverOptions
+ $driverOptions,
);
// TODO: deprecated: the "database.slave" terminology is preserved here for backwards compatibility.
@@ -116,8 +116,8 @@ private function __construct(Configuration $config)
$secondary['dsn'],
$secondary['username'],
$secondary['password'],
- $driverOptions
- )
+ $driverOptions,
+ ),
);
}
$this->tablePrefix = $config->getOptionalString('database.prefix', '');
diff --git a/src/SimpleSAML/Error/AuthSource.php b/src/SimpleSAML/Error/AuthSource.php
index b2afa9ae28..7bf8a71caf 100644
--- a/src/SimpleSAML/Error/AuthSource.php
+++ b/src/SimpleSAML/Error/AuthSource.php
@@ -25,7 +25,7 @@ class AuthSource extends Error
public function __construct(
private string $authsource,
private string $reason,
- Throwable $cause = null
+ Throwable $cause = null,
) {
$this->authsource = $authsource;
$this->reason = $reason;
diff --git a/src/SimpleSAML/Error/BadRequest.php b/src/SimpleSAML/Error/BadRequest.php
index 5193b35ab8..3c1ea29242 100644
--- a/src/SimpleSAML/Error/BadRequest.php
+++ b/src/SimpleSAML/Error/BadRequest.php
@@ -21,7 +21,7 @@ class BadRequest extends Error
* @param string $reason Description of why the request was unacceptable.
*/
public function __construct(
- protected string $reason
+ protected string $reason,
) {
parent::__construct(['BADREQUEST', '%REASON%' => $this->reason]);
$this->httpCode = 400;
diff --git a/src/SimpleSAML/Error/CriticalConfigurationError.php b/src/SimpleSAML/Error/CriticalConfigurationError.php
index 4c9b9d187a..09b0d6779c 100644
--- a/src/SimpleSAML/Error/CriticalConfigurationError.php
+++ b/src/SimpleSAML/Error/CriticalConfigurationError.php
@@ -60,7 +60,7 @@ public function __construct(string $reason = null, string $file = null, array $c
Configuration::loadFromArray(
$config,
'',
- 'simplesaml'
+ 'simplesaml',
);
parent::__construct($reason, $file);
}
diff --git a/src/SimpleSAML/Error/MetadataNotFound.php b/src/SimpleSAML/Error/MetadataNotFound.php
index 0e605a72fe..e88c98582c 100644
--- a/src/SimpleSAML/Error/MetadataNotFound.php
+++ b/src/SimpleSAML/Error/MetadataNotFound.php
@@ -22,7 +22,7 @@ public function __construct(string $entityId)
$this->includeTemplate = 'core:no_metadata.twig';
parent::__construct([
'METADATANOTFOUND',
- '%ENTITYID%' => $entityId
+ '%ENTITYID%' => $entityId,
]);
}
}
diff --git a/src/SimpleSAML/Error/NotFound.php b/src/SimpleSAML/Error/NotFound.php
index d18764e5bb..df8d704278 100644
--- a/src/SimpleSAML/Error/NotFound.php
+++ b/src/SimpleSAML/Error/NotFound.php
@@ -23,7 +23,7 @@ class NotFound extends Error
* @param string $reason Optional description of why the given page could not be found.
*/
public function __construct(
- private ?string $reason = null
+ private ?string $reason = null,
) {
$httpUtils = new Utils\HTTP();
$url = $httpUtils->getSelfURL();
diff --git a/src/SimpleSAML/HTTP/RunnableResponse.php b/src/SimpleSAML/HTTP/RunnableResponse.php
index 572c2d2e5c..738acf0431 100644
--- a/src/SimpleSAML/HTTP/RunnableResponse.php
+++ b/src/SimpleSAML/HTTP/RunnableResponse.php
@@ -28,7 +28,7 @@ class RunnableResponse extends Response
*/
public function __construct(
callable $callable,
- protected array $arguments = []
+ protected array $arguments = [],
) {
$this->callable = $callable;
$this->setCharset('UTF-8');
diff --git a/src/SimpleSAML/IdP.php b/src/SimpleSAML/IdP.php
index b2fa20eef6..2270dff0ed 100644
--- a/src/SimpleSAML/IdP.php
+++ b/src/SimpleSAML/IdP.php
@@ -275,7 +275,7 @@ public static function postAuthProc(array $state): void
'core:idp-ssotime',
$state['core:IdP'] . ';' . $state['core:SP'],
time(),
- Session::DATA_TIMEOUT_SESSION_END
+ Session::DATA_TIMEOUT_SESSION_END,
);
}
diff --git a/src/SimpleSAML/IdP/IFrameLogoutHandler.php b/src/SimpleSAML/IdP/IFrameLogoutHandler.php
index cb29f20d41..134fd8840a 100644
--- a/src/SimpleSAML/IdP/IFrameLogoutHandler.php
+++ b/src/SimpleSAML/IdP/IFrameLogoutHandler.php
@@ -26,7 +26,7 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
* @param \SimpleSAML\IdP $idp The IdP to log out from.
*/
public function __construct(
- private IdP $idp
+ private IdP $idp,
) {
}
diff --git a/src/SimpleSAML/IdP/TraditionalLogoutHandler.php b/src/SimpleSAML/IdP/TraditionalLogoutHandler.php
index 0ce1e240e0..06e3e021cb 100644
--- a/src/SimpleSAML/IdP/TraditionalLogoutHandler.php
+++ b/src/SimpleSAML/IdP/TraditionalLogoutHandler.php
@@ -25,7 +25,7 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
* @param \SimpleSAML\IdP $idp The IdP to log out from.
*/
public function __construct(
- private IdP $idp
+ private IdP $idp,
) {
}
diff --git a/src/SimpleSAML/Kernel.php b/src/SimpleSAML/Kernel.php
index 2abaacefe1..ab30f77cfb 100644
--- a/src/SimpleSAML/Kernel.php
+++ b/src/SimpleSAML/Kernel.php
@@ -169,12 +169,12 @@ private function registerModuleControllers(ContainerBuilder $container): void
$loader = new DirectoryLoader(
$container,
- new FileLocator($controllerDir . '/')
+ new FileLocator($controllerDir . '/'),
);
$loader->registerClasses(
$definition,
'SimpleSAML\\Module\\' . $this->module . '\\Controller\\',
- $controllerDir . '/*'
+ $controllerDir . '/*',
);
} catch (FileLocatorFileNotFoundException $e) {
}
diff --git a/src/SimpleSAML/Locale/Language.php b/src/SimpleSAML/Locale/Language.php
index dfbd0b4424..107cf119e9 100644
--- a/src/SimpleSAML/Locale/Language.php
+++ b/src/SimpleSAML/Locale/Language.php
@@ -143,7 +143,7 @@ class Language
* @param \SimpleSAML\Configuration $configuration Configuration object
*/
public function __construct(
- private Configuration $configuration
+ private Configuration $configuration,
) {
$this->availableLanguages = $this->getInstalledLanguages();
$this->defaultLanguage = $configuration->getOptionalString('language.default', self::FALLBACKLANGUAGE);
@@ -153,7 +153,7 @@ public function __construct(
if (isset($_GET[$this->languageParameterName])) {
$this->setLanguage(
$_GET[$this->languageParameterName],
- $configuration->getOptionalBoolean('language.parameter.setcookie', true)
+ $configuration->getOptionalBoolean('language.parameter.setcookie', true),
);
}
}
@@ -168,7 +168,7 @@ private function getInstalledLanguages(): array
{
$configuredAvailableLanguages = $this->configuration->getOptionalArray(
'language.available',
- [self::FALLBACKLANGUAGE]
+ [self::FALLBACKLANGUAGE],
);
$availableLanguages = [];
foreach ($configuredAvailableLanguages as $code) {
diff --git a/src/SimpleSAML/Locale/Localization.php b/src/SimpleSAML/Locale/Localization.php
index f08cdd0b70..e355f2d6eb 100644
--- a/src/SimpleSAML/Locale/Localization.php
+++ b/src/SimpleSAML/Locale/Localization.php
@@ -69,7 +69,7 @@ class Localization
* @param \SimpleSAML\Configuration $configuration Configuration object
*/
public function __construct(
- private Configuration $configuration
+ private Configuration $configuration,
) {
/** @var string $locales */
$locales = $configuration->resolvePath('locales');
@@ -218,7 +218,7 @@ private function setupTranslator(): void
*/
private function loadGettextGettextFromPO(
string $domain = self::DEFAULT_DOMAIN,
- bool $catchException = true
+ bool $catchException = true,
): void {
try {
$langPath = $this->getLangPath($domain);
@@ -238,7 +238,7 @@ private function loadGettextGettextFromPO(
$translations = (new MoLoader())->loadFile($file->getRealPath());
$arrayGenerator = new ArrayGenerator();
$this->translator->addTranslations(
- $arrayGenerator->generateArray($translations)
+ $arrayGenerator->generateArray($translations),
);
} else {
$file = new File($langPath . $domain . '.po', false);
@@ -246,7 +246,7 @@ private function loadGettextGettextFromPO(
$translations = (new PoLoader())->loadFile($file->getRealPath());
$arrayGenerator = new ArrayGenerator();
$this->translator->addTranslations(
- $arrayGenerator->generateArray($translations)
+ $arrayGenerator->generateArray($translations),
);
} else {
Logger::debug(sprintf(
diff --git a/src/SimpleSAML/Locale/Translate.php b/src/SimpleSAML/Locale/Translate.php
index c848d1d919..cd3b41fcb7 100644
--- a/src/SimpleSAML/Locale/Translate.php
+++ b/src/SimpleSAML/Locale/Translate.php
@@ -29,7 +29,7 @@ class Translate
* @param \SimpleSAML\Configuration $configuration Configuration object
*/
public function __construct(
- private Configuration $configuration
+ private Configuration $configuration,
) {
$this->language = new Language($configuration);
}
diff --git a/src/SimpleSAML/Logger.php b/src/SimpleSAML/Logger.php
index 4836692806..ab8b1d66b6 100644
--- a/src/SimpleSAML/Logger.php
+++ b/src/SimpleSAML/Logger.php
@@ -454,7 +454,7 @@ private static function createLoggingHandler(?string $handler = null): void
if (is_null($handler)) {
$handler = $config->getOptionalString(
'logging.handler',
- php_sapi_name() === 'cli' || defined('STDIN') ? 'stderr' : 'syslog'
+ php_sapi_name() === 'cli' || defined('STDIN') ? 'stderr' : 'syslog',
);
}
@@ -466,7 +466,7 @@ private static function createLoggingHandler(?string $handler = null): void
$handler = strtolower($handler);
if (!array_key_exists($handler, $known_handlers)) {
throw new Exception(
- "Invalid value for the 'logging.handler' configuration option. Unknown handler '" . $handler . "'."
+ "Invalid value for the 'logging.handler' configuration option. Unknown handler '" . $handler . "'.",
);
}
$handler = $known_handlers[$handler];
diff --git a/src/SimpleSAML/Logger/ErrorLogLoggingHandler.php b/src/SimpleSAML/Logger/ErrorLogLoggingHandler.php
index 9c989d725e..967c8a30f9 100644
--- a/src/SimpleSAML/Logger/ErrorLogLoggingHandler.php
+++ b/src/SimpleSAML/Logger/ErrorLogLoggingHandler.php
@@ -49,7 +49,7 @@ public function __construct(Configuration $config)
$this->processname = preg_replace(
'/[\x00-\x1F\x7F\xA0]/u',
'',
- $config->getOptionalString('logging.processname', 'SimpleSAMLphp')
+ $config->getOptionalString('logging.processname', 'SimpleSAMLphp'),
);
}
diff --git a/src/SimpleSAML/Logger/FileLoggingHandler.php b/src/SimpleSAML/Logger/FileLoggingHandler.php
index 76b2c94d0d..941bcc5929 100644
--- a/src/SimpleSAML/Logger/FileLoggingHandler.php
+++ b/src/SimpleSAML/Logger/FileLoggingHandler.php
@@ -70,7 +70,7 @@ public function __construct(Configuration $config)
$this->processname = preg_replace(
'/[\x00-\x1F\x7F\xA0]/u',
'',
- $config->getOptionalString('logging.processname', 'SimpleSAMLphp')
+ $config->getOptionalString('logging.processname', 'SimpleSAMLphp'),
);
$file = new File($this->logFile, false);
diff --git a/src/SimpleSAML/Logger/StandardErrorLoggingHandler.php b/src/SimpleSAML/Logger/StandardErrorLoggingHandler.php
index 37bf8e14f0..64aeb2ae6e 100644
--- a/src/SimpleSAML/Logger/StandardErrorLoggingHandler.php
+++ b/src/SimpleSAML/Logger/StandardErrorLoggingHandler.php
@@ -29,7 +29,7 @@ public function __construct(Configuration $config)
$this->processname = preg_replace(
'/[\x00-\x1F\x7F\xA0]/u',
'',
- $config->getOptionalString('logging.processname', 'SimpleSAMLphp')
+ $config->getOptionalString('logging.processname', 'SimpleSAMLphp'),
);
$this->logFile = 'php://stderr';
diff --git a/src/SimpleSAML/Logger/SyslogLoggingHandler.php b/src/SimpleSAML/Logger/SyslogLoggingHandler.php
index a13fe77a9d..b192d60478 100644
--- a/src/SimpleSAML/Logger/SyslogLoggingHandler.php
+++ b/src/SimpleSAML/Logger/SyslogLoggingHandler.php
@@ -29,14 +29,14 @@ public function __construct(Configuration $config)
{
$facility = $config->getOptionalInteger(
'logging.facility',
- defined('LOG_LOCAL5') ? constant('LOG_LOCAL5') : LOG_USER
+ defined('LOG_LOCAL5') ? constant('LOG_LOCAL5') : LOG_USER,
);
// Remove any non-printable characters before storing
$processname = preg_replace(
'/[\x00-\x1F\x7F\xA0]/u',
'',
- $config->getOptionalString('logging.processname', 'SimpleSAMLphp')
+ $config->getOptionalString('logging.processname', 'SimpleSAMLphp'),
);
// Setting facility to LOG_USER (only valid in Windows), enable log level rewrite on windows systems
diff --git a/src/SimpleSAML/Memcache.php b/src/SimpleSAML/Memcache.php
index a85a90d0b8..a8174bfcee 100644
--- a/src/SimpleSAML/Memcache.php
+++ b/src/SimpleSAML/Memcache.php
@@ -87,19 +87,19 @@ public static function get(string $key): mixed
*/
if (!is_array($info)) {
Logger::warning(
- 'Retrieved invalid data from a memcache server. Data was not an array.'
+ 'Retrieved invalid data from a memcache server. Data was not an array.',
);
continue;
}
if (!array_key_exists('timestamp', $info)) {
Logger::warning(
- 'Retrieved invalid data from a memcache server. Missing timestamp.'
+ 'Retrieved invalid data from a memcache server. Missing timestamp.',
);
continue;
}
if (!array_key_exists('data', $info)) {
Logger::warning(
- 'Retrieved invalid data from a memcache server. Missing data.'
+ 'Retrieved invalid data from a memcache server. Missing data.',
);
continue;
}
@@ -161,7 +161,7 @@ public static function set(string $key, mixed $value, ?int $expire = null): void
Logger::debug("saving key $key to memcache");
$savedInfo = [
'timestamp' => microtime(true),
- 'data' => $value
+ 'data' => $value,
];
if ($expire === null) {
@@ -221,7 +221,7 @@ private static function addMemcacheServer(Memcached $memcache, array $server): v
// the hostname option is required
if (!array_key_exists('hostname', $server)) {
throw new Exception(
- "hostname setting missing from server in the 'memcache_store.servers' configuration option."
+ "hostname setting missing from server in the 'memcache_store.servers' configuration option.",
);
}
@@ -231,7 +231,7 @@ private static function addMemcacheServer(Memcached $memcache, array $server): v
if (!is_string($hostname)) {
throw new Exception(
"Invalid hostname for server in the 'memcache_store.servers' configuration option. The hostname is" .
- ' supposed to be a string.'
+ ' supposed to be a string.',
);
}
@@ -245,7 +245,7 @@ private static function addMemcacheServer(Memcached $memcache, array $server): v
if (($port <= 0) || ($port > 65535)) {
throw new Exception(
"Invalid port for server in the 'memcache_store.servers' configuration option. The port number" .
- ' is supposed to be an integer between 0 and 65535.'
+ ' is supposed to be an integer between 0 and 65535.',
);
}
} else {
@@ -298,7 +298,7 @@ private static function loadMemcacheServerGroup(array $group, $index = null)
throw new Exception(
"Invalid index on element in the 'memcache_store.servers' configuration option. Perhaps you" .
' have forgotten to add an array(...) around one of the server groups? The invalid index was: ' .
- $index
+ $index,
);
}
@@ -307,7 +307,7 @@ private static function loadMemcacheServerGroup(array $group, $index = null)
throw new Exception(
'Invalid value for the server with index ' . $index .
'. Remember that the \'memcache_store.servers\' configuration option' .
- ' contains an array of arrays of arrays.'
+ ' contains an array of arrays of arrays.',
);
}
@@ -353,7 +353,7 @@ private static function getMemcacheServers(): array
throw new Exception(
"Invalid value for the server with index " . $index .
". Remember that the 'memcache_store.servers' configuration option" .
- ' contains an array of arrays of arrays.'
+ ' contains an array of arrays of arrays.',
);
}
@@ -393,7 +393,7 @@ private static function getExpireTime(): int
// it must be a positive integer
if ($expire < 0) {
throw new Exception(
- "The value of 'memcache_store.expires' in the configuration can't be a negative integer."
+ "The value of 'memcache_store.expires' in the configuration can't be a negative integer.",
);
}
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageHandler.php b/src/SimpleSAML/Metadata/MetaDataStorageHandler.php
index 8a7acbc342..dbbe0405d3 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageHandler.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageHandler.php
@@ -70,7 +70,7 @@ protected function __construct()
$this->sources = MetaDataStorageSource::parseSources($sourcesConfig);
} catch (\Exception $e) {
throw new \Exception(
- "Invalid configuration of the 'metadata.sources' configuration option: " . $e->getMessage()
+ "Invalid configuration of the 'metadata.sources' configuration option: " . $e->getMessage(),
);
}
}
@@ -153,7 +153,7 @@ public function getList(string $set = 'saml20-idp-remote', bool $showExpired = f
unset($srcList[$key]);
Logger::warning(
"Dropping metadata entity " . var_export($key, true) . ", expired " .
- $timeUtils->generateTimestamp($le['expire']) . "."
+ $timeUtils->generateTimestamp($le['expire']) . ".",
);
}
}
@@ -227,7 +227,7 @@ public function getMetaDataCurrentEntityID(string $set, string $type = 'entityid
// we were unable to find the hostname/path in any metadata source
throw new \Exception(
'Could not find any default metadata entities in set [' . $set . '] for host [' . $currenthost . ' : ' .
- $currenthostwithpath . ']'
+ $currenthostwithpath . ']',
);
}
@@ -274,7 +274,7 @@ public function getMetaDataForEntities(array $entityIds, string $set): array
unset($srcList[$key]);
Logger::warning(
"Dropping metadata entity " . var_export($key, true) . ", expired " .
- $timeUtils->generateTimestamp($le['expire']) . "."
+ $timeUtils->generateTimestamp($le['expire']) . ".",
);
continue;
}
@@ -316,7 +316,7 @@ public function getMetaData(?string $entityId, string $set): array
if ($metadata['expire'] < time()) {
throw new \Exception(
'Metadata for the entity [' . $entityId . '] expired ' .
- (time() - $metadata['expire']) . ' seconds ago.'
+ (time() - $metadata['expire']) . ' seconds ago.',
);
}
}
@@ -377,7 +377,7 @@ public function getMetaDataConfigForSha1(string $sha1, string $set): ?Configurat
return Configuration::loadFromArray(
$remote_provider,
- $set . '/' . var_export($remote_provider['entityid'], true)
+ $set . '/' . var_export($remote_provider['entityid'], true),
);
}
}
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php b/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
index 085d11dc6f..7180c7f565 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
@@ -103,7 +103,7 @@ private function load(string $set): ?array
return $metadata;
} else {
throw new \Exception(
- 'PDO metadata handler: Database error: ' . var_export($this->db->getLastError(), true)
+ 'PDO metadata handler: Database error: ' . var_export($this->db->getLastError(), true),
);
}
}
@@ -160,13 +160,13 @@ public function getMetaData(string $entityId, string $set): ?array
$tableName = $this->getTableName($set);
$stmt = $this->db->read(
"SELECT entity_id, entity_data FROM {$tableName} WHERE entity_id = :entityId",
- ['entityId' => $entityId]
+ ['entityId' => $entityId],
);
// throw pdo exception upon execution failure
if (!$stmt->execute()) {
throw new \Exception(
- 'PDO metadata handler: Database error: ' . var_export($this->db->getLastError(), true)
+ 'PDO metadata handler: Database error: ' . var_export($this->db->getLastError(), true),
);
}
@@ -176,7 +176,7 @@ public function getMetaData(string $entityId, string $set): ?array
$data = json_decode($d['entity_data'], true);
if (json_last_error() != JSON_ERROR_NONE) {
throw new \SimpleSAML\Error\Exception(
- "Cannot decode metadata for entity '${d['entity_id']}'"
+ "Cannot decode metadata for entity '${d['entity_id']}'",
);
}
@@ -216,7 +216,7 @@ public function addEntry(string $index, string $set, array $entityData): bool
"SELECT entity_id, entity_data FROM $tableName WHERE entity_id = :entity_id",
[
'entity_id' => $index,
- ]
+ ],
);
$retrivedEntityIDs = $metadata->fetch();
@@ -229,12 +229,12 @@ public function addEntry(string $index, string $set, array $entityData): bool
if ($retrivedEntityIDs !== false && count($retrivedEntityIDs) > 0) {
$rows = $this->db->write(
"UPDATE $tableName SET entity_data = :entity_data WHERE entity_id = :entity_id",
- $params
+ $params,
);
} else {
$rows = $this->db->write(
"INSERT INTO $tableName (entity_id, entity_data) VALUES (:entity_id, :entity_data)",
- $params
+ $params,
);
}
@@ -260,7 +260,7 @@ public function removeEntry(string $entityId, string $set): bool
$rows = $this->db->write(
"DELETE FROM $tableName WHERE entity_id = :entity_id",
- ['entity_id' => $entityId]
+ ['entity_id' => $entityId],
);
return $rows === 1;
@@ -302,7 +302,7 @@ public function initDatabase(): int|false
$rows = $this->db->write(sprintf(
"CREATE TABLE IF NOT EXISTS $tableName (entity_id VARCHAR(255) PRIMARY KEY NOT NULL, "
. "entity_data %s NOT NULL)",
- $text
+ $text,
));
if ($rows === false) {
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php b/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
index 4d51c19ddd..8844b9dbf9 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
@@ -93,7 +93,7 @@ public function getMetadataSets(): array
$loc = new File($this->directory, false);
if (!$this->fileSystem->exists($this->directory) || !$loc->isReadable()) {
Logger::warning(
- 'Serialize metadata handler: Unable to open directory: ' . var_export($this->directory, true)
+ 'Serialize metadata handler: Unable to open directory: ' . var_export($this->directory, true),
);
return $ret;
}
@@ -229,7 +229,7 @@ public function saveMetadata(string $entityId, string $set, array $metadata): bo
$this->fileSystem->rename($new->getPathName(), $old->getPathName(), true);
} catch (IOException $e) {
Logger::error(
- sprintf('Error renaming %s to %s: %s', $new->getPathName(), $old->getPathName(), $e->getMessage())
+ sprintf('Error renaming %s to %s: %s', $new->getPathName(), $old->getPathName(), $e->getMessage()),
);
return false;
}
@@ -251,7 +251,7 @@ public function deleteMetadata(string $entityId, string $set): void
if (!$this->fileSystem->exists($filePath)) {
Logger::warning(
'Attempted to erase nonexistent metadata entry ' .
- var_export($entityId, true) . ' in set ' . var_export($set, true) . '.'
+ var_export($entityId, true) . ' in set ' . var_export($set, true) . '.',
);
return;
}
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageSource.php b/src/SimpleSAML/Metadata/MetaDataStorageSource.php
index fe33c87b71..591ee893dd 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageSource.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageSource.php
@@ -101,12 +101,12 @@ public static function getSource(array $sourceConfig): MetaDataStorageSource
$className = Module::resolveClass(
$type,
'MetadataStore',
- '\SimpleSAML\Metadata\MetaDataStorageSource'
+ '\SimpleSAML\Metadata\MetaDataStorageSource',
);
} catch (\Exception $e) {
throw new Error\CriticalConfigurationError(
"Invalid 'type' for metadata source. Cannot find store '$type'.",
- null
+ null,
);
}
diff --git a/src/SimpleSAML/Metadata/SAMLBuilder.php b/src/SimpleSAML/Metadata/SAMLBuilder.php
index 95d6928d88..3c984d2318 100644
--- a/src/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/src/SimpleSAML/Metadata/SAMLBuilder.php
@@ -59,7 +59,7 @@ class SAMLBuilder
public function __construct(
string $entityId,
private ?int $maxCache = null,
- private ?int $maxDuration = null
+ private ?int $maxDuration = null,
) {
$this->entityDescriptor = new EntityDescriptor();
$this->entityDescriptor->setEntityID($entityId);
@@ -396,7 +396,7 @@ private static function createEndpoints(array $endpoints, bool $indexed): array
*/
private function addAttributeConsumingService(
SPSSODescriptor $spDesc,
- Configuration $metadata
+ Configuration $metadata,
): void {
$attributes = $metadata->getOptionalArray('attributes', []);
$name = $metadata->getOptionalLocalizedString('name', null);
@@ -677,7 +677,7 @@ private function addX509KeyDescriptor(
RoleDescriptor $rd,
string $use,
string $x509data,
- ?string $keyName = null
+ ?string $keyName = null,
): void {
Assert::oneOf($use, ['encryption', 'signing']);
diff --git a/src/SimpleSAML/Metadata/SAMLParser.php b/src/SimpleSAML/Metadata/SAMLParser.php
index 62737373aa..546c5af1b5 100644
--- a/src/SimpleSAML/Metadata/SAMLParser.php
+++ b/src/SimpleSAML/Metadata/SAMLParser.php
@@ -179,7 +179,7 @@ private function __construct(
EntityDescriptor $entityElement,
?int $maxExpireTime,
array $validators = [],
- array $parentExtensions = []
+ array $parentExtensions = [],
) {
$this->fileSystem = new Filesystem();
@@ -388,7 +388,7 @@ private static function processDescriptorsElement(
SignedElementHelper $element,
?int $maxExpireTime = null,
array $validators = [],
- array $parentExtensions = []
+ array $parentExtensions = [],
): array {
if ($element instanceof EntityDescriptor) {
$ret = new SAMLParser($element, $maxExpireTime, $validators, $parentExtensions);
@@ -844,7 +844,7 @@ private function processIDPSSODescriptor(IDPSSODescriptor $element, ?int $expire
*/
private function processAttributeAuthorityDescriptor(
AttributeAuthorityDescriptor $element,
- ?int $expireTime
+ ?int $expireTime,
): void {
Assert::nullOrInteger($expireTime);
@@ -1279,9 +1279,10 @@ public function validateSignature(array $certificates): bool
$certData = $cryptoUtils->retrieveCertificate($certLocation);
if ($certData === null) {
- throw new Exception(
- 'Could not find certificate location [' . $certLocation . '], which is needed to validate signature'
- );
+ throw new Exception(sprintf(
+ 'Could not find certificate location [%s], which is needed to validate signature',
+ $certLocation,
+ ));
}
foreach ($this->validators as $validator) {
diff --git a/src/SimpleSAML/Metadata/Signer.php b/src/SimpleSAML/Metadata/Signer.php
index c8bc3ffe05..f78d15f937 100644
--- a/src/SimpleSAML/Metadata/Signer.php
+++ b/src/SimpleSAML/Metadata/Signer.php
@@ -52,13 +52,13 @@ private static function findKeyCert(Configuration $config, array $entityMetadata
'Missing either the "metadata.sign.privatekey" or the' .
' "metadata.sign.certificate" configuration option in the metadata for' .
' the ' . $type . ' "' . $entityMetadata['entityid'] . '". If one of' .
- ' these options is specified, then the other must also be specified.'
+ ' these options is specified, then the other must also be specified.',
);
}
$ret = [
'privatekey' => $entityMetadata['metadata.sign.privatekey'],
- 'certificate' => $entityMetadata['metadata.sign.certificate']
+ 'certificate' => $entityMetadata['metadata.sign.certificate'],
];
if (array_key_exists('metadata.sign.privatekey_pass', $entityMetadata)) {
@@ -77,7 +77,7 @@ private static function findKeyCert(Configuration $config, array $entityMetadata
'Missing either the "metadata.sign.privatekey" or the' .
' "metadata.sign.certificate" configuration option in the global' .
' configuration. If one of these options is specified, then the other' .
- ' must also be specified.'
+ ' must also be specified.',
);
}
$ret = ['privatekey' => $privatekey, 'certificate' => $certificate];
@@ -103,13 +103,13 @@ private static function findKeyCert(Configuration $config, array $entityMetadata
'Both the "privatekey" and the "certificate" option must' .
' be set in the metadata for the ' . $type . ' "' .
$entityMetadata['entityid'] . '" before it is possible to sign metadata' .
- ' from this entity.'
+ ' from this entity.',
);
}
$ret = [
'privatekey' => $entityMetadata['privatekey'],
- 'certificate' => $entityMetadata['certificate']
+ 'certificate' => $entityMetadata['certificate'],
];
if (array_key_exists('privatekey_pass', $entityMetadata)) {
@@ -121,7 +121,7 @@ private static function findKeyCert(Configuration $config, array $entityMetadata
throw new Exception(
'Could not find what key & certificate should be used to sign the metadata' .
- ' for the ' . $type . ' "' . $entityMetadata['entityid'] . '".'
+ ' for the ' . $type . ' "' . $entityMetadata['entityid'] . '".',
);
}
@@ -144,7 +144,7 @@ private static function isMetadataSigningEnabled(Configuration $config, array $e
throw new Exception(
'Invalid value for the "metadata.sign.enable" configuration option for' .
' the ' . $type . ' "' . $entityMetadata['entityid'] . '". This option' .
- ' should be a boolean.'
+ ' should be a boolean.',
);
}
@@ -173,14 +173,14 @@ private static function isMetadataSigningEnabled(Configuration $config, array $e
private static function getMetadataSigningAlgorithm(
Configuration $config,
array $entityMetadata,
- string $type
+ string $type,
): array {
// configure the algorithm to use
if (array_key_exists('metadata.sign.algorithm', $entityMetadata)) {
if (!is_string($entityMetadata['metadata.sign.algorithm'])) {
throw new Error\CriticalConfigurationError(
"Invalid value for the 'metadata.sign.algorithm' configuration option for the " . $type .
- "'" . $entityMetadata['entityid'] . "'. This option has restricted values"
+ "'" . $entityMetadata['entityid'] . "'. This option has restricted values",
);
}
$alg = $entityMetadata['metadata.sign.algorithm'];
@@ -247,7 +247,7 @@ public static function sign(string $metadataString, array $entityMetadata, strin
$keyData = $cryptoUtils->retrieveKey($keyLocation);
if ($keyData === null) {
throw new Exception(
- 'Could not find private key location [' . $keyLocation . '], which is needed to sign the metadata'
+ 'Could not find private key location [' . $keyLocation . '], which is needed to sign the metadata',
);
}
@@ -255,7 +255,7 @@ public static function sign(string $metadataString, array $entityMetadata, strin
$certData = $cryptoUtils->retrieveCertificate($certLocation);
if ($certData === null) {
throw new Exception(
- 'Could not find certificate location [' . $certLocation . '], which is needed to sign the metadata'
+ 'Could not find certificate location [' . $certLocation . '], which is needed to sign the metadata',
);
}
@@ -289,7 +289,7 @@ public static function sign(string $metadataString, array $entityMetadata, strin
[$rootNode],
$signature_cf['digest'],
['http://www.w3.org/2000/09/xmldsig#enveloped-signature', XMLSecurityDSig::EXC_C14N],
- ['id_name' => 'ID', 'overwrite' => false]
+ ['id_name' => 'ID', 'overwrite' => false],
);
$objXMLSecDSig->sign($objKey);
diff --git a/src/SimpleSAML/Metadata/Sources/MDQ.php b/src/SimpleSAML/Metadata/Sources/MDQ.php
index a5bf8c7697..e2e889dd36 100644
--- a/src/SimpleSAML/Metadata/Sources/MDQ.php
+++ b/src/SimpleSAML/Metadata/Sources/MDQ.php
@@ -189,7 +189,7 @@ private function getFromCache(string $set, string $entityId): ?array
$data = json_decode($rawData);
if ($data === false) {
throw new Exception(
- sprintf('%s: error unserializing cached data from file "%s".', __CLASS__, strval($file))
+ sprintf('%s: error unserializing cached data from file "%s".', __CLASS__, strval($file)),
);
}
@@ -300,8 +300,8 @@ public function getMetaData(string $entityId, string $set): ?array
$httpUtils = new Utils\HTTP();
$context = [
'http' => [
- 'header' => 'Accept: application/samlmetadata+xml'
- ]
+ 'header' => 'Accept: application/samlmetadata+xml',
+ ],
];
try {
$xmldata = $httpUtils->fetch($mdq_url, $context);
@@ -316,7 +316,7 @@ public function getMetaData(string $entityId, string $set): ?array
'Unable to fetch metadata for "%s" from %s: %s',
$entityId,
$mdq_url,
- (is_array($error) ? $error['message'] : 'no error available')
+ (is_array($error) ? $error['message'] : 'no error available'),
));
return null;
}
@@ -336,7 +336,7 @@ public function getMetaData(string $entityId, string $set): ?array
$data = self::getParsedSet($entity, $set);
if ($data === null) {
throw new Exception(
- sprintf('%s: no metadata for set "%s" available from "%s".', __CLASS__, $set, $entityId)
+ sprintf('%s: no metadata for set "%s" available from "%s".', __CLASS__, $set, $entityId),
);
}
diff --git a/src/SimpleSAML/Module.php b/src/SimpleSAML/Module.php
index 1be3debaaa..9c9936b511 100644
--- a/src/SimpleSAML/Module.php
+++ b/src/SimpleSAML/Module.php
@@ -102,7 +102,7 @@ class Module
*/
public static array $core_modules = [
'core' => true,
- 'saml' => true
+ 'saml' => true,
];
/**
@@ -217,7 +217,7 @@ public static function process(Request $request = null): Response
$request->files->all(),
function ($val) {
return !is_null($val);
- }
+ },
);
$request->initialize(
$request->query->all(),
@@ -226,7 +226,7 @@ function ($val) {
$request->cookies->all(),
$request_files,
$request->server->all(),
- $request->getContent()
+ $request->getContent(),
);
try {
@@ -335,7 +335,7 @@ function ($val) {
// "public" allows response caching even if the request was authenticated,
// which is exactly what we want for static resources
'public' => true,
- 'max_age' => strval($cacheConfig->getOptionalInteger('max_age', 86400))
+ 'max_age' => strval($cacheConfig->getOptionalInteger('max_age', 86400)),
]);
$response->setAutoLastModified();
if ($cacheConfig->getOptionalBoolean('etag', false)) {
@@ -458,7 +458,7 @@ public static function resolveClass(string $id, string $type, ?string $subclass
if ($subclass !== null && !is_subclass_of($className, $subclass)) {
throw new Exception(
'Could not resolve \'' . $id . '\': The class \'' . $className
- . '\' isn\'t a subclass of \'' . $subclass . '\'.'
+ . '\' isn\'t a subclass of \'' . $subclass . '\'.',
);
}
diff --git a/src/SimpleSAML/Session.php b/src/SimpleSAML/Session.php
index ba260f7db2..eb8c870ed4 100644
--- a/src/SimpleSAML/Session.php
+++ b/src/SimpleSAML/Session.php
@@ -305,7 +305,7 @@ public static function getSessionFromRequest(): Session
throw new Error\CriticalConfigurationError(
$e->getMessage(),
null,
- $c->toArray()
+ $c->toArray(),
);
}
Logger::error('Error creating session: ' . $e->getMessage());
@@ -354,7 +354,7 @@ public static function getSession(string $sessionId = null): ?Session
if ($session->authToken !== null) {
$authTokenCookieName = $globalConfig->getOptionalString(
'session.authtoken.cookiename',
- 'SimpleSAMLAuthToken'
+ 'SimpleSAMLAuthToken',
);
if (!isset($_COOKIE[$authTokenCookieName])) {
Logger::warning('Missing AuthToken cookie.');
@@ -659,7 +659,7 @@ public function doLogin(string $authority, array $data = []): void
$httpUtils->setCookie(
self::$config->getOptionalString('session.authtoken.cookiename', 'SimpleSAMLAuthToken'),
$this->authToken,
- $sessionHandler->getCookieParams()
+ $sessionHandler->getCookieParams(),
);
} catch (Error\CannotSetCookie $e) {
/*
@@ -726,7 +726,7 @@ private function callLogoutHandlers(string $authority): void
throw new \Exception(
'Logout handler is not a valid function: ' . $classname . '::' .
- $functionname
+ $functionname,
);
}
@@ -752,7 +752,7 @@ public function isValid(string $authority): bool
if (!isset($this->authData[$authority])) {
Logger::debug(
'Session: ' . var_export($authority, true) .
- ' not valid because we are not authenticated.'
+ ' not valid because we are not authenticated.',
);
return false;
}
@@ -787,7 +787,7 @@ public function updateSessionCookies(array $params = []): void
$httpUtils->setCookie(
self::$config->getOptionalString('session.authtoken.cookiename', 'SimpleSAMLAuthToken'),
$this->authToken,
- $params
+ $params,
);
}
}
@@ -829,7 +829,7 @@ public function registerLogoutHandler(string $authority, string $classname, stri
if (!is_callable($logout_handler)) {
throw new \Exception(
'Logout handler is not a valid function: ' . $classname . '::' .
- $functionname
+ $functionname,
);
}
@@ -886,7 +886,7 @@ public function setData(string $type, string $id, mixed $data, int|string|null $
if ($timeout <= 0) {
throw new \Exception(
'The value of the session.datastore.timeout' .
- ' configuration option should be a positive integer.'
+ ' configuration option should be a positive integer.',
);
}
}
@@ -901,7 +901,7 @@ public function setData(string $type, string $id, mixed $data, int|string|null $
$dataInfo = [
'expires' => $expires,
'timeout' => $timeout,
- 'data' => $data
+ 'data' => $data,
];
if (!array_key_exists($type, $this->dataStore)) {
diff --git a/src/SimpleSAML/SessionHandlerPHP.php b/src/SimpleSAML/SessionHandlerPHP.php
index f1d70e31f4..785213981c 100644
--- a/src/SimpleSAML/SessionHandlerPHP.php
+++ b/src/SimpleSAML/SessionHandlerPHP.php
@@ -50,7 +50,7 @@ protected function __construct()
$config = Configuration::getInstance();
$this->cookie_name = $config->getOptionalString(
'session.phpsession.cookiename',
- ini_get('session.name') ?: 'PHPSESSID'
+ ini_get('session.name') ?: 'PHPSESSID',
);
if (session_status() === PHP_SESSION_ACTIVE) {
@@ -58,7 +58,7 @@ protected function __construct()
Logger::warning(
'There is already a PHP session with the same name as SimpleSAMLphp\'s session, or the ' .
"'session.phpsession.cookiename' configuration option is not set. Make sure to set " .
- "SimpleSAMLphp's cookie name with a value not used by any other applications."
+ "SimpleSAMLphp's cookie name with a value not used by any other applications.",
);
}
@@ -284,12 +284,12 @@ public function getCookieParams(): array
if ($config->hasValue('session.phpsession.limitedpath') && $config->hasValue('session.cookie.path')) {
throw new Error\Exception(
- 'You cannot set both the session.phpsession.limitedpath and session.cookie.path options.'
+ 'You cannot set both the session.phpsession.limitedpath and session.cookie.path options.',
);
} elseif ($config->hasValue('session.phpsession.limitedpath')) {
$ret['path'] = $config->getOptionalBoolean(
'session.phpsession.limitedpath',
- false
+ false,
) ? $config->getBasePath() : '/';
}
@@ -318,14 +318,14 @@ public function setCookie(string $sessionName, ?string $sessionID, array $cookie
if ($cookieParams['secure'] && !$httpUtils->isHTTPS()) {
throw new Error\CannotSetCookie(
'Setting secure cookie on plain HTTP is not allowed.',
- Error\CannotSetCookie::SECURE_COOKIE
+ Error\CannotSetCookie::SECURE_COOKIE,
);
}
if (headers_sent()) {
throw new Error\CannotSetCookie(
'Headers already sent.',
- Error\CannotSetCookie::HEADERS_SENT
+ Error\CannotSetCookie::HEADERS_SENT,
);
}
diff --git a/src/SimpleSAML/Store/RedisStore.php b/src/SimpleSAML/Store/RedisStore.php
index 37fae3caed..3560d65af8 100644
--- a/src/SimpleSAML/Store/RedisStore.php
+++ b/src/SimpleSAML/Store/RedisStore.php
@@ -87,7 +87,7 @@ public function __construct(Client $redis = null)
+ (!empty($password) ? ['password' => $password] : []),
[
'prefix' => $prefix,
- ]
+ ],
);
} else {
$mastergroup = $config->getOptionalString('store.redis.mastergroup', 'mymaster');
@@ -103,7 +103,7 @@ public function __construct(Client $redis = null)
+ (!empty($ssl) ? ['ssl' => $ssl] : [])
+ (!empty($username) ? ['username' => $username] : [])
+ (!empty($password) ? ['password' => $password] : []),
- ]
+ ],
);
}
}
diff --git a/src/SimpleSAML/Store/SQLStore.php b/src/SimpleSAML/Store/SQLStore.php
index 20b77337c0..99de3aa61d 100644
--- a/src/SimpleSAML/Store/SQLStore.php
+++ b/src/SimpleSAML/Store/SQLStore.php
@@ -89,7 +89,7 @@ private function initTableVersionTable(): void
} catch (PDOException $e) {
$this->pdo->exec(
'CREATE TABLE ' . $this->prefix .
- '_tableVersion (_name VARCHAR(30) PRIMARY KEY NOT NULL, _version INTEGER NOT NULL)'
+ '_tableVersion (_name VARCHAR(30) PRIMARY KEY NOT NULL, _version INTEGER NOT NULL)',
);
$this->setTableVersion('tableVersion', 1);
return;
@@ -110,7 +110,7 @@ private function initTableVersionTable(): void
$update = [
'ALTER TABLE ' . $this->prefix . '_tableVersion DROP CONSTRAINT IF EXISTS ' .
$this->prefix . '_tableVersion__name_key',
- 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD PRIMARY KEY (_name)'
+ 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD PRIMARY KEY (_name)',
];
break;
case 'sqlsrv':
@@ -122,7 +122,7 @@ private function initTableVersionTable(): void
$update = [
'ALTER TABLE ' . $this->prefix . '_tableVersion DROP INDEX IF EXISTS SELECT CONSTRAINT_NAME ' .
'FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE TABLE_NAME=' . $this->prefix . '_tableVersion',
- 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD CONSTRAINT _name PRIMARY KEY CLUSTERED (_name)'
+ 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD CONSTRAINT _name PRIMARY KEY CLUSTERED (_name)',
];
break;
case 'sqlite':
@@ -140,21 +140,21 @@ private function initTableVersionTable(): void
$this->prefix . '_tableVersion',
'DROP TABLE ' . $this->prefix . '_tableVersion',
'ALTER TABLE ' . $this->prefix . '_tableVersion_new RENAME TO ' .
- $this->prefix . '_tableVersion'
+ $this->prefix . '_tableVersion',
];
break;
case 'mysql':
// Drop old index and add primary key
$update = [
'ALTER TABLE ' . $this->prefix . '_tableVersion DROP INDEX _name',
- 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD PRIMARY KEY (_name)'
+ 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD PRIMARY KEY (_name)',
];
break;
default:
// Drop old index and add primary key
$update = [
'ALTER TABLE ' . $this->prefix . '_tableVersion DROP INDEX _name',
- 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD PRIMARY KEY (_name)'
+ 'ALTER TABLE ' . $this->prefix . '_tableVersion ADD PRIMARY KEY (_name)',
];
break;
}
@@ -183,7 +183,7 @@ private function initKVTable(): void
} elseif ($tableVer < 2 && $tableVer > 0) {
throw new Exception(
'No upgrade path available. Please migrate to the latest 1.16+ '
- . 'version of SimpleSAMLphp first before upgrading to 2.x.'
+ . 'version of SimpleSAMLphp first before upgrading to 2.x.',
);
}
@@ -242,7 +242,7 @@ public function setTableVersion(string $name, int $version): void
$this->insertOrUpdate(
$this->prefix . '_tableVersion',
['_name'],
- ['_name' => $name, '_version' => $version]
+ ['_name' => $name, '_version' => $version],
);
$this->tableVersions[$name] = $version;
}
diff --git a/src/SimpleSAML/Store/StoreFactory.php b/src/SimpleSAML/Store/StoreFactory.php
index 9f3c93f49b..5f3c18b5f2 100644
--- a/src/SimpleSAML/Store/StoreFactory.php
+++ b/src/SimpleSAML/Store/StoreFactory.php
@@ -66,7 +66,7 @@ public static function getInstance(string $storeType)
throw new Error\CriticalConfigurationError(
"Invalid 'store.type' configuration option. Cannot find store '$storeType'.",
null,
- $c
+ $c,
);
}
/** @var \SimpleSAML\Store\StoreInterface|false */
diff --git a/src/SimpleSAML/Utils/Attributes.php b/src/SimpleSAML/Utils/Attributes.php
index e2600334e0..fb8fee2305 100644
--- a/src/SimpleSAML/Utils/Attributes.php
+++ b/src/SimpleSAML/Utils/Attributes.php
@@ -44,7 +44,7 @@ public function getExpectedAttribute(array $attributes, string $expected, bool $
} elseif (count($attribute) > 1) {
if ($allow_multiple === false) {
throw new Error\Exception(
- 'More than one value found for the attribute, multiple values not allowed.'
+ 'More than one value found for the attribute, multiple values not allowed.',
);
}
}
@@ -83,7 +83,7 @@ public function normalizeAttributesArray(array $attributes): array
if (!is_string($value)) {
$value = print_r($value, true);
throw new InvalidArgumentException(
- sprintf('Invalid attribute value for attribute %s: "%s".', $name, $value)
+ sprintf('Invalid attribute value for attribute %s: "%s".', $name, $value),
);
}
}
diff --git a/src/SimpleSAML/Utils/Auth.php b/src/SimpleSAML/Utils/Auth.php
index cce8675558..e683a4904d 100644
--- a/src/SimpleSAML/Utils/Auth.php
+++ b/src/SimpleSAML/Utils/Auth.php
@@ -64,7 +64,7 @@ public function requireAdmin(): void
$as->login();
} else {
throw new Error\Exception(
- 'Cannot find "admin" auth source, and admin privileges are required.'
+ 'Cannot find "admin" auth source, and admin privileges are required.',
);
}
}
diff --git a/src/SimpleSAML/Utils/Config.php b/src/SimpleSAML/Utils/Config.php
index e080975ad2..e89200da41 100644
--- a/src/SimpleSAML/Utils/Config.php
+++ b/src/SimpleSAML/Utils/Config.php
@@ -5,6 +5,7 @@
namespace SimpleSAML\Utils;
use SimpleSAML\Configuration;
+use SimpleSAML\Error;
/**
* Utility class for SimpleSAMLphp configuration management and manipulation.
@@ -85,8 +86,8 @@ public function getConfigDir(): string
sprintf(
'Config directory specified by environment variable SIMPLESAMLPHP_CONFIG_DIR is not a ' .
'directory. Given: "%s"',
- $configDirEnv
- )
+ $configDirEnv,
+ ),
);
}
$configDir = $configDirEnv;
diff --git a/src/SimpleSAML/Utils/Crypto.php b/src/SimpleSAML/Utils/Crypto.php
index 22583ba73b..df999eb981 100644
--- a/src/SimpleSAML/Utils/Crypto.php
+++ b/src/SimpleSAML/Utils/Crypto.php
@@ -201,7 +201,7 @@ public function loadPrivateKey(
Configuration $metadata,
bool $required = false,
string $prefix = '',
- bool $full_path = false
+ bool $full_path = false,
): ?array {
$location = $metadata->getOptionalString($prefix . 'privatekey', null);
if ($location === null) {
diff --git a/src/SimpleSAML/Utils/EMail.php b/src/SimpleSAML/Utils/EMail.php
index a58b4b2320..caf5163e58 100644
--- a/src/SimpleSAML/Utils/EMail.php
+++ b/src/SimpleSAML/Utils/EMail.php
@@ -46,7 +46,7 @@ public function __construct(
string $from = null,
string $to = null,
private string $txt_template = 'mailtxt.twig',
- private string $html_template = 'mailhtml.twig'
+ private string $html_template = 'mailhtml.twig',
) {
$this->mail = new PHPMailer(true);
$this->mail->Subject = $subject;
@@ -99,7 +99,7 @@ public function setData(array $data): void
function ($v) {
return is_array($v) ? $v : [$v];
},
- $data
+ $data,
);
}
@@ -221,7 +221,7 @@ public function setTransportMethod(string $transportMethod, array $transportOpti
break;
default:
throw new \InvalidArgumentException(
- "Invalid Mail Transport Method - Check 'mail.transport.method' Configuration Option"
+ "Invalid Mail Transport Method - Check 'mail.transport.method' Configuration Option",
);
}
}
@@ -239,7 +239,7 @@ public function initFromConfig(EMail $EMail): EMail
$config = Configuration::getInstance();
$EMail->setTransportMethod(
$config->getOptionalString('mail.transport.method', 'mail'),
- $config->getOptionalArrayize('mail.transport.options', [])
+ $config->getOptionalArrayize('mail.transport.options', []),
);
return $EMail;
diff --git a/src/SimpleSAML/Utils/HTTP.php b/src/SimpleSAML/Utils/HTTP.php
index 3ffb0cecc1..ae0062d026 100644
--- a/src/SimpleSAML/Utils/HTTP.php
+++ b/src/SimpleSAML/Utils/HTTP.php
@@ -375,7 +375,7 @@ public function checkURLAllowed(string $url, array $trustedSites = null): string
// get the white list of domains
if ($trustedSites === null) {
- $trustedSites = Configuration::getInstance()->getOptionalArray('trusted.url.domains', []);
+ $trustedSites = Configuration::getInstance()->getOptionalArray('trusted.url.domains', null);
}
// validates the URL's host is among those allowed
@@ -669,7 +669,7 @@ public function getBaseURL(): string
'Invalid value for \'baseurlpath\' in config.php. Valid format is in the form: ' .
'[(http|https)://(hostname|fqdn)[:port]]/[path/to/simplesaml/]. It must end with a \'/\'.',
null,
- $c
+ $c,
);
}
}
@@ -1100,7 +1100,7 @@ public function setCookie(string $name, ?string $value, array $params = null, bo
if ($throw) {
throw new Error\CannotSetCookie(
'Setting secure cookie on plain HTTP is not allowed.',
- Error\CannotSetCookie::SECURE_COOKIE
+ Error\CannotSetCookie::SECURE_COOKIE,
);
}
Logger::warning('Error setting cookie: setting secure cookie on plain HTTP is not allowed.');
@@ -1130,7 +1130,7 @@ public function setCookie(string $name, ?string $value, array $params = null, bo
'secure' => $params['secure'],
'httponly' => $params['httponly'],
'samesite' => $params['samesite'],
- ]
+ ],
);
} else {
/** @psalm-suppress InvalidArgument */
@@ -1144,7 +1144,7 @@ public function setCookie(string $name, ?string $value, array $params = null, bo
'secure' => $params['secure'],
'httponly' => $params['httponly'],
'samesite' => $params['samesite'],
- ]
+ ],
);
}
@@ -1152,7 +1152,7 @@ public function setCookie(string $name, ?string $value, array $params = null, bo
if ($throw) {
throw new Error\CannotSetCookie(
'Headers already sent.',
- Error\CannotSetCookie::HEADERS_SENT
+ Error\CannotSetCookie::HEADERS_SENT,
);
}
Logger::warning('Error setting cookie: headers already sent.');
diff --git a/src/SimpleSAML/Utils/System.php b/src/SimpleSAML/Utils/System.php
index 623be6bf08..cabac093e3 100644
--- a/src/SimpleSAML/Utils/System.php
+++ b/src/SimpleSAML/Utils/System.php
@@ -77,9 +77,9 @@ public function getTempDir(): string
$tempDir = rtrim(
$globalConfig->getOptionalString(
'tempdir',
- sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'simplesaml'
+ sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'simplesaml',
),
- DIRECTORY_SEPARATOR
+ DIRECTORY_SEPARATOR,
);
/**
@@ -91,14 +91,14 @@ public function getTempDir(): string
$error = error_get_last();
throw new Error\Exception(
'Error creating temporary directory "' . $tempDir . '": ' .
- (is_array($error) ? $error['message'] : 'no error available')
+ (is_array($error) ? $error['message'] : 'no error available'),
);
}
} elseif (!is_writable($tempDir)) {
throw new Error\Exception(
'Temporary directory "' . $tempDir .
'" cannot be written to by the current user' .
- (function_exists('posix_getuid') ? ' "' . posix_getuid() . '"' : '')
+ (function_exists('posix_getuid') ? ' "' . posix_getuid() . '"' : ''),
);
}
@@ -195,7 +195,7 @@ public function writeFile(string $filename, string $data, int $mode = 0600): voi
$error = error_get_last();
throw new Error\Exception(
'Error saving file "' . $tmpFile . '": ' .
- (is_array($error) ? $error['message'] : 'no error available')
+ (is_array($error) ? $error['message'] : 'no error available'),
);
}
@@ -206,7 +206,7 @@ public function writeFile(string $filename, string $data, int $mode = 0600): voi
$error = error_get_last();
throw new Error\Exception(
'Error changing file mode of "' . $tmpFile . '": ' .
- (is_array($error) ? $error['message'] : 'no error available')
+ (is_array($error) ? $error['message'] : 'no error available'),
);
}
}
@@ -217,7 +217,7 @@ public function writeFile(string $filename, string $data, int $mode = 0600): voi
$error = error_get_last();
throw new Error\Exception(
'Error moving "' . $tmpFile . '" to "' . $filename . '": ' .
- (is_array($error) ? $error['message'] : 'no error available')
+ (is_array($error) ? $error['message'] : 'no error available'),
);
}
diff --git a/src/SimpleSAML/Utils/Translate.php b/src/SimpleSAML/Utils/Translate.php
index 608d9a39d5..dba77c7e7d 100644
--- a/src/SimpleSAML/Utils/Translate.php
+++ b/src/SimpleSAML/Utils/Translate.php
@@ -20,7 +20,7 @@ class Translate
public function __construct(
- protected Configuration $configuration
+ protected Configuration $configuration,
) {
$this->baseDir = $configuration->getBaseDir();
}
diff --git a/src/SimpleSAML/Utils/XML.php b/src/SimpleSAML/Utils/XML.php
index 47c45be63e..dc2645a660 100644
--- a/src/SimpleSAML/Utils/XML.php
+++ b/src/SimpleSAML/Utils/XML.php
@@ -350,7 +350,7 @@ function (string $public = null, string $system, /** @scrutinizer ignore-unused
return null;
}
return $system;
- }
+ },
);
/** @psalm-suppress PossiblyUndefinedVariable */
diff --git a/src/SimpleSAML/XHTML/IdPDisco.php b/src/SimpleSAML/XHTML/IdPDisco.php
index c35191c13d..1e049fcf1a 100644
--- a/src/SimpleSAML/XHTML/IdPDisco.php
+++ b/src/SimpleSAML/XHTML/IdPDisco.php
@@ -115,7 +115,7 @@ class IdPDisco
*/
public function __construct(
protected array $metadataSets,
- protected string $instance
+ protected string $instance,
) {
// initialize standard classes
$this->config = Configuration::getInstance();
@@ -519,12 +519,12 @@ protected function start(): void
'IdPentityID' => $idp,
'returnIDParam' => $this->returnIdParam,
'isPassive' => 'true',
- 'return' => $this->returnURL
+ 'return' => $this->returnURL,
]);
} else {
$this->log(
'Choice made [' . $idp . '] (Redirecting the user back. returnIDParam='
- . $this->returnIdParam . ')'
+ . $this->returnIdParam . ')',
);
$httpUtils->redirectTrustedURL($this->returnURL, [$this->returnIdParam => $idp]);
}
@@ -562,11 +562,11 @@ public function handleRequest(): void
if (sizeof($idpintersection) == 1) {
$this->log(
'Choice made [' . $idpintersection[0] . '] (Redirecting the user back. returnIDParam=' .
- $this->returnIdParam . ')'
+ $this->returnIdParam . ')',
);
$httpUtils->redirectTrustedURL(
$this->returnURL,
- [$this->returnIdParam => $idpintersection[0]]
+ [$this->returnIdParam => $idpintersection[0]],
);
}
@@ -607,7 +607,7 @@ public function handleRequest(): void
*/
function (array $idpentry1, array $idpentry2) {
return strcasecmp($idpentry1['name'], $idpentry2['name']);
- }
+ },
);
$t->data['idplist'] = $newlist;
diff --git a/src/SimpleSAML/XHTML/Template.php b/src/SimpleSAML/XHTML/Template.php
index 201fe882e3..b7a452fecb 100644
--- a/src/SimpleSAML/XHTML/Template.php
+++ b/src/SimpleSAML/XHTML/Template.php
@@ -130,7 +130,7 @@ class Template extends Response
*/
public function __construct(
private Configuration $configuration,
- private string $template
+ private string $template,
) {
// TODO: do not remove the slash from the beginning, change the templates instead!
$this->data['baseurlpath'] = ltrim($configuration->getBasePath(), '/');
@@ -140,7 +140,7 @@ public function __construct(
// parse config to find theme and module theme is in, if any
list($this->theme['module'], $this->theme['name']) = $this->findModuleAndTemplateName(
- $this->configuration->getOptionalString('theme.use', 'default')
+ $this->configuration->getOptionalString('theme.use', 'default'),
);
// initialize internationalization system
@@ -159,7 +159,7 @@ class_exists($controller)
} else {
throw new Error\ConfigurationError(
'Invalid controller was configured in `theme.controller`. ' .
- ' Make sure the class exists and implements the TemplateControllerInterface.'
+ ' Make sure the class exists and implements the TemplateControllerInterface.',
);
}
}
@@ -260,7 +260,7 @@ private function setupTwigTemplatepaths(): TemplateLoader
if ($this->theme['module']) {
try {
$templateDirs[] = [
- $this->theme['module'] => TemplateLoader::getModuleTemplateDir($this->theme['module'])
+ $this->theme['module'] => TemplateLoader::getModuleTemplateDir($this->theme['module']),
];
} catch (InvalidArgumentException $e) {
// either the module is not enabled or it has no "templates" directory, ignore
@@ -271,7 +271,7 @@ private function setupTwigTemplatepaths(): TemplateLoader
// default, themeless templates are checked last
$templateDirs[] = [
- FilesystemLoader::MAIN_NAMESPACE => $this->configuration->resolvePath('templates')
+ FilesystemLoader::MAIN_NAMESPACE => $this->configuration->resolvePath('templates'),
];
foreach ($templateDirs as $entry) {
$loader->addPath($entry[key($entry)], key($entry));
@@ -342,15 +342,15 @@ private function setupTwig(): Environment
new TwigFilter(
'translateFromArray',
[Translate::class, 'translateFromArray'],
- ['needs_context' => true]
- )
+ ['needs_context' => true],
+ ),
);
// add a filter for preferred entity name
$twig->addFilter(
new TwigFilter(
'entityDisplayName',
[$this, 'getEntityDisplayName'],
- )
+ ),
);
// add an asset() function
@@ -470,7 +470,7 @@ private function generateLanguageBar(): ?array
$httpUtils = new Utils\HTTP();
$url = $httpUtils->addURLParameters(
'',
- [$parameterName => $lang]
+ [$parameterName => $lang],
);
}
$langmap[$lang] = [
diff --git a/src/SimpleSAML/XML/Parser.php b/src/SimpleSAML/XML/Parser.php
index 150548ca13..6a02f27ac3 100644
--- a/src/SimpleSAML/XML/Parser.php
+++ b/src/SimpleSAML/XML/Parser.php
@@ -83,7 +83,7 @@ public function getValue(string $xpath, bool $required = false): ?string
if (!is_array($result) || empty($result)) {
if ($required) {
throw new \Exception(
- 'Could not get value from XML document using the following XPath expression: ' . $xpath
+ 'Could not get value from XML document using the following XPath expression: ' . $xpath,
);
} else {
return null;
@@ -110,7 +110,7 @@ public function getValueAlternatives(array $xpath, bool $required = false): ?str
if ($required) {
throw new \Exception(
- 'Could not get value from XML document using multiple alternative XPath expressions.'
+ 'Could not get value from XML document using multiple alternative XPath expressions.',
);
} else {
return null;
diff --git a/src/SimpleSAML/XML/Signer.php b/src/SimpleSAML/XML/Signer.php
index 33b321dafc..3e1dfe9d49 100644
--- a/src/SimpleSAML/XML/Signer.php
+++ b/src/SimpleSAML/XML/Signer.php
@@ -253,7 +253,7 @@ public function addCertificate(string $location, bool $full_path = false): void
public function sign(
DOMElement $node,
DOMElement $insertInto,
- DOMElement|DOMComment|DOMText|null $insertBefore = null
+ DOMElement|DOMComment|DOMText|null $insertBefore = null,
): void {
$privateKey = $this->privateKey;
if ($privateKey === false) {
@@ -273,7 +273,7 @@ public function sign(
[$node],
XMLSecurityDSig::SHA256,
['http://www.w3.org/2000/09/xmldsig#enveloped-signature', XMLSecurityDSig::EXC_C14N],
- $options
+ $options,
);
$objXMLSecDSig->sign($privateKey);
diff --git a/src/SimpleSAML/XML/Validator.php b/src/SimpleSAML/XML/Validator.php
index c903310528..9acdbfc730 100644
--- a/src/SimpleSAML/XML/Validator.php
+++ b/src/SimpleSAML/XML/Validator.php
@@ -51,7 +51,7 @@ class Validator
public function __construct(
DOMDocument $xmlNode,
string|array|null $idAttribute = null,
- array|false|null|string $publickey = false
+ array|false|null|string $publickey = false,
) {
if ($publickey === null) {
$publickey = false;
diff --git a/templates/_table.twig b/templates/_table.twig
index 2ada6a8a1c..df05e0d43e 100644
--- a/templates/_table.twig
+++ b/templates/_table.twig
@@ -7,17 +7,16 @@
| {{ name }} |
{%- endblock %}
- {% apply spaceless %}
- {% for value in values %}
- {% if loop.length>1 and loop.first %} |