Skip to content

Commit

Permalink
renamed usages of Ini to INI
Browse files Browse the repository at this point in the history
  • Loading branch information
jakoch committed Sep 3, 2012
1 parent 27fcb3d commit f762d1b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Clansuite/Application.php
Expand Up @@ -513,7 +513,7 @@ private static function initialize_Config()
}

if ($clansuite_cfg_cached === false) {
self::$config = \Koch\Config\Adapter\Ini::readConfig(ROOT . 'Configuration/clansuite.php');
self::$config = \Koch\Config\Adapter\INI::readConfig(ROOT . 'Configuration/clansuite.php');
if (APC === true) {
apc_add('clansuite.config', self::$config);
}
Expand Down
6 changes: 3 additions & 3 deletions Installation/Application/Helper.php
Expand Up @@ -54,13 +54,13 @@ public static function write_config_settings($data_array)

// read skeleton settings, which are the minimum settings for initial startup
// (these are not asked from user during installation)
$installer_config = \Koch\Config\Adapter\Ini::readConfig(INSTALLATION_ROOT . 'config.skeleton.ini');
$installer_config = \Koch\Config\Adapter\INI::readConfig(INSTALLATION_ROOT . 'config.skeleton.ini');

// array merge: overwrite the array to the left, with the array to the right, when keys identical
$data_array = array_merge_recursive($data_array, $installer_config);

// write Config File to the APPLICATION/configuration folder
if (false === \Koch\Config\Adapter\Ini::writeConfig(ROOT_APP . 'Configuration/clansuite.php', $data_array)) {
if (false === \Koch\Config\Adapter\INI::writeConfig(ROOT_APP . 'Configuration/clansuite.php', $data_array)) {
// config not written
return false;
}
Expand Down Expand Up @@ -205,7 +205,7 @@ public static function getDoctrineEntityManager($connectionParams = null)
include KOCH . 'Config/Adapter/Ini.php';

// get clansuite config
$clansuite_config = \Koch\Config\Adapter\Ini::readConfig(ROOT_APP . 'Configuration/clansuite.php');
$clansuite_config = \Koch\Config\Adapter\INI::readConfig(ROOT_APP . 'Configuration/clansuite.php');

// reduce config array to the dsn/connection settings
$connectionParams = $clansuite_config['database'];
Expand Down
2 changes: 1 addition & 1 deletion framework/Koch/Config/Staging.php
Expand Up @@ -43,7 +43,7 @@ class Staging
public static function overloadWithStagingConfig($array_to_overload)
{
// load staging config
$staging_config = \Koch\Config\Adapter\Ini::readConfig(self::getFilename());
$staging_config = \Koch\Config\Adapter\INI::readConfig(self::getFilename());

// keys/values of array_to_overload are replaced with those of the staging_config
return array_replace_recursive($array_to_overload, $staging_config);
Expand Down
2 changes: 1 addition & 1 deletion tests/unittests/framework/Koch/Config/Adapter/Ini.php
Expand Up @@ -3,7 +3,7 @@
require_once 'autorun.php';
}

use Koch\Config\Adapter\Ini;
use Koch\Config\Adapter\INI;

class IniTest extends Clansuite_UnitTestCase
{
Expand Down

0 comments on commit f762d1b

Please sign in to comment.