modified Git2\Config::get

Author: chobie

config.c

@@ -60,6 +60,52 @@ typedef struct{
 	git_config *config;
 } php_git2_config_foreach_t;
 
+static int php_git2_config_resolve(zval **result, const char *var_name, zval *m_config)
+{
+	TSRMLS_FETCH();
+	HashTable *hash;
+	zval *entry, *tmp_result, **target_offset;
+	char *current_key, *tmp_value, *savedptr, *k;
+	int error = 0;
+	
+	entry = zend_read_property(git2_config_class_entry, m_config,"configs",sizeof("configs")-1, 0 TSRMLS_CC);
+	
+	tmp_value = estrdup(var_name);
+	current_key = php_strtok_r(tmp_value, ".", &savedptr);
+	while (current_key != NULL) {
+		k  = current_key;
+		current_key = php_strtok_r(NULL, ".", &savedptr);
+		
+		if (current_key != NULL && k != NULL) {
+			if (zend_hash_exists(Z_ARRVAL_P(entry), k, strlen(k)+1)) {
+				if (zend_hash_find(Z_ARRVAL_P(entry), k, strlen(k)+1, (void **)&target_offset) == SUCCESS) {
+					entry = *target_offset;
+				}
+			} else {
+				target_offset = NULL;
+			}
+		} else {
+			if (k != NULL) {
+				if (zend_hash_find(Z_ARRVAL_P(entry), k, strlen(k)+1, (void **)&target_offset) != SUCCESS) {
+					target_offset = NULL;
+				}
+			}
+		}
+	}
+	efree(tmp_value);
+	
+	if (target_offset != NULL) {
+		MAKE_STD_ZVAL(tmp_result);
+		ZVAL_ZVAL(tmp_result, *target_offset,1,0);
+	} else {
+		MAKE_STD_ZVAL(tmp_result);
+		ZVAL_NULL(tmp_result);
+	}
+	*result = tmp_result;
+	
+	return error;
+}
+
 static int php_git2_config_foreach(const char *var_name, const char *value, void *payload)
 {
 	HashTable *hash;
@@ -150,15 +196,19 @@ PHP_METHOD(git2_config, get)
 	int error, key_len = 0;
 	const char *value;
 	php_git2_config *m_config;
+	zval *result;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"s", &key, &key_len) == FAILURE) {
 		return;
 	}
 
-	m_config = PHP_GIT2_GET_OBJECT(php_git2_config, getThis());
-	error = git_config_get_string(m_config->config, key, &value);
-	RETVAL_STRING(value, 1);
+	if (key_len < 1) {
+		RETURN_FALSE;
+	}
+	
+	php_git2_config_resolve(&result, (const char *)key, getThis());
+	RETVAL_ZVAL(result,0,1);
 }
 /* }}} */
 

tests/00a-01-config___construct.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Check for Git2\Config::__construct
+--SKIPIF--
+<?php if (!extension_loaded("git2")) print "skip"; ?>
+--FILE--
+<?php
+$path = __DIR__ . '/fixtures/testrepo.git/config';
+$config = new Git2\Config($path);
+var_dump($config);
+--EXPECT--
+object(Git2\Config)#1 (1) {
+  ["configs"]=>
+  array(1) {
+    ["core"]=>
+    array(4) {
+      ["repositoryformatversion"]=>
+      string(1) "0"
+      ["filemode"]=>
+      string(4) "true"
+      ["bare"]=>
+      string(4) "true"
+      ["ignorecase"]=>
+      string(4) "true"
+    }
+  }
+}

tests/00a-02-config_get.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Check for Git2\Config::get
+--SKIPIF--
+<?php if (!extension_loaded("git2")) print "skip"; ?>
+--FILE--
+<?php
+$path = __DIR__ . '/fixtures/testrepo.git/config';
+$config = new Git2\Config($path);
+echo $config->get("core.repositoryformatversion") . PHP_EOL;
+echo $config->get("core.filemode") . PHP_EOL;
+echo $config->get("core.bare") . PHP_EOL;
+echo $config->get("core.ignorecase") . PHP_EOL;
+echo ($config->get("core") == array("repositoryformatversion"=>"0","filemode"=>"true","bare"=>"true","ignorecase"=>"true")) ? "OK\n" : "FAIL\n";
+echo ($config->get("") == false)  ? "OK\n" : "FAIL\n";
+echo ($config->get("core.uhi") == false)  ? "OK\n" : "FAIL\n";
+--EXPECT--
+0
+true
+true
+true
+OK
+OK
+OK

tests/fixtures/testrepo.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

tests/fixtures/testrepo.git/config

@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true

tests/fixtures/testrepo.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

tests/fixtures/testrepo.git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~