2.0 RC 1 - new ConfigurationService (#3810)

* use html5 email validation
* remove static cache seed, for compatibility with non default (file based) caches
* added caching ConfigurationService, removed use of doctrine result cache
* simplify configuration API
This commit is contained in:
Kevin Papst
2023-02-05 19:51:08 +01:00
committed by GitHub
parent 63a3ae1147
commit ca846b5fbf
14 changed files with 119 additions and 157 deletions

View File

@@ -13,7 +13,7 @@ final class SystemConfiguration
{
private bool $initialized = false;
public function __construct(private ConfigLoaderInterface $repository, private ?array $settings)
public function __construct(private ConfigLoaderInterface $repository, private array $settings = [])
{
}
@@ -23,8 +23,8 @@ final class SystemConfiguration
return;
}
foreach ($this->repository->getConfigurations() as $configuration) {
$this->set($configuration->getName(), $configuration->getValue());
foreach ($this->repository->getConfigurations() as $key => $value) {
$this->set($key, $value);
}
$this->initialized = true;
@@ -35,7 +35,6 @@ final class SystemConfiguration
*
* If no key is given to the method, the entire array will be replaced.
*
* @see https://github.com/divineomega/array_undot
* @param string $key
* @param mixed $value
* @return void
@@ -70,6 +69,7 @@ final class SystemConfiguration
/**
* This method should be avoided if possible, use plain keys instead.
*
* @see https://github.com/divineomega/array_undot
* @param string $key
* @return array
*/
@@ -219,7 +219,7 @@ final class SystemConfiguration
}
/**
* @return array<mixed>
* @return array<int, array<'saml'|'kimai', string>>
*/
public function getSamlRolesMapping(): array
{
@@ -227,7 +227,7 @@ final class SystemConfiguration
}
/**
* @return array<mixed>
* @return array<string, array<mixed>|bool>
*/
public function getSamlConnection(): array
{
@@ -235,7 +235,7 @@ final class SystemConfiguration
}
/**
* @return array<mixed>
* @return array<int, array<'saml'|'kimai', string>>
*/
public function getSamlAttributeMapping(): array
{