Reintroduce Count handler

Author: Girgias

Zend/zend_vm_def.h

@@ -8438,6 +8438,14 @@ ZEND_VM_COLD_CONST_HANDLER(190, ZEND_COUNT, CONST|TMPVAR|CV, UNUSED)
 			zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
 			count = zval_get_long(&retval);
 			zval_ptr_dtor(&retval);
+		/* Else if the object has a count handler defined */
+		} else if (zobj->handlers->count_elements) {
+			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
+				zend_type_error("Parameter must be an array or an object that implements Countable");
+			}
+			if (UNEXPECTED(EG(exception))) {
+				count = 0;
+			}
 		} else {
 			zend_type_error("Parameter must be an array or an object that implements Countable");
 		}

Zend/zend_vm_execute.h

@@ -9270,6 +9270,14 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CONST_
 			zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
 			count = zval_get_long(&retval);
 			zval_ptr_dtor(&retval);
+		/* Else if the object has a count handler defined */
+		} else if (zobj->handlers->count_elements) {
+			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
+				zend_type_error("Parameter must be an array or an object that implements Countable");
+			}
+			if (UNEXPECTED(EG(exception))) {
+				count = 0;
+			}
 		} else {
 			zend_type_error("Parameter must be an array or an object that implements Countable");
 		}
@@ -16277,6 +16285,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_TMPVAR_UNUSED_HANDL
 			zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
 			count = zval_get_long(&retval);
 			zval_ptr_dtor(&retval);
+		/* Else if the object has a count handler defined */
+		} else if (zobj->handlers->count_elements) {
+			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
+				zend_type_error("Parameter must be an array or an object that implements Countable");
+			}
+			if (UNEXPECTED(EG(exception))) {
+				count = 0;
+			}
 		} else {
 			zend_type_error("Parameter must be an array or an object that implements Countable");
 		}
@@ -45059,6 +45075,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CV_UNUSED_HANDLER(Z
 			zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
 			count = zval_get_long(&retval);
 			zval_ptr_dtor(&retval);
+		/* Else if the object has a count handler defined */
+		} else if (zobj->handlers->count_elements) {
+			if (FAILURE == zobj->handlers->count_elements(zobj, &count)) {
+				zend_type_error("Parameter must be an array or an object that implements Countable");
+			}
+			if (UNEXPECTED(EG(exception))) {
+				count = 0;
+			}
 		} else {
 			zend_type_error("Parameter must be an array or an object that implements Countable");
 		}

ext/standard/array.c

@@ -776,24 +776,36 @@ PHP_FUNCTION(count)
 			return;
 		}
 		RETURN_LONG(count);
+	}
+	
 	/* Remove possibility to specify $mode when passing object? */
-	} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O|l",
+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O|l",
 			&countable, zend_ce_countable, &mode) == SUCCESS) {
 		if (mode != COUNT_NORMAL && mode != COUNT_RECURSIVE) {
 			zend_value_error("Mode value is invalid");
 			return;
 		}
 		zval retval;
-		zend_call_method_with_0_params(Z_OBJ_P(countable), NULL, NULL, "count", &retval);
-		if (Z_TYPE(retval) != IS_UNDEF) {
-			RETVAL_LONG(zval_get_long(&retval));
+		/* First, we check if the count handler is defined */
+		if (Z_OBJ_HT_P(countable)->count_elements) {
+			RETVAL_LONG(1);
+			if (SUCCESS == Z_OBJ_HT(*countable)->count_elements(Z_OBJ_P(countable), &Z_LVAL_P(return_value))) {
+				return;
+			}
+			if (EG(exception)) {
+				return;
+			}
+		} else {
+			zend_call_method_with_0_params(Z_OBJ_P(countable), NULL, NULL, "count", &retval);
+			if (Z_TYPE(retval) != IS_UNDEF) {
+				RETVAL_LONG(zval_get_long(&retval));
+			}
 		}
 		zval_ptr_dtor(&retval);
 		return;
-	} else {
-		zend_type_error("Parameter must be an array or an object that implements Countable");
-		return;
 	}
+	zend_type_error("Parameter must be an array or an object that implements Countable");
+	return;
 }
 /* }}} */