adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 10:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ini/Php readers now read files with/without extension.

Browse source
This commit is contained in:
Juan Basso 2011-01-23 20:27:46 -02:00
parent 55c557d5a1
commit be98491413
4 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,6 +71,12 @@ class IniReader implements ConfigReaderInterface {
*/ */
public function read($file) { public function read($file) {
$filename = $this->_path . $file; $filename = $this->_path . $file;
if (!file_exists($filename)) {
$filename .= '.ini';
if (!file_exists($filename)) {
throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename));
}
}
$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 = $this->_parseNestedValues($contents[$this->_section]); $values = $this->_parseNestedValues($contents[$this->_section]);

12
cake/libs/config/php_reader.php
View file

@ -57,15 +57,21 @@ class PhpReader implements ConfigReaderInterface {
if (strpos($key, '..') !== false) { if (strpos($key, '..') !== false) {
throw new ConfigureException(__('Cannot load configuration files with ../ in them.')); throw new ConfigureException(__('Cannot load configuration files with ../ in them.'));
} }
if (substr($key, -4) === '.php') {
$key = substr($key, 0, -4);
}
list($plugin, $key) = pluginSplit($key); list($plugin, $key) = pluginSplit($key);
if ($plugin) { if ($plugin) {
$file = App::pluginPath($plugin) . 'config' . DS . $key . '.php'; $file = App::pluginPath($plugin) . 'config' . DS . $key;
} else { } else {
$file = $this->_path . $key . '.php'; $file = $this->_path . $key;
} }
if (!file_exists($file)) { if (!file_exists($file)) {
throw new ConfigureException(__('Could not load configuration file: ') . $file); $file .= '.php';
if (!file_exists($file)) {
throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($file, 0, -4), $file));
}
} }
include $file; include $file;
if (!isset($config)) { if (!isset($config)) {

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

@ -114,4 +114,15 @@ class IniReaderTest extends CakeTestCase {
$this->assertFalse($config['bools']['test_null']); $this->assertFalse($config['bools']['test_null']);
} }
/**
* test read file without extension
*
* @return void
*/
public function testReadingWithoutExtension() {
$reader = new IniReader($this->path);
$config = $reader->read('nested');
$this->assertTrue($config['bools']['test_on']);
}
} }

5
cake/tests/cases/libs/config/php_reader.test.php
View file

@ -38,6 +38,9 @@ class PhpReaderTest extends CakeTestCase {
$values = $reader->read('var_test'); $values = $reader->read('var_test');
$this->assertEquals('value', $values['Read']); $this->assertEquals('value', $values['Read']);
$this->assertEquals('buried', $values['Deep']['Deeper']['Deepest']); $this->assertEquals('buried', $values['Deep']['Deeper']['Deepest']);
$values = $reader->read('var_test.php');
$this->assertEquals('value', $values['Read']);
} }
/** /**
@ -84,7 +87,9 @@ class PhpReaderTest extends CakeTestCase {
), true); ), true);
$reader = new PhpReader($this->path); $reader = new PhpReader($this->path);
$result = $reader->read('TestPlugin.load'); $result = $reader->read('TestPlugin.load');
$this->assertTrue(isset($result['plugin_load']));
$result = $reader->read('TestPlugin.load.php');
$this->assertTrue(isset($result['plugin_load'])); $this->assertTrue(isset($result['plugin_load']));
} }
} }