Skip to content

Commit a4c0ba8

Browse files
committed
changed method name Git\Reference\Manager::lookupRef to lookup.
php-compat defined `#define lookup php_lookup`.so i can't define lookup method. undef `lookup` value andrename lookupRef() to lookup().
1 parent 3b34aa0 commit a4c0ba8

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed
Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
.. index::
2-
single: lookupRef (Git\Reference\Manager method)
2+
single: lookup (Git\Reference\Manager method)
33

44

5-
Git\\Reference\\Manager::lookupRef
5+
Git\\Reference\\Manager::lookup
66
===========================================================
77

8-
this method same as Git\Repository::lookupRef();
8+
this method same as Git\Repository::lookup();
99

1010
Description
1111
***********************************************************
1212

13-
public **Git\\Reference\\Manager::lookupRef** (string *$name*)
13+
public **Git\\Reference\\Manager::lookup** (string *$name*)
1414

1515

1616
Parameters
@@ -25,6 +25,12 @@ Return Values
2525

2626
Git\\Reference
2727

28+
ChangeLog
29+
***********************************************************
30+
31+
- method name changed from lookupRef to lookup.
32+
(can't define lookup method because php-compat defines `lookup` preprocessor.)
33+
2834
Examples
2935
***********************************************************
3036

@@ -33,7 +39,7 @@ Examples
3339
<?php
3440
$repo = new Git\Repository("/path/to/repository/.git");
3541
$manager = new Git\Reference\Manager($repo);
36-
$ref = $manager->lookupRef("refs/heads/master");
42+
$ref = $manager->lookup("refs/heads/master");
3743
3844
3945
See Also

src/reference_manager.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <zend_interfaces.h>
2828
#include <string.h>
2929
#include <time.h>
30+
#undef lookup
3031

3132
PHPAPI zend_class_entry *git_reference_manager_class_entry;
3233

@@ -161,7 +162,7 @@ PHP_METHOD(git_reference_manager, pack)
161162
RETURN_TRUE;
162163
}
163164

164-
PHP_METHOD(git_reference_manager, lookupRef)
165+
PHP_METHOD(git_reference_manager, lookup)
165166
{
166167
php_git_reference_manager_t *this = (php_git_reference_manager_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
167168
char *name;
@@ -279,7 +280,7 @@ PHP_METHOD(git_reference_manager, create)
279280
PHPAPI function_entry php_git_reference_manager_methods[] = {
280281
PHP_ME(git_reference_manager, __construct, arginfo_git_reference_manager__construct, ZEND_ACC_PUBLIC)
281282
PHP_ME(git_reference_manager, getList, NULL, ZEND_ACC_PUBLIC)
282-
PHP_ME(git_reference_manager, lookupRef, arginfo_git_reference_manager_lookup, ZEND_ACC_PUBLIC)
283+
PHP_ME(git_reference_manager, lookup, arginfo_git_reference_manager_lookup, ZEND_ACC_PUBLIC)
283284
PHP_ME(git_reference_manager, pack, NULL, ZEND_ACC_PUBLIC)
284285
PHP_ME(git_reference_manager, create, arginfo_git_reference_manager_create, ZEND_ACC_PUBLIC)
285286
{NULL, NULL, NULL}

0 commit comments

Comments
 (0)