Skip to content

Commit 568648d

Browse files
chobiechobie
committed
added Git2\Commit::getAuthor and getCommitter
1 parent 70d376a commit 568648d

File tree

5 files changed

+141
-19
lines changed

5 files changed

+141
-19
lines changed

‎commit.c‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,60 @@ PHP_METHOD(git2_commit, parentCount)
115115
}
116116
/* }}} */
117117

118+
/*
119+
{{{ proto: Git2\Commit::getAuthor()
120+
*/
121+
PHP_METHOD(git2_commit, getAuthor)
122+
{
123+
unsigned int parent_count = 0;
124+
php_git2_commit *m_commit;
125+
zval *z_signature, *date;
126+
127+
m_commit = PHP_GIT2_GET_OBJECT(php_git2_commit, getThis());
128+
129+
if (m_commit != NULL) {
130+
if (m_commit->commit == NULL) {
131+
RETURN_FALSE;
132+
}
133+
134+
php_git2_create_signature_from_commit(&z_signature, m_commit->commit, 0 TSRMLS_CC);
135+
RETVAL_ZVAL(z_signature, 0, 1);
136+
} else {
137+
RETURN_FALSE;
138+
}
139+
}
140+
/* }}} */
141+
142+
/*
143+
{{{ proto: Git2\Commit::getCommitter()
144+
*/
145+
PHP_METHOD(git2_commit, getCommitter)
146+
{
147+
unsigned int parent_count = 0;
148+
php_git2_commit *m_commit;
149+
zval *z_signature, *date;
150+
151+
m_commit = PHP_GIT2_GET_OBJECT(php_git2_commit, getThis());
152+
153+
if (m_commit != NULL) {
154+
if (m_commit->commit == NULL) {
155+
RETURN_FALSE;
156+
}
157+
158+
php_git2_create_signature_from_commit(&z_signature, m_commit->commit,1 TSRMLS_CC);
159+
RETVAL_ZVAL(z_signature, 0, 1);
160+
} else {
161+
RETURN_FALSE;
162+
}
163+
}
164+
/* }}} */
165+
118166
static zend_function_entry php_git2_commit_methods[] = {
119167
PHP_ME(git2_commit, getMessage, NULL, ZEND_ACC_PUBLIC)
120168
PHP_ME(git2_commit, getMessageEncoding, NULL, ZEND_ACC_PUBLIC)
121169
PHP_ME(git2_commit, parentCount, NULL, ZEND_ACC_PUBLIC)
170+
PHP_ME(git2_commit, getAuthor, NULL, ZEND_ACC_PUBLIC)
171+
PHP_ME(git2_commit, getCommitter, NULL, ZEND_ACC_PUBLIC)
122172
{NULL,NULL,NULL}
123173
};
124174

‎php_git2.h‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
# include "php.h"
3636
# include "ext/spl/spl_exceptions.h"
37+
# include <date/php_date.h>
3738
# include <git2.h>
3839
# include <git2/odb_backend.h>
3940

@@ -48,8 +49,8 @@ extern PHPAPI zend_class_entry *git2_blob_class_entry;
4849
extern PHPAPI zend_class_entry *git2_tree_class_entry;
4950
extern PHPAPI zend_class_entry *git2_tree_builder_class_entry;
5051
extern PHPAPI zend_class_entry *git2_tree_entry_class_entry;
51-
extern PHPAPI zend_class_entry *git2_tree_signature_entry;
52-
extern PHPAPI zend_class_entry *git2_walker_entry;
52+
extern PHPAPI zend_class_entry *git2_signature_class_entry;
53+
extern PHPAPI zend_class_entry *git2_walker_class_entry;
5354

