added Git2\Config

Author: Shuhei Tanuma

Diff for: config.c

@@ -0,0 +1,179 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010 - 2012 Shuhei Tanuma
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "php_git2.h"
+#include <spl/spl_array.h>
+#include <zend_interfaces.h>
+
+PHPAPI zend_class_entry *git2_config_class_entry;
+
+static void php_git2_config_free_storage(php_git2_config *object TSRMLS_DC)
+{
+	if (object->config != NULL) {
+		free(object->config);
+		object->config = NULL;
+	}
+	zend_object_std_dtor(&object->zo TSRMLS_CC);
+	efree(object);
+}
+
+zend_object_value php_git2_config_new(zend_class_entry *ce TSRMLS_DC)
+{
+	zend_object_value retval;
+
+	PHP_GIT2_STD_CREATE_OBJECT(php_git2_config);
+	return retval;
+}
+
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_git2_config___construct, 0,0,1)
+	ZEND_ARG_INFO(0, entry)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_git2_config_get, 0,0,1)
+	ZEND_ARG_INFO(0, get)
+ZEND_END_ARG_INFO()
+
+typedef struct{
+	zval *result;
+	git_config *config;
+} php_git2_config_foreach_t;
+
+static int php_git2_config_foreach(const char *var_name, const char *value, void *payload)
+{
+	HashTable *hash;
+	zval *entry, **target_offset;
+	const char *config_value;
+	char *current_key, *tmp_value, *savedptr, *k;
+	php_git2_config_foreach_t *opaque = (php_git2_config_foreach_t *)payload;
+	int error = 0;
+	
+	hash = Z_ARRVAL_P(opaque->result);
+	
+	error = git_config_get_string(opaque->config, var_name, &config_value);
+
+	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) {
+			if (zend_hash_exists(hash, k, strlen(k)+1)) {
+				if (zend_hash_find(hash,k, strlen(k)+1, (void **)&target_offset) == SUCCESS) {
+					hash = Z_ARRVAL_P(*target_offset);
+				}
+			} else {
+				MAKE_STD_ZVAL(entry);
+				array_init(entry);
+				zend_hash_add(hash, k, strlen(k)+1, (void **)&entry, sizeof(entry), NULL);
+				hash = Z_ARRVAL_P(entry);
+			}
+		}
+	}
+	
+	if (k != NULL) {
+		MAKE_STD_ZVAL(entry);
+		ZVAL_STRING(entry, config_value, 1);
+		zend_hash_add(hash, k, strlen(k)+1, (void **)&entry, sizeof(entry), NULL);
+		Z_ADDREF_P(entry);
+		zval_ptr_dtor(&entry);
+	}
+	efree(tmp_value);
+	
+	return GIT_SUCCESS;
+}
+
+/*
+{{{ proto: Git2\Config::__construct(string $path)
+*/
+PHP_METHOD(git2_config, __construct)
+{
+	char *path;
+	git_config *config;
+	int error, path_len = 0;
+	php_git2_config *m_config;
+	zval *config_array;
+	php_git2_config_foreach_t payload;
+
+	/* @todo: supports array for reading multiple configs */
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+		"s", &path, &path_len) == FAILURE) {
+		return;
+	}
+	
+	error = git_config_open_ondisk(&config, path);
+	/* @todo: automatic convert types */
+	m_config = PHP_GIT2_GET_OBJECT(php_git2_config, getThis());
+	m_config->config = config;
+	
+	/* @todo: think solution */
+	MAKE_STD_ZVAL(config_array);
+	array_init(config_array);
+	
+	payload.config = config;
+	payload.result = config_array;
+	error = git_config_foreach(config,&php_git2_config_foreach,&payload);
+	add_property_zval(getThis(), "configs", config_array);
+	zval_ptr_dtor(&config_array);
+}
+/* }}} */
+
+/*
+{{{ proto: Git2\Config::get(string $key)
+*/
+PHP_METHOD(git2_config, get)
+{
+	char *key;
+	git_config *config;
+	int error, key_len = 0;
+	const char *value;
+	php_git2_config *m_config;
+
+	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);
+}
+/* }}} */
+
+
+static zend_function_entry php_git2_config_methods[] = {
+	PHP_ME(git2_config, __construct, arginfo_git2_config___construct, ZEND_ACC_PUBLIC)
+	PHP_ME(git2_config, get,         arginfo_git2_config_get,         ZEND_ACC_PUBLIC)
+	{NULL,NULL,NULL}
+};
+
+void php_git2_config_init(TSRMLS_D)
+{
+	zend_class_entry ce;
+	
+	INIT_NS_CLASS_ENTRY(ce, PHP_GIT2_NS, "Config", php_git2_config_methods);
+	git2_config_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
+	git2_config_class_entry->create_object = php_git2_config_new;
+}

Diff for: config.m4

@@ -41,6 +41,7 @@ if test $PHP_GIT2 != "no"; then
 				reference.c \
 				index.c \
 				index_entry.c \
+				config.c \
 	, $ext_shared)
 
 	ifdef([PHP_ADD_EXTENSION_DEP],

Diff for: git2.c

@@ -32,6 +32,7 @@ extern void php_git2_tree_builder_init(TSRMLS_D);
 extern void php_git2_signature_init(TSRMLS_D);
 extern void php_git2_walker_init(TSRMLS_D);
 extern void php_git2_reference_init(TSRMLS_D);
+extern void php_git2_config_init(TSRMLS_D);
 
 
 int php_git2_call_user_function_v(zval **retval, zval *obj, char *method, unsigned int method_len, unsigned int param_count, ...)
@@ -176,6 +177,7 @@ PHP_MINIT_FUNCTION(git2)
 	php_git2_reference_init(TSRMLS_C);
 	php_git2_index_entry_init(TSRMLS_C);
 	php_git2_index_init(TSRMLS_C);
+	php_git2_config_init(TSRMLS_C);
 
 	return SUCCESS;
 }

Diff for: php_git2.h

@@ -54,6 +54,7 @@ extern PHPAPI zend_class_entry *git2_walker_class_entry;
 extern PHPAPI zend_class_entry *git2_reference_class_entry;
 extern PHPAPI zend_class_entry *git2_index_class_entry;
 extern PHPAPI zend_class_entry *git2_index_entry_class_entry;
+extern PHPAPI zend_class_entry *git2_config_class_entry;
 
 typedef struct{
 	zend_object zo;
@@ -115,6 +116,11 @@ typedef struct{
 	git_index_entry *entry;
 } php_git2_index_entry;
 
+typedef struct{
+	zend_object zo;
+	git_config *config;
+} php_git2_config;
+
 
 #  define PHP_GIT2_GET_OBJECT(STRUCT_NAME, OBJECT) (STRUCT_NAME *) zend_object_store_get_object(OBJECT TSRMLS_CC);