Merge branch 'tree-refactoring' into develop

Author: chobie

docs/classes/tree/is_tree.rst

@@ -1,29 +1,40 @@
 .. index::
-   single: isBlob (Git\Tree method)
+   single: remove (Git\Tree method)
 
 
-Git\\Tree::isBlob
+Git\\Tree::remove
 ===========================================================
 
-inherits Git\\Object.
-
 Description
 ***********************************************************
 
-public **Git\\Tree::isBlob** ()
+public **Git\\Tree::remove** (string *$name*)
 
 
 Parameters
 ***********************************************************
 
+*name*
+  specified file name
 
 Return Values
 ***********************************************************
 
+void
+
 Examples
 ***********************************************************
 
+.. code-block:: php
+
+   <?php
+   $repository = new Git\Repository("/path/to/repository");
+   $hash = "";// blob / tree hash.
+   $tree = new Git\Tree($repository);
+   $tree->remove("README");
+   $tree_hash = $tree->write();
+
 See Also
 ***********************************************************
 
-:doc:`Git\\Object::isBlob </classes/object/is_blob>`
+:doc:`Git\\Tree </classes/tree/index>`

docs/classes/tree/is_blob.rst docs/classes/tree/remove.rstdocs/classes/tree/is_blob.rst renamed to docs/classes/tree/remove.rst

@@ -315,16 +315,14 @@ PHP_METHOD(git_commit, getTree)
 
     git_oid *tree_oid;
     zval *git_tree;
-    zval *entries;
     zval *entry;
 
     MAKE_STD_ZVAL(git_tree);
-    MAKE_STD_ZVAL(entries);
-    array_init(entries);
     object_init_ex(git_tree, git_tree_class_entry);
     php_git_tree_t *tobj = (php_git_tree_t *) zend_object_store_get_object(git_tree TSRMLS_CC);
     tobj->object = tree;
 
+/*
     int r = git_tree_entrycount(tree);
     int i = 0;
 
@@ -334,7 +332,7 @@ PHP_METHOD(git_commit, getTree)
     }
 
     add_property_zval(git_tree,"entries", entries);
-
+*/
     RETURN_ZVAL(git_tree,0,0);
 }
 

src/commit.c

@@ -29,7 +29,7 @@ if test $PHP_GIT != "no"; then
   PHP_ADD_LIBRARY_WITH_PATH(git2, $LIBGIT2_LIBDIR, GIT_SHARED_LIBADD)
 
   PHP_SUBST(GIT_SHARED_LIBADD)
-  PHP_NEW_EXTENSION(git,php_git.c reference.c reference_manager.c repository.c signature.c commit.c index_entry.c index_iterator.c index.c tree.c blob.c tree_entry.c walker.c object.c rawobject.c tag.c odb.c backend.c, $ext_shared)
+  PHP_NEW_EXTENSION(git,php_git.c reference.c reference_manager.c repository.c signature.c commit.c index_entry.c index_iterator.c index.c tree_iterator.c tree.c blob.c tree_entry.c walker.c object.c rawobject.c tag.c odb.c backend.c, $ext_shared)
 
   ifdef([PHP_ADD_EXTENSION_DEP],
   [

src/config.m4

@@ -138,6 +138,7 @@ PHP_MINIT_FUNCTION(git) {
     git_index_init(TSRMLS_C);
     git_init_signature(TSRMLS_C);
     git_init_walker(TSRMLS_C);
+    git_tree_iterator_init(TSRMLS_C);
     git_init_tree(TSRMLS_C);
     git_init_commit(TSRMLS_C);
     git_init_tree_entry(TSRMLS_C);

src/php_git.c

@@ -55,6 +55,7 @@ extern PHPAPI zend_class_entry *git_index_iterator_class_entry;
 extern PHPAPI zend_class_entry *git_index_entry_class_entry;
 extern PHPAPI zend_class_entry *git_walker_class_entry;
 extern PHPAPI zend_class_entry *git_tree_class_entry;
+extern PHPAPI zend_class_entry *git_tree_iterator_class_entry;
 extern PHPAPI zend_class_entry *git_tree_entry_class_entry;
 extern PHPAPI zend_class_entry *git_commit_class_entry;
 extern PHPAPI zend_class_entry *git_signature_class_entry;
@@ -85,6 +86,11 @@ typedef struct{
     git_tree_entry *entry;
 } php_git_tree_entry_t;
 
+typedef struct{
+    zend_object zo;
+    git_tree *tree;
+    long offset;
+} php_git_tree_iterator_t;
 
 typedef struct{
     zend_object zo;

src/php_git.h

@@ -348,7 +348,6 @@ PHP_METHOD(git_repository, getTree)
     zval *object = getThis();
     git_tree *tree;
     zval *git_tree;
-    zval *entries;
 
     git_oid oid;
     char *hash;
@@ -375,22 +374,11 @@ PHP_METHOD(git_repository, getTree)
     }
 
     MAKE_STD_ZVAL(git_tree);
-    MAKE_STD_ZVAL(entries);
-    array_init(entries);
     object_init_ex(git_tree, git_tree_class_entry);
 
-    int r = git_tree_entrycount(tree);
-    zval *array_ptr;
-
-    for(i = 0; i < r; i++){
-        create_tree_entry_from_entry(&array_ptr, git_tree_entry_byindex(tree,i));
-        add_next_index_zval(entries,  array_ptr);
-    }
-
     php_git_tree_t *tobj = (php_git_tree_t *) zend_object_store_get_object(git_tree TSRMLS_CC);
     tobj->object = tree;
 
-    add_property_zval(git_tree,"entries", entries);
     RETURN_ZVAL(git_tree,0,0);
 }
 

src/repository.c

@@ -44,6 +44,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_git_tree_path, 0, 0, 1)
     ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_git_tree_get_entry, 0, 0, 1)
