Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

config : allow to have the defaults params in ->get() in case of array without defined key

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@2648 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2016-03-05 12:59:44 +00:00
parent 84dbeb45ba
commit 29007c5afa
2 changed files with 119 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
Tests/configTest.php
View File

@@ -151,4 +151,107 @@ class test_config extends PHPUnit_Framework_TestCase
"tableprefix"=>false)); "tableprefix"=>false));
$this->assertSame (true, $res); $this->assertSame (true, $res);
} }
public function testGet6 ()
{
$c = new config ();
$c->confFile = "/tmp/testconf.php";
chmod ("/tmp/testconf.php", 0666);
$c->default = array (
"database"=>array (
"dsn"=>null,
"user"=>null,
"password"=>null,
"tableprefix"=>""),
"servers"=>array (
"not configured"=>array (
"type"=>"bind",
"username"=>"",
),
)
);
$res = $c->get ("servers");
$this->assertSame ($res, array ("not configured"=>array (
"type"=>"bind",
"username"=>"",
)));
}
public function testSet7 ()
{
$c = new config ();
$c->confFile = "/tmp/testconf.php";
chmod ("/tmp/testconf.php", 0666);
$c->default = array (
"database"=>array (
"dsn"=>null,
"user"=>null,
"password"=>null,
"tableprefix"=>""),
"servers"=>array (
"not configured"=>array (
"type"=>"bind",
"username"=>"",
),
)
);
$res = $c->set ("servers", array (
"127.0.0.1"=>array (
"type"=>"BIND",
"username"=>"toto",
)));
}
public function testGet7 ()
{
$c = new config ();
$c->confFile = "/tmp/testconf.php";
chmod ("/tmp/testconf.php", 0666);
$c->default = array (
"database"=>array (
"dsn"=>null,
"user"=>null,
"password"=>null,
"tableprefix"=>""),
"servers"=>array (
"not configured"=>array (
"type"=>"bind",
"username"=>"",
),
)
);
$res = $c->get ("servers");
$this->assertSame ($res, array (
"127.0.0.1"=>array (
"type"=>"BIND",
"username"=>"toto",
)));
}
public function testGet8 ()
{
$c = new config ();
$c->confFile = "/tmp/testconf.php";
chmod ("/tmp/testconf.php", 0666);
$c->default = array (
"database"=>array (
"dsn"=>null,
"user"=>null,
"password"=>null,
"tableprefix"=>""),
"servers"=>array (
"not configured"=>array (
"type"=>"bind",
"username"=>"",
"password"=>"",
),
)
);
$res = $c->get ("servers");
$this->assertSame ($res, array (
"127.0.0.1"=>array (
"type"=>"BIND",
"username"=>"toto",
"password"=>"",
)));
}
} }

16
config.php
View File

@@ -99,6 +99,22 @@ class config
if (! isset ($conf[$param][$key])) if (! isset ($conf[$param][$key]))
$conf[$param][$key] = $val; $conf[$param][$key] = $val;
} }
foreach ($conf[$param] as $key=>$val)
{
if ($key === "not configured")
continue;
if (is_array ($val))
{
if (! isset ($this->default[$param]["not configured"]))
throw new \Exception ("Invalid config provided : array provided ".
"without default values", 500);
foreach ($this->default[$param]["not configured"] as $k=>$v)
{
if (! array_key_exists ($k, $conf[$param][$key]))
$conf[$param][$key][$k] = $v;
}
}
}
if (count ($conf[$param]) > 1 && isset ($conf[$param]["not configured"])) if (count ($conf[$param]) > 1 && isset ($conf[$param]["not configured"]))
unset ($conf[$param]["not configured"]); unset ($conf[$param]["not configured"]);
return $conf[$param]; return $conf[$param];