Fix parameter name in count() error message

This parameter has been renamed to $value.

Author: nikic

Zend/tests/generators/errors/count_error.phpt

@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECT--
-count(): Argument #1 ($var) must be of type Countable|array, Generator given
+count(): Argument #1 ($value) must be of type Countable|array, Generator given

Zend/zend_vm_def.h

@@ -8941,7 +8941,7 @@ ZEND_VM_COLD_CONST_HANDLER(190, ZEND_COUNT, CONST|TMPVAR|CV, UNUSED)
 			ZVAL_UNDEFINED_OP1();
 		}
 		count = 0;
-		zend_type_error("%s(): Argument #1 ($var) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
+		zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
 		break;
 	}
 

Zend/zend_vm_execute.h

@@ -10357,7 +10357,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CONST_
 			ZVAL_UNDEFINED_OP1();
 		}
 		count = 0;
-		zend_type_error("%s(): Argument #1 ($var) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
+		zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
 		break;
 	}
 
@@ -17596,7 +17596,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_TMPVAR_UNUSED_HANDL
 			ZVAL_UNDEFINED_OP1();
 		}
 		count = 0;
-		zend_type_error("%s(): Argument #1 ($var) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
+		zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
 		break;
 	}
 
@@ -47073,7 +47073,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CV_UNUSED_HANDLER(Z
 			ZVAL_UNDEFINED_OP1();
 		}
 		count = 0;
-		zend_type_error("%s(): Argument #1 ($var) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
+		zend_type_error("%s(): Argument #1 ($value) must be of type Countable|array, %s given", opline->extended_value ? "sizeof" : "count", zend_zval_type_name(op1));
 		break;
 	}
 

ext/standard/tests/array/count_invalid.phpt

@@ -47,10 +47,9 @@ try {
 
 ?>
 --EXPECT--
-count(): Argument #1 ($var) must be of type Countable|array, null given
-count(): Argument #1 ($var) must be of type Countable|array, string given
-count(): Argument #1 ($var) must be of type Countable|array, int given
-count(): Argument #1 ($var) must be of type Countable|array, bool given
-count(): Argument #1 ($var) must be of type Countable|array, bool given
-count(): Argument #1 ($var) must be of type Countable|array, stdClass given
-
+count(): Argument #1 ($value) must be of type Countable|array, null given
+count(): Argument #1 ($value) must be of type Countable|array, string given
+count(): Argument #1 ($value) must be of type Countable|array, int given
+count(): Argument #1 ($value) must be of type Countable|array, bool given
+count(): Argument #1 ($value) must be of type Countable|array, bool given
+count(): Argument #1 ($value) must be of type Countable|array, stdClass given

ext/standard/tests/array/sizeof_object2.phpt

@@ -103,23 +103,23 @@ echo "Done";
 *** Testing sizeof() : object functionality ***
 --- Testing sizeof() with objects which doesn't implement Countable interface ---
 -- Iteration 1 --
-Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test given
+Default Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test given
 COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test given
 COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test given
 -- Iteration 2 --
-Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test1 given
+Default Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test1 given
 COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test1 given
 COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test1 given
 -- Iteration 3 --
-Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, test2 given
+Default Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test2 given
 COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test2 given
 COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, test2 given
 -- Iteration 4 --
-Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, child_test2 given
+Default Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, child_test2 given
 COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, child_test2 given
 COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, child_test2 given
 -- Iteration 5 --
-Default Mode: sizeof(): Argument #1 ($var) must be of type Countable|array, concrete_class given
+Default Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, concrete_class given
 COUNT_NORMAL Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, concrete_class given
 COUNT_RECURSIVE Mode: sizeof(): Argument #1 ($value) must be of type Countable|array, concrete_class given
 Done

ext/standard/tests/general_functions/is_countable_with_variables.phpt

@@ -28,4 +28,4 @@ bool(true)
 bool(true)
 bool(false)
 int(2)
-count(): Argument #1 ($var) must be of type Countable|array, null given
+count(): Argument #1 ($value) must be of type Countable|array, null given