ports/189863: [MAINTAINER] devel/pecl-test_helpers: update to 1.1.0_1
Gasol Wu
gasol.wu at gmail.com
Fri May 16 15:50:00 UTC 2014
>Number: 189863
>Category: ports
>Synopsis: [MAINTAINER] devel/pecl-test_helpers: update to 1.1.0_1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri May 16 15:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Gasol Wu
>Release: FreeBSD 9.2-RELEASE-p5 amd64
>Organization:
>Environment:
System: FreeBSD goingmarry 9.2-RELEASE-p5 FreeBSD 9.2-RELEASE-p5 #0: Tue Apr 29 19:09:13 UTC 2014
>Description:
- Update to 1.1.0_1
- Fix build in PHP 5.5
See https://github.com/php-test-helpers/php-test-helpers/commit/c04ae7e2f591592480696d0a5ea0fec1340e8dbb
- Use USES directive instead of EXTRACT_SUFX
- Add LICENSE
Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- pecl-test_helpers-1.1.0.patch begins here ---
diff -ruN /usr/ports/devel/pecl-test_helpers/Makefile ./Makefile
--- /usr/ports/devel/pecl-test_helpers/Makefile 2014-01-23 23:12:50.000000000 +0800
+++ ./Makefile 2014-05-16 23:33:39.000000000 +0800
@@ -3,14 +3,17 @@
PORTNAME= test_helpers
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= devel pear
MASTER_SITES= http://pear.phpunit.de/get/
PKGNAMEPREFIX= pecl-
-EXTRACT_SUFX= .tgz
MAINTAINER= gasol.wu at gmail.com
COMMENT= Extension to ease testing of PHP code
+LICENSE= BSD
+
+USES= tar:tgz
CONFIGURE_ARGS= --enable-test-helpers
USE_PHP= yes
USE_PHPEXT= yes
diff -ruN /usr/ports/devel/pecl-test_helpers/files/patch-test_helpers.c ./files/patch-test_helpers.c
--- /usr/ports/devel/pecl-test_helpers/files/patch-test_helpers.c 2014-01-23 01:40:44.000000000 +0800
+++ ./files/patch-test_helpers.c 2014-05-16 23:40:26.000000000 +0800
@@ -1,37 +1,100 @@
---- ./test_helpers.c.orig 2010-10-25 15:05:08.000000000 +0800
-+++ ./test_helpers.c 2012-10-08 17:41:40.355030000 +0800
-@@ -102,14 +102,30 @@
- case IS_CONST:
- return &(node->u.constant);
- case IS_VAR:
-+#if ZEND_EXTENSION_API_NO >= 220100525
-+ return EX_T(node->u.op.var).var.ptr;
-+#else
- return EX_T(node->u.var).var.ptr;
-+#endif
- case IS_TMP_VAR:
-+#if ZEND_EXTENSION_API_NO >= 220100525
-+ return (*freeval = &EX_T(node->u.op.var).tmp_var);
-+#else
- return (*freeval = &EX_T(node->u.var).tmp_var);
-+#endif
- case IS_CV:
- {
-+#if ZEND_EXTENSION_API_NO >= 220100525
-+ zval ***ret = &execute_data->CVs[node->u.op.var];
-+#else
- zval ***ret = &execute_data->CVs[node->u.var];
-+#endif
- if (!*ret) {
-+#if ZEND_EXTENSION_API_NO >= 220100525
-+ zend_compiled_variable *cv = &EG(active_op_array)->vars[node->u.op.var];
-+#else
- zend_compiled_variable *cv = &EG(active_op_array)->vars[node->u.var];
-+#endif
- if (zend_hash_quick_find(EG(active_symbol_table), cv->name, cv->name_len+1, cv->hash_value, (void**)ret)==FAILURE) {
- zend_error(E_NOTICE, "Undefined variable: %s", cv->name);
- return &EG(uninitialized_zval);
-@@ -165,7 +181,11 @@
+--- ./test_helpers.c.orig 2014-05-16 23:36:31.000000000 +0800
++++ ./test_helpers.c 2014-05-16 23:36:38.000000000 +0800
+@@ -92,37 +92,69 @@
+
+ #undef EX
+ #define EX(element) execute_data->element
+-#define EX_T(offset) (*(temp_variable *)((char *) EX(Ts) + offset))
+
+-static zval *pth_get_zval_ptr(znode *node, zval **freeval, zend_execute_data *execute_data TSRMLS_DC) /* {{{ */
++#if PHP_VERSION_ID >= 50500
++# define EX_T(offset) (*EX_TMP_VAR(execute_data, offset))
++#else
++# define EX_T(offset) (*(temp_variable *)((char*)execute_data->Ts + offset))
++#endif
++
++#if PHP_VERSION_ID >= 50399
++# define PTH_ZNODE znode_op
++# define PTH_TYPE(t) t##_type
++#else
++# define PTH_ZNODE znode
++# define PTH_TYPE(t) t.op_type
++#endif
++
++zval *pth_get_zval_ptr(int node_type, PTH_ZNODE *node, zval **freeval, zend_execute_data *execute_data TSRMLS_DC)
+ {
+ *freeval = NULL;
+
+- switch (node->op_type) {
+- case IS_CONST:
+- return &(node->u.constant);
+- case IS_VAR:
+- return EX_T(node->u.var).var.ptr;
+- case IS_TMP_VAR:
+- return (*freeval = &EX_T(node->u.var).tmp_var);
+- case IS_CV:
+- {
+- zval ***ret = &execute_data->CVs[node->u.var];
+- if (!*ret) {
+- zend_compiled_variable *cv = &EG(active_op_array)->vars[node->u.var];
+- if (zend_hash_quick_find(EG(active_symbol_table), cv->name, cv->name_len+1, cv->hash_value, (void**)ret)==FAILURE) {
+- zend_error(E_NOTICE, "Undefined variable: %s", cv->name);
+- return &EG(uninitialized_zval);
+- }
+- }
+- return **ret;
++ switch (node_type) {
++ case IS_CONST:
++#if PHP_VERSION_ID >= 50399
++ return node->zv;
++#else
++ return &node->u.constant;
++#endif
++ break;
++
++ case IS_VAR:
++#if PHP_VERSION_ID >= 50399
++ if (EX_T(node->var).var.ptr) {
++ return EX_T(node->var).var.ptr;
++#else
++ if (EX_T(node->u.var).var.ptr) {
++ return EX_T(node->u.var).var.ptr;
++#endif
++ }
++ break;
++
++ case IS_TMP_VAR:
++#if PHP_VERSION_ID >= 50399
++ return (*freeval = &EX_T(node->var).tmp_var);
++#else
++ return (*freeval = &EX_T(node->u.var).tmp_var);
++#endif
++ break;
++
++ case IS_CV: {
++ zval **tmp;
++#if PHP_VERSION_ID >= 50399
++ tmp = zend_get_compiled_variable_value(execute_data, node->constant);
++#else
++ tmp = zend_get_compiled_variable_value(execute_data, node->u.constant.value.lval);
++#endif
++ if (tmp) {
++ return *tmp;
++ }
++ break;
+ }
+- case IS_UNUSED:
+- default:
+- return NULL;
+ }
++
++ return NULL;
+ }
+-/* }}} */
+
+ static void test_helpers_free_handler(zend_fcall_info *fci) /* {{{ */
+ {
+@@ -165,7 +197,11 @@
}
}
@@ -43,7 +106,7 @@
MAKE_STD_ZVAL(arg);
ZVAL_STRINGL(arg, old_ce->name, old_ce->name_length, 1);
-@@ -189,7 +209,11 @@
+@@ -189,7 +225,11 @@
zval_ptr_dtor(&retval);
@@ -55,3 +118,20 @@
if (old_new_handler) {
return old_new_handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
+@@ -202,6 +242,7 @@
+ static int pth_exit_handler(ZEND_OPCODE_HANDLER_ARGS) /* {{{ */
+ {
+ zval *msg, *freeop;
++ zend_op *opline = EX(opline);
+ zval *retval;
+
+ if (THG(exit_fci).function_name == NULL) {
+@@ -212,7 +253,7 @@
+ }
+ }
+
+- msg = pth_get_zval_ptr(&EX(opline)->op1, &freeop, execute_data TSRMLS_CC);
++ msg = pth_get_zval_ptr(opline->PTH_TYPE(op1), &opline->op1, &freeop, execute_data TSRMLS_CC);
+
+ if (msg) {
+ zend_fcall_info_argn(&THG(exit_fci) TSRMLS_CC, 1, &msg);
--- pecl-test_helpers-1.1.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list