Move mode checks into ZPP branches

Author: Girgias

ext/standard/array.c

@@ -697,11 +697,6 @@ PHP_FUNCTION(count)
 	zend_long mode = COUNT_NORMAL;
 	zval *countable;
 
-	if (mode != COUNT_NORMAL && mode != COUNT_RECURSIVE) {
-		zend_value_error("Mode value is invalid");
-		RETURN_THROWS();
-	}
-
 	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "h!|l", &array, &mode) == SUCCESS)  {
 		if (array == NULL) {
 			/* Intentionally not converted to an exception */
@@ -711,19 +706,27 @@ PHP_FUNCTION(count)
 
 		zend_long count;
 
-		if (mode == COUNT_RECURSIVE) {
+		if (mode == COUNT_NORMAL) {
+			count = zend_array_count(array);
+		} else if (mode == COUNT_RECURSIVE) {
 			count = php_count_recursive(array);
 		} else {
-			count = zend_array_count(array);
+			zend_value_error("Mode value is invalid");
+			RETURN_THROWS();
 		}
 		RETURN_LONG(count);
 	}
 
 	/* Remove possibility to specify $mode when passing object? */
-	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O|l",
-			&countable, zend_ce_countable, &mode) == SUCCESS) {
-		zval retval;
-		/* First, we check if the count handler is defined */
+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "o|l",
+			&countable, &mode) == SUCCESS) {
+
+		if (mode != COUNT_NORMAL && mode != COUNT_RECURSIVE) {
+			zend_value_error("Mode value is invalid");
+			RETURN_THROWS();
+		}
+
+		/* First, check if the handler is defined as it is faster */
 		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))) {