Merge pull request #872 from kjdev/1.2.1

dot directive parsing of ini files.
phalcon · Jul 18, 2013 · 0a6b25b · 0a6b25b
2 parents 3809225 + fa99629
commit 0a6b25b
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 9 deletions.
diff --git a/ext/config/adapter/ini.c b/ext/config/adapter/ini.c
@@ -71,6 +71,52 @@
  *
  */
 
+static inline void phalcon_config_adapter_ini_update_zval_directive(zval **arr, zval *section, zval *directive, zval **value, int flags TSRMLS_DC) {
+	zval *temp1 = NULL, *temp2 = NULL, *index = NULL;
+	int i, n;
+
+	n = zend_hash_num_elements(Z_ARRVAL_P(directive));
+
+	if (Z_TYPE_PP(arr) == IS_ARRAY) {
+		phalcon_array_fetch(&temp1, *arr, section, PH_SILENT);
+		if (Z_REFCOUNT_P(temp1) > 1) {
+			phalcon_array_update_zval(arr, section, &temp1, PH_COPY | PH_CTOR);
+		}
+		if (Z_TYPE_P(temp1) != IS_ARRAY) {
+			convert_to_array(temp1);
+			phalcon_array_update_zval(arr, section, &temp1, PH_COPY);
+		}
+
+		for (i = 0; i < n - 1; i++) {
+			phalcon_array_fetch_long(&index, directive, i, PH_NOISY);
+
+			phalcon_array_fetch(&temp2, temp1, index, PH_SILENT);
+			if (Z_REFCOUNT_P(temp2) > 1) {
+				phalcon_array_update_zval(&temp1, index, &temp2, PH_COPY | PH_CTOR);
+			}
+			if (Z_TYPE_P(temp2) != IS_ARRAY) {
+				convert_to_array(temp2);
+				phalcon_array_update_zval(&temp1, index, &temp2, PH_COPY);
+			}
+			zval_ptr_dtor(&index);
+
+			if (temp1 != NULL) {
+				zval_ptr_dtor(&temp1);
+			}
+			temp1 = temp2;
+			temp2 = NULL;
+		}
+
+		phalcon_array_fetch_long(&index, directive, n - 1, PH_NOISY);
+		phalcon_array_update_zval(&temp1, index, value, PH_COPY);
+
+		zval_ptr_dtor(&index);
+
+		if (temp1 != NULL) {
+			zval_ptr_dtor(&temp1);
+		}
+	}
+}
 
 /**
  * Phalcon\Config\Adapter\Ini initializer
@@ -91,8 +137,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, __construct){
 
 	zval *file_path, *process_sections, *ini_config;
 	zval *exception_message, *config, *directives = NULL;
-	zval *section = NULL, *value = NULL, *key = NULL, *directive_parts = NULL, *left_part = NULL;
-	zval *right_part = NULL;
+	zval *section = NULL, *value = NULL, *key = NULL, *directive_parts = NULL;
 	HashTable *ah0, *ah1;
 	HashPosition hp0, hp1;
 	zval **hd;
@@ -156,13 +201,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, __construct){
 			if (phalcon_memnstr_str(key, SL("."))) {
 				PHALCON_INIT_NVAR(directive_parts);
 				phalcon_fast_explode_str(directive_parts, SL("."), key);
-
-				PHALCON_OBS_NVAR(left_part);
-				phalcon_array_fetch_long(&left_part, directive_parts, 0, PH_NOISY);
-
-				PHALCON_OBS_NVAR(right_part);
-				phalcon_array_fetch_long(&right_part, directive_parts, 1, PH_NOISY);
-				phalcon_array_update_zval_zval_zval_multi_3(&config, section, left_part, right_part, &value, 0);
+				phalcon_config_adapter_ini_update_zval_directive(&config, section, directive_parts, &value, 0 TSRMLS_CC);
 			} else {
 				phalcon_array_update_multi_2(&config, section, key, &value, 0);
 			}

diff --git a/unit-tests/ConfigTest.php b/unit-tests/ConfigTest.php
@@ -253,5 +253,36 @@ public function testIssue829()
 
 		$this->assertEquals($actual, $expected);
 	}
+
+	public function testIniConfigDirective()
+	{
+		$config = new \Phalcon\Config\Adapter\Ini('unit-tests/config/directive.ini');
+		$actual = $config->toArray();
+		$expected = array(
+			'test' => array(
+				'parent' => array(
+					'property' => 1,
+					'property2' => 'yeah',
+					'property3' => array('baseuri' => '/phalcon/'),
+					'property4' => array(
+						'models' => array('metadata' => 'memory'),
+					),
+					'property5' => array(
+						'database' => array(
+							'adapter' => 'mysql',
+							'host' => 'localhost',
+							'username' => 'user',
+							'password' => 'passwd',
+							'name' => 'demo'),
+					),
+					'property6' => array(
+						'test' => array('a', 'b', 'c'),
+					),
+				),
+			),
+		);
+
+		$this->assertEquals($actual, $expected);
+	}
 }
 
diff --git a/unit-tests/config/directive.ini b/unit-tests/config/directive.ini
@@ -0,0 +1,13 @@
+[test]
+parent.property = On
+parent.property2 = "yeah"
+parent.property3.baseuri = /phalcon/
+parent.property4.models.metadata = memory
+parent.property5.database.adapter = mysql
+parent.property5.database.host = localhost
+parent.property5.database.username = user
+parent.property5.database.password = passwd
+parent.property5.database.name = demo
+parent.property6.test[] = a
+parent.property6.test[] = b
+parent.property6.test[] = c