[evolvis-commits] r15250: Fix for the config system (and its testsuite)

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 23:51:29 CET 2011


Author: mirabilos
Date: 2011-02-28 23:51:29 +0100 (Mon, 28 Feb 2011)
New Revision: 15250

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php
   trunk/gforge_base/evolvisforge-5.1/tests/unit/config/ConfigTest.php
Log:
Fix for the config system (and its testsuite)

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php	2011-02-28 22:51:26 UTC (rev 15249)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php	2011-02-28 22:51:29 UTC (rev 15250)
@@ -71,7 +71,7 @@
 	}
 
 	function mark_as_bool ($section, $var) {
-		if (!array_has_key ($this->bools, $section)) {
+		if (!array_key_exists ($section, $this->bools)) {
 			$this->bools[$section] = array () ;
 		}
 		$this->bools[$section][$var] = true ;

Modified: trunk/gforge_base/evolvisforge-5.1/tests/unit/config/ConfigTest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/unit/config/ConfigTest.php	2011-02-28 22:51:26 UTC (rev 15249)
+++ trunk/gforge_base/evolvisforge-5.1/tests/unit/config/ConfigTest.php	2011-02-28 22:51:29 UTC (rev 15250)
@@ -20,12 +20,13 @@
 	{
 		forge_define_config_item ('forge_name', 'core', 'default') ;
 		forge_define_config_item ('user_registration_restricted', 'core', true) ;
+		forge_set_config_item_bool ('user_registration_restricted', 'core') ;
 
 		$this->assertEquals('default', forge_get_config ('forge_name'));
 		$this->assertEquals('default', forge_get_config ('forge_name', 'core'));
 		$this->assertTrue(forge_get_config ('user_registration_restricted'));
 
-		forge_read_config_file (dirname(__FILE__) . '/../../../gforge/etc/config.ini') ;
+		forge_read_config_file (dirname(__FILE__) . '/../../../gforge/etc/config.ini-fhs') ;
 
 		$this->assertEquals('FusionForge', forge_get_config ('forge_name'));
 		$this->assertEquals('FusionForge', forge_get_config ('forge_name', 'core'));
@@ -33,12 +34,12 @@
 
 		$arr = forge_get_config_array ('forge_name', array ('user_registration_restricted', 'core')) ;
 		$this->assertEquals('FusionForge', $arr[0]);
-		$this->assertFalse(!!$arr[1]);
+		$this->assertFalse($arr[1]);
 
 		forge_set_vars_from_config ('forge_name', array ('user_registration_restricted', 'core')) ;
 		global $forge_name, $core__user_registration_restricted ;
 		$this->assertEquals('FusionForge', $forge_name);
-		$this->assertFalse(!!$core__user_registration_restricted);
+		$this->assertFalse($core__user_registration_restricted);
 
 	}
 



More information about the evolvis-commits mailing list