X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmarshal.c;h=63a7dc914bbcfc278c98c627d809fafac260325f;hb=4d2c075c160bbc1ff49c3499f8fdd07d9c447a12;hp=87abf98444948801ab8e25cb405ba12927afe38c;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84;p=m6w6%2Fext-psi

diff --git a/src/marshal.c b/src/marshal.c
index 87abf98..63a7dc9 100644
--- a/src/marshal.c
+++ b/src/marshal.c
@@ -99,18 +99,26 @@ zend_internal_arg_info *psi_internal_arginfo(struct psi_impl *impl)
 	aip = calloc(argc + 1 + !!impl->func->vararg, sizeof(*aip));
 
 	fi = (zend_internal_function_info *) &aip[0];
+#ifdef ZEND_TYPE_ENCODE
+	fi->type = ZEND_TYPE_ENCODE(psi_internal_type(impl->func->return_type), 1);
+#else
 	fi->allow_null = 1;
+	fi->type_hint = psi_internal_type(impl->func->return_type);
+#endif
 	fi->required_num_args = psi_impl_num_min_args(impl);
 	fi->return_reference = impl->func->return_reference;
-	fi->type_hint = psi_internal_type(impl->func->return_type);
 
 	if (impl->func->vararg) {
 		struct psi_impl_arg *vararg = impl->func->vararg;
 		zend_internal_arg_info *ai = &aip[argc];
 
 		ai->name = vararg->var->name;
+#ifdef ZEND_TYPE_ENCODE
+		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(vararg->type), 1);
+#else
 		ai->allow_null = 1;
 		ai->type_hint = psi_internal_type(vararg->type);
+#endif
 		if (vararg->var->reference) {
 			ai->pass_by_reference = 1;
 		}
@@ -121,12 +129,15 @@ zend_internal_arg_info *psi_internal_arginfo(struct psi_impl *impl)
 		zend_internal_arg_info *ai = &aip[i];
 
 		ai->name = iarg->var->name;
+#ifdef ZEND_TYPE_ENCODE
+		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(iarg->type), 1);
+#else
+		ai->allow_null = 1;
 		ai->type_hint = psi_internal_type(iarg->type);
+#endif
 		if (iarg->var->reference) {
 			ai->pass_by_reference = 1;
 		}
-		/* FIXME: if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) */
-		ai->allow_null = 1;
 	}
 
 	return aip;
@@ -404,8 +415,6 @@ impl_val *psi_let_strval(impl_val *tmp, struct psi_decl_type *spec, token_t impl
 		} else {
 			tmp->ptr = "";
 		}
-	} else if (0 && Z_TYPE_P(zvalue) == IS_STRING) {
-		tmp->ptr = Z_STRVAL_P(zvalue);
 	} else {
 		zend_string *zs = zval_get_string(zvalue);
 		tmp->ptr = estrdup(zs->val);