*/
class ConfigFileLoader
{
- /**
- * The Sub directory of the config-files
- *
- * @var string
- */
- const CONFIG_DIR = 'config';
-
- /**
- * The Sub directory of the static config-files
- *
- * @var string
- */
- const STATIC_DIR = 'static';
-
/**
* The default name of the user defined ini file
*
*/
private $staticDir;
- public function __construct(string $basePath)
+ /**
+ * @param string $baseDir The base
+ * @param string $configDir
+ * @param string $staticDir
+ */
+ public function __construct(string $baseDir, string $configDir, string $staticDir)
{
- $this->baseDir = $basePath;
- $this->configDir = $this->baseDir . DIRECTORY_SEPARATOR . self::CONFIG_DIR;
- $this->staticDir = $this->baseDir . DIRECTORY_SEPARATOR . self::STATIC_DIR;
+ $this->baseDir = $baseDir;
+ $this->configDir = $configDir;
+ $this->staticDir = $staticDir;
}
/**
*
* @throws Exception
*/
- public function setupCache(Cache $config, array $server = [], $raw = false)
+ public function setupCache(Cache $config, array $server = [], bool $raw = false)
{
// Load static config files first, the order is important
$config->load($this->loadStaticConfig('defaults'), Cache::SOURCE_FILE);
$filepath = $this->baseDir . DIRECTORY_SEPARATOR . // /var/www/html/
Addon::DIRECTORY . DIRECTORY_SEPARATOR . // addon/
$name . DIRECTORY_SEPARATOR . // openstreetmap/
- self::CONFIG_DIR . DIRECTORY_SEPARATOR . // config/
+ 'config'. DIRECTORY_SEPARATOR . // config/
$name . ".config.php"; // openstreetmap.config.php
if (file_exists($filepath)) {
*/
public function loadEnvConfig(array $server)
{
- $filepath = $this->baseDir . DIRECTORY_SEPARATOR . // /var/www/html/
- self::STATIC_DIR . DIRECTORY_SEPARATOR . // static/
- "env.config.php"; // env.config.php
+ $filepath = $this->staticDir . DIRECTORY_SEPARATOR . // /var/www/html/static/
+ "env.config.php"; // env.config.php
if (!file_exists($filepath)) {
return [];