diff options
author | Andrey Andreev <narf@devilix.net> | 2014-12-16 15:16:45 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2014-12-16 15:16:45 +0100 |
commit | 42bc6d51e15c180f35632d5c03c649225f8dbf74 (patch) | |
tree | 0cb000e668153eb2abf1e23a3998487ac6fd6bc6 /tests | |
parent | 91b38db77d6863a6eed36fcc15feea5ba9a6343f (diff) |
Fix #3419
Diffstat (limited to 'tests')
-rw-r--r-- | tests/codeigniter/core/Config_test.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php index 8e312e361..f125fc6e9 100644 --- a/tests/codeigniter/core/Config_test.php +++ b/tests/codeigniter/core/Config_test.php @@ -205,13 +205,18 @@ class Config_test extends CI_TestCase { 'number' => 42, 'letter' => 'Z' ); + $pkg_dir = 'package'; - $this->ci_vfs_create($file.'.php', '<?php $config = '.var_export($cfg2, TRUE).';', $this->ci_app_root, - array($pkg_dir, 'config')); - $this->config->_config_paths[] = $this->ci_vfs_path($pkg_dir.'/', APPPATH); + $this->ci_vfs_create( + $file.'.php', + '<?php $config = '.var_export($cfg2, TRUE).';', + $this->ci_app_root, + array($pkg_dir, 'config') + ); + array_unshift($this->config->_config_paths, $this->ci_vfs_path($pkg_dir.'/', APPPATH)); $this->assertTrue($this->config->load($file, TRUE)); $this->assertEquals(array_merge($cfg, $cfg2), $this->config->item($file)); - array_pop($this->config->_config_paths); + array_shift($this->config->_config_paths); // Test graceful fail of invalid file $file = 'badfile'; |