rabe/Util-Settings
11
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of code.verua.online:rabe/Util-Settings

Browse source
This commit is contained in:
norb 2024-11-11 16:19:13 +01:00
commit 5821cb0f5b
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Settings.php
View file

@ -153,7 +153,7 @@ class Settings implements \Iterator, \Countable
// load local config without merging - we need it here for the mode // load local config without merging - we need it here for the mode
$conf = $this->buildFileName(); $conf = $this->buildFileName();
$localConf = false; $localConf = [];
if (file_exists($conf)) $localConf = require($conf); if (file_exists($conf)) $localConf = require($conf);
// if a mode was set in the constructor do not overwrite it // if a mode was set in the constructor do not overwrite it
@ -169,7 +169,7 @@ class Settings implements \Iterator, \Countable
$siteConf = $this->buildFileName(self::SITE); $siteConf = $this->buildFileName(self::SITE);
if (file_exists($siteConf)) if (file_exists($siteConf))
{ {
$localConf = array_replace_recursive($this->settings, require($siteConf)); $localConf = array_replace_recursive($localConf, require($siteConf));
} }
} }
@ -177,7 +177,7 @@ class Settings implements \Iterator, \Countable
if ( isset( $this->modes[ $this->mode ] ) ) if ( isset( $this->modes[ $this->mode ] ) )
{ {
$modeConf = $this->buildFileName( $this->modes[ $this->mode ] ); $modeConf = $this->buildFileName( $this->modes[ $this->mode ] );
if ( file_exists($modeConf) ) if ( file_exists($modeConf) )
{ {
$this->settings = array_replace_recursive( $this->settings, require($modeConf) ); $this->settings = array_replace_recursive( $this->settings, require($modeConf) );

3
tests/cfg/order/config/default.conf.php
View file

@ -1,4 +1,7 @@
<?php return [ <?php return [
'mode' => 'prod', 'mode' => 'prod',
'answer' => 0,
'testFile' => 'default',
'testFiles' => 'default', 'testFiles' => 'default',
'testFiles2' => 'default'
]; ];