+    ZEND_ARG_INFO(0, position)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_git_tree_remove, 0, 0, 1)
+    ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
 static void php_git_tree_free_storage(php_git_tree_t *obj TSRMLS_DC)
 {
     zend_object_std_dtor(&obj->zo TSRMLS_CC);
@@ -195,11 +203,92 @@ PHP_METHOD(git_tree, __construct)
     }
 }
 
+PHP_METHOD(git_tree, getIterator)
+{
+    php_git_tree_t *this = (php_git_tree_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
+    zval *iterator;
+    
+    MAKE_STD_ZVAL(iterator);
+    object_init_ex(iterator,git_tree_iterator_class_entry);
+    php_git_tree_iterator_t *obj = (php_git_tree_iterator_t *) zend_object_store_get_object(iterator TSRMLS_CC);
+    obj->tree = this->object;
+    obj->offset = 0;
+    RETURN_ZVAL(iterator,0,0);
+}
+
+PHP_METHOD(git_tree, getEntry)
+{
+    php_git_tree_t *this = (php_git_tree_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
+    git_tree_entry *entry;
+    zval *git_tree_entry;
+    int offset = 0;
+
+    if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+        "l", &offset) == FAILURE){
+        return;
+    }
+
+    entry = git_tree_entry_byindex(this->object,offset);
+    create_tree_entry_from_entry(&git_tree_entry, entry);
+    RETURN_ZVAL(git_tree_entry,0, 0);
+}
+
+PHP_METHOD(git_tree, remove)
+{
+    php_git_tree_t *this = (php_git_tree_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
+    char *path;
+    int path_len = 0;
+
+    if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+        "s", &path, &path_len) == FAILURE){
+        return;
+    }
+
+    git_tree_entry *entry = git_tree_entry_byname(this->object,path);
+    if(entry == NULL){
+        zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC,
+            "specified path does not exist.");
+        RETURN_FALSE;
+    }
+
+    int result = git_tree_remove_entry_byname(this->object, path);
+    if(result != GIT_SUCCESS){
+        zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC,
+            "can't remove tree entry");
+        RETURN_FALSE
+    }
+    RETURN_TRUE;
+}
+
+PHP_METHOD(git_tree, getEntries)
+{
+    php_git_tree_t *this = (php_git_tree_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
+    git_tree_entry *entry;
+    int i;
+    
+    int r = git_tree_entrycount(this->object);
+    zval *entries;
+    MAKE_STD_ZVAL(entries);
+    array_init(entries);
+    zval *array_ptr;
+    for(i = 0; i < r; i++){
+        create_tree_entry_from_entry(&array_ptr, git_tree_entry_byindex(this->object,i));
+        add_next_index_zval(entries,  array_ptr);
+    }
+
+    RETURN_ZVAL(entries,0,0);
+}
+
+
 PHPAPI function_entry php_git_tree_methods[] = {
     PHP_ME(git_tree, __construct, arginfo_git_tree__construct, ZEND_ACC_PUBLIC)
+    PHP_ME(git_tree, getEntry,    arginfo_git_tree_get_entry,  ZEND_ACC_PUBLIC)
+    PHP_ME(git_tree, getEntries,  NULL,                        ZEND_ACC_PUBLIC)
+    PHP_ME(git_tree, getIterator, NULL,                        ZEND_ACC_PUBLIC)
     PHP_ME(git_tree, count,       NULL,                        ZEND_ACC_PUBLIC)
     PHP_ME(git_tree, path,        arginfo_git_tree_path,       ZEND_ACC_PUBLIC)
     PHP_ME(git_tree, add,         arginfo_git_tree_add,        ZEND_ACC_PUBLIC)
+    PHP_ME(git_tree, remove,      arginfo_git_tree_remove,     ZEND_ACC_PUBLIC)
     {NULL, NULL, NULL}
 };
 
@@ -210,5 +299,5 @@ void git_init_tree(TSRMLS_D)
     git_tree_class_entry = zend_register_internal_class_ex(&ce, git_object_class_entry, NULL TSRMLS_CC);
     git_tree_class_entry->create_object = php_git_tree_new;
 
-    zend_class_implements(git_tree_class_entry TSRMLS_CC, 1, spl_ce_Countable);
+    zend_class_implements(git_tree_class_entry TSRMLS_CC, 2, spl_ce_Countable,zend_ce_aggregate);
 }