adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding nested value support to IniReader.

Browse source 
Adding boolean conversions.
Adding test cases.
This commit is contained in:
mark_story 2010-12-04 12:56:37 -05:00
parent 26980c23ba
commit 98704d3ecd
2 changed files with 67 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cake/libs/config/ini_reader.php
View file

@ -13,7 +13,7 @@
* @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org) * @copyright Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project * @link http://cakephp.org CakePHP(tm) Project
* @package cake * @package cake
* @subpackage cake.cake.libs.controller.components * @subpackage cake.libs.config
* @since CakePHP(tm) v 2.0 * @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
@ -23,6 +23,16 @@
* you should be aware that this class shares the same behavior, especially with * you should be aware that this class shares the same behavior, especially with
* regards to boolean and null values. * regards to boolean and null values.
* *
* In addition to the native parse_ini_file features, IniReader also allows you
* to create nested array structures through usage of . delimited names. This allows
* you to create nested arrays structures in an ini config file. For example:
*
* `db.password = secret` would turn into `array('db' => array('password' => 'secret'))`
*
* You can nest properties as deeply as needed using .'s. IniReader also manipulates
* how the special ini values of 'yes', 'no', 'on', 'off', 'null' are handled.
* These values will be converted to their boolean equivalents.
*
* @package cake.config * @package cake.config
* @see http://php.net/parse_ini_file * @see http://php.net/parse_ini_file
*/ */
@ -64,9 +74,35 @@ class IniReader implements ConfigReaderInterface {
$filename = $this->_path . $file; $filename = $this->_path . $file;
$contents = parse_ini_file($filename, true); $contents = parse_ini_file($filename, true);
if (!empty($this->_section) && isset($contents[$this->_section])) { if (!empty($this->_section) && isset($contents[$this->_section])) {
$values = $contents[$this->_section]; $values = $this->_parseNestedValues($contents[$this->_section]);
} else { } else {
$values = $contents; $values = array();
foreach ($contents as $section => $attribs) {
$values[$section] = $this->_parseNestedValues($attribs);
}
}
return $values;
}
/**
* parses nested values out of keys.
*
* @param array $values Values to be exploded.
* @return array Array of values exploded
*/
protected function _parseNestedValues($values) {
foreach ($values as $key => $value) {
if ($value === '1') {
$value = true;
}
if ($value === '') {
$value = false;
}
if (strpos($key, '.') !== false) {
$values = Set::insert($values, $key, $value);
} else {
$values[$key] = $value;
}
} }
return $values; return $values;
} }

28
cake/tests/cases/libs/config/ini_reader.test.php
View file

@ -65,4 +65,32 @@ class IniReaderTest extends CakeTestCase {
$this->assertEquals('administrators', $config['groups']); $this->assertEquals('administrators', $config['groups']);
} }
/**
* test that names with .'s get exploded into arrays.
*
* @return void
*/
function testReadingValuesWithDots() {
$reader = new IniReader($this->path);
$config = $reader->read('nested.ini');
$this->assertTrue(isset($config['database']['db']['username']));
$this->assertEquals('mark', $config['database']['db']['username']);
$this->assertEquals(3, $config['nesting']['one']['two']['three']);
}
/**
* test boolean reading
*
* @return void
*/
function testBooleanReading() {
$reader = new IniReader($this->path);
$config = $reader->read('nested.ini');
$this->assertTrue($config['bools']['test_on']);
$this->assertTrue($config['bools']['test_yes']);
$this->assertFalse($config['bools']['test_no']);
$this->assertFalse($config['bools']['test_off']);
}
} }