mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 01:36:57 +02:00
Code Issues Releases Wiki Activity

[ticket/15699] Add progress bar and use template macros

Browse Source 
PHPBB3-15699
This commit is contained in:
Ruben Calvo
2024-02-17 19:19:09 +01:00
parent 59a5163e2b
commit bb84af9a48
10 changed files with 154 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
phpBB/phpbb/storage/adapter_factory.php
View File

@@ -15,6 +15,7 @@ namespace phpbb\storage;
use phpbb\config\config;
use phpbb\di\service_collection;
use phpbb\storage\adapter\adapter_interface;
use phpbb\storage\exception\storage_exception;
class adapter_factory
@@ -53,9 +54,24 @@ class adapter_factory
*
* @param string $storage_name
*
* @return \phpbb\storage\adapter\adapter_interface
* @return adapter_interface
*/
public function get($storage_name)
public function get(string $storage_name)
{
$provider_class = $this->config['storage\\' . $storage_name . '\\provider'];
$provider = $this->providers->get_by_class($provider_class);
$options = [];
foreach (array_keys($provider->get_options()) as $definition)
{
/** @psalm-suppress InvalidArrayOffset */
$options[$definition] = $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
}
return $this->get_with_options($storage_name, $options);
}
public function get_with_options(string $storage_name, array $options)
{
$provider_class = $this->config['storage\\' . $storage_name . '\\provider'];
$provider = $this->providers->get_by_class($provider_class);
@@ -66,28 +82,8 @@ class adapter_factory
}
$adapter = $this->adapters->get_by_class($provider->get_adapter_class());
$adapter->configure($this->build_options($storage_name, $provider->get_options()));
$adapter->configure($options);
return $adapter;
}
/**
* Obtains configuration for a given storage
*
* @param string $storage_name
* @param array $definitions
*
* @return array Returns storage configuration values
*/
public function build_options($storage_name, array $definitions)
{
$options = [];
foreach (array_keys($definitions) as $definition)
{
$options[$definition] = $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
}
return $options;
}
}