Implement first basic implementation of protocols

Author: ircmaxell

Zend/zend.h

@@ -589,6 +589,9 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length);
 #define IS_CONSTANT_ARRAY	9
 #define IS_CALLABLE	10
 
+/* Ugly hack to support protocol parsing */
+#define IS_PROTOCOL	11
+
 /* Ugly hack to support constants as static array indices */
 #define IS_CONSTANT_TYPE_MASK		0x00f
 #define IS_CONSTANT_UNQUALIFIED		0x010

Zend/zend_compile.c

@@ -1911,7 +1911,12 @@ void zend_do_receive_arg(zend_uchar op, znode *varname, const znode *offset, con
 					}
 				}
 			} else {
-				cur_arg_info->type_hint = IS_OBJECT;
+				if (class_type->u.constant.type == IS_PROTOCOL) {
+					cur_arg_info->type_hint = IS_PROTOCOL;
+					class_type->u.constant.type = IS_STRING;
+				} else {
+					cur_arg_info->type_hint = IS_OBJECT;
+				}
 				if (ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_type->u.constant), Z_STRLEN(class_type->u.constant))) {
 					zend_resolve_class_name(class_type, opline->extended_value, 1 TSRMLS_CC);
 				}
@@ -3113,7 +3118,7 @@ static void do_inherit_method(zend_function *function) /* {{{ */
 }
 /* }}} */
 
-static zend_bool zend_do_perform_implementation_check(const zend_function *fe, const zend_function *proto TSRMLS_DC) /* {{{ */
+ZEND_API zend_bool zend_do_perform_implementation_check(const zend_function *fe, const zend_function *proto TSRMLS_DC) /* {{{ */
 {
 	zend_uint i;
 

Zend/zend_compile.h

@@ -694,6 +694,7 @@ ZEND_API zend_bool zend_is_compiling(TSRMLS_D);
 ZEND_API char *zend_make_compiled_string_description(const char *name TSRMLS_DC);
 ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify_handlers TSRMLS_DC);
 int zend_get_class_fetch_type(const char *class_name, uint class_name_len);
+ZEND_API zend_bool zend_do_perform_implementation_check(const zend_function *fe, const zend_function *proto TSRMLS_DC);
 
 typedef zend_bool (*zend_auto_global_callback)(const char *name, uint name_len TSRMLS_DC);
 typedef struct _zend_auto_global {

Zend/zend_execute.c

@@ -630,11 +630,16 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 			need_msg = zend_verify_arg_class_kind(cur_arg_info, fetch_type, &class_name, &ce TSRMLS_CC);
 			return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "none", "" TSRMLS_CC);
 		}
-		if (Z_TYPE_P(arg) == IS_OBJECT) {
+		if (cur_arg_info->type_hint == IS_OBJECT && Z_TYPE_P(arg) == IS_OBJECT) {
 			need_msg = zend_verify_arg_class_kind(cur_arg_info, fetch_type, &class_name, &ce TSRMLS_CC);
 			if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) {
 				return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name TSRMLS_CC);
 			}
+		} else if (cur_arg_info->type_hint == IS_PROTOCOL && Z_TYPE_P(arg) == IS_OBJECT) {
+			ce = zend_fetch_class(cur_arg_info->class_name, cur_arg_info->class_name_len, (fetch_type | ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_NO_AUTOLOAD) TSRMLS_CC);
+			if (!ce || !protocol_check_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) {
+				return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "look like ", (ce ? ce->name : cur_arg_info->class_name), "instance of ", Z_OBJCE_P(arg)->name TSRMLS_CC);
+			}
 		} else if (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null) {
 			need_msg = zend_verify_arg_class_kind(cur_arg_info, fetch_type, &class_name, &ce TSRMLS_CC);
 			return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "" TSRMLS_CC);

Zend/zend_language_parser.y

@@ -538,6 +538,7 @@ optional_class_type:
 		/* empty */					{ $$.op_type = IS_UNUSED; }
 	|	T_ARRAY						{ $$.op_type = IS_CONST; Z_TYPE($$.u.constant)=IS_ARRAY; }
 	|	T_CALLABLE					{ $$.op_type = IS_CONST; Z_TYPE($$.u.constant)=IS_CALLABLE; }
+	|	'<' fully_qualified_class_name '>'		{ $$ = $2; Z_TYPE($$.u.constant) = IS_PROTOCOL; }
 	|	fully_qualified_class_name			{ $$ = $1; }
 ;
 

Zend/zend_operators.c

@@ -30,6 +30,8 @@
 #include "zend_strtod.h"
 #include "zend_exceptions.h"
 #include "zend_closures.h"
+#include "zend_compile.h"
+#include "zend_hash.h"
 
 #if ZEND_USE_TOLOWER_L
 #include <locale.h>
@@ -1800,6 +1802,56 @@ ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2 TSR
 }
 /* }}} */
 
+static int protocol_check_function_implementation(void *function_entry TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
+
+ZEND_API zend_bool protocol_check_function(zend_class_entry *instance_ce, zend_class_entry *ce TSRMLS_DC) /* {{{ */
+{
+	zend_bool result = 1;
+	
+	zend_hash_apply_with_arguments(&(ce->function_table), protocol_check_function_implementation, 2, instance_ce, &result);
+	
+	return result;
+}
+/* }}} */
+
+static int protocol_check_function_implementation(void *function_entry TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
+{
+	zend_function *child;
+	zend_bool *result;
+	zend_class_entry *ce;
+	zend_uint child_flags;
+	zend_uint protocol_flags = ((zend_function*) function_entry)->common.fn_flags;
+
+	TSRMLS_FETCH();
+	ce = va_arg(args, zend_class_entry*);
+	result = va_arg(args, zend_bool*);
+
+	if (*result == 0) {
+		return ZEND_HASH_APPLY_STOP;
+	}
+
+	if (zend_hash_quick_find(&(ce->function_table), hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void **) &child) == FAILURE) {
+		*result = 0;
+		return ZEND_HASH_APPLY_STOP;
+	}
+	child_flags = child->common.fn_flags;
+	if ((child_flags & ZEND_ACC_STATIC) != (protocol_flags & ZEND_ACC_STATIC)) {
+		*result = 0;
+		return ZEND_HASH_APPLY_STOP;
+	}
+	if ((child_flags & ZEND_ACC_ABSTRACT)) {
+		/* This shouldn't be possible, as it requires an instance, bail! */
+		*result = 0;
+		return ZEND_HASH_APPLY_STOP;
+	}
+	if (zend_do_perform_implementation_check(child, function_entry TSRMLS_DC) == 0) {
+		*result = 0;
+		return ZEND_HASH_APPLY_STOP;
+	}
+	return ZEND_HASH_APPLY_KEEP;
+}
+/* }}} */
+
 ZEND_API zend_bool instanceof_function_ex(const zend_class_entry *instance_ce, const zend_class_entry *ce, zend_bool interfaces_only TSRMLS_DC) /* {{{ */
 {
 	zend_uint i;

Zend/zend_operators.h

@@ -68,6 +68,7 @@ ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2 TSR
 
 ZEND_API zend_bool instanceof_function_ex(const zend_class_entry *instance_ce, const zend_class_entry *ce, zend_bool interfaces_only TSRMLS_DC);
 ZEND_API zend_bool instanceof_function(const zend_class_entry *instance_ce, const zend_class_entry *ce TSRMLS_DC);
+ZEND_API zend_bool protocol_check_function(zend_class_entry *instance_ce, zend_class_entry *ce TSRMLS_DC);
 END_EXTERN_C()
 
 #if ZEND_DVAL_TO_LVAL_CAST_OK