refactor: rewrite is_valid_port() (#7360)

* refactor: speed up is_valid_port()
Convert is_valid_port to Config
Several Config optimizations
Update documentation

* fix getCombined() when os key is not set, but global is.
Add more tests
This commit is contained in:
Tony Murray
2017-09-21 18:02:01 +01:00
committed by Neil Lathwood
parent 777eb1f823
commit 6ea6218f47
6 changed files with 140 additions and 84 deletions
+6
View File
@@ -97,6 +97,12 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$config['os']['nullos']['num'] = array('two', 'three');
$config['assoc'] = array('a' => 'same', 'b' => 'same');
$config['os']['nullos']['assoc'] = array('b' => 'different', 'c' => 'still same');
$config['os']['nullos']['osset'] = true;
$config['gset'] = true;
$this->assertTrue(Config::getCombined('nullos', 'non-existent', true), 'Did not return default value on non-existent key');
$this->assertTrue(Config::getCombined('nullos', 'osset', false), 'Did not return OS value when global value is not set');
$this->assertTrue(Config::getCombined('nullos', 'gset', false), 'Did not return global value when OS value is not set');
$combined = Config::getCombined('nullos', 'num');
sort($combined);