5455
typedef struct{
5556
zend_object zo;
@@ -129,4 +130,38 @@ extern int php_git2_add_protected_property_string_ex(zval *object, char *name, i
129130
extern zval* php_git2_object_new(php_git2_repository *repository, git_object *object TSRMLS_DC);
130131
extern int php_git2_call_user_function_v(zval **retval, zval *obj, char *method, unsigned int method_len, unsigned int param_count, ...);
131132

133+
extern inline void php_git2_create_signature(zval *object, char *name, int name_len, char *email, int email_len, zval *date TSRMLS_DC);
134+
135+
136+
static inline php_git2_create_signature_from_commit(zval **object, php_git2_commit *commit, int type TSRMLS_DC)
137+
{
138+
zval *ret;
139+
zval *z_signature, *date;
140+
char time_str[12] = {0};
141+
git_signature *author;
142+
php_git2_signature *m_signature;
143+
144+
if (type == 0) {
145+
author = git_commit_author(commit);
146+
} else {
147+
author = git_commit_committer(commit);
148+
}
149+
150+
MAKE_STD_ZVAL(ret);
151+
MAKE_STD_ZVAL(date);
152+
153+
object_init_ex(ret,git2_signature_class_entry);
154+
m_signature = PHP_GIT2_GET_OBJECT(php_git2_signature, ret);
155+
add_property_string_ex(ret,"name",sizeof("name"), author->name,1 TSRMLS_CC);
156+
add_property_string_ex(ret,"email",sizeof("email"),author->email,1 TSRMLS_CC);
157+
158+
php_date_instantiate(php_date_get_date_ce(), date TSRMLS_CC);
159+
snprintf(time_str,12,"%c%ld",'@',author->when.time);
160+
php_date_initialize(zend_object_store_get_object(date TSRMLS_CC), time_str, strlen(time_str), NULL, NULL, 0 TSRMLS_CC);
161+
162+
add_property_zval(ret,"time",date);
163+
zval_ptr_dtor(&date);
164+
*object = ret;
165+
}
166+
132167
#endif /* PHP_GIT2_H */

‎signature.c‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,24 @@
2828

2929
PHPAPI zend_class_entry *git2_signature_class_entry;
3030

31+
inline void php_git2_create_signature(zval *object, char *name, int name_len, char *email, int email_len, zval *date TSRMLS_DC)
32+
{
33+
zval *z_name, *z_email = NULL;
34+
35+
MAKE_STD_ZVAL(z_name);
36+
MAKE_STD_ZVAL(z_email);
37+
ZVAL_STRINGL(z_name,name,name_len,1);
38+
ZVAL_STRINGL(z_email,email,email_len,1);
39+
40+
add_property_zval_ex(object, "name", sizeof("name") ,z_name TSRMLS_CC);
41+
add_property_zval_ex(object, "email",sizeof("email"),z_email TSRMLS_CC);
42+
add_property_zval_ex(object, "time", sizeof("time") ,date TSRMLS_CC);
43+
44+
zval_ptr_dtor(&z_email);
45+
zval_ptr_dtor(&z_name);
46+
}
47+
48+
3149
static void php_git2_signature_free_storage(php_git2_signature *object TSRMLS_DC)
3250
{
3351
if (object->signature != NULL) {
@@ -52,23 +70,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_git2_signature___construct, 0,0,3)
5270
ZEND_ARG_INFO(0, date)
5371
ZEND_END_ARG_INFO()
5472

55-
void php_git2_create_signature(zval *object, char *name, int name_len, char *email, int email_len, zval *date TSRMLS_DC)
56-
{
57-
zval *z_name, *z_email = NULL;
58-
59-
MAKE_STD_ZVAL(z_name);
60-
MAKE_STD_ZVAL(z_email);
61-
ZVAL_STRINGL(z_name,name,name_len,1);
62-
ZVAL_STRINGL(z_email,email,email_len,1);
63-
64-
add_property_zval_ex(object, "name", sizeof("name") ,z_name TSRMLS_CC);
65-
add_property_zval_ex(object, "email",sizeof("email"),z_email TSRMLS_CC);
66-
add_property_zval_ex(object, "time", sizeof("time") ,date TSRMLS_CC);
67-
68-
zval_ptr_dtor(&z_email);
69-
zval_ptr_dtor(&z_name);
70-
}
71-
7273
/*
7374
{{{ proto: Git2\Signature::__construct(string $name, string $email, \DateTime $time)
7475
*/

‎tests/002-05-commit_get_author.phpt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--TEST--
2+
Check for Git2\Commit::getAuthor
3+
--SKIPIF--
4+
<?php if (!extension_loaded("git2")) print "skip"; ?>
5+
--FILE--
6+
<?php
7+
date_default_timezone_set('Asia/Tokyo');
8+
$repo = new Git2\Repository(__DIR__ . "/mock/001-01");
9+
$commit = $repo->lookup("ab68c54212af15d3545c41057e3a8f2f9ff6fd0d");
10+
11+
$signature = $commit->getAuthor();
12+
printf("name: %s\n", $signature->name);
13+
printf("email: %s\n", $signature->email);
14+
printf("time: %s\n", $signature->time->format("Y-m-d H:i:s"));
15+
--EXPECT--
16+
name: Shuhei Tanuma
17+
email: [email protected]
18+
time: 2012-01-17 21:50:45

‎tests/002-06-commit_get_committer.phpt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--TEST--
2+
Check for Git2\Commit::getCommitter
3+
--SKIPIF--
4+
<?php if (!extension_loaded("git2")) print "skip"; ?>
5+
--FILE--
6+
<?php
7+
date_default_timezone_set('Asia/Tokyo');
8+
$repo = new Git2\Repository(__DIR__ . "/mock/001-01");
9+
$commit = $repo->lookup("ab68c54212af15d3545c41057e3a8f2f9ff6fd0d");
10+
11+
$signature = $commit->getCommitter();
12+
printf("name: %s\n", $signature->name);
13+
printf("email: %s\n", $signature->email);
14+
printf("time: %s\n", $signature->time->format("Y-m-d H:i:s"));
15+
--EXPECT--
16+
name: Shuhei Tanuma
17+
email: [email protected]
18+
time: 2012-01-17 21:50:45

0 commit comments

Comments
 (0)