Fix type errors text to comply with one that PHP throws

Author: pinepain

src/php_v8_function.cc

@@ -52,7 +52,7 @@ bool php_v8_function_unpack_args(zval *arguments_zv, int arg_position, v8::Isola
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
         if (Z_TYPE_P(pzval) != IS_OBJECT) {
             zend_throw_error(zend_ce_type_error,
-                             "Argument %d passed to %s::%s() should be array of \\V8\\Value objects, %s given at %d offset",
+                             "Argument %d passed to %s::%s() must be an array of \\V8\\Value objects, %s given at %d offset",
                              arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                              zend_zval_type_name(pzval), i);
 
@@ -62,7 +62,7 @@ bool php_v8_function_unpack_args(zval *arguments_zv, int arg_position, v8::Isola
 
         if (!instanceof_function(Z_OBJCE_P(pzval), php_v8_value_class_entry)) {
             zend_throw_error(zend_ce_type_error,
-                             "Argument %d passed to %s::%s() should be array of \\V8\\Value objects, instance of %s given at %d offset",
+                             "Argument %d passed to %s::%s() must be an array of \\V8\\Value objects, instance of %s given at %d offset",
                              arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                              ZSTR_VAL(Z_OBJCE_P(pzval)->name), i);
 
@@ -137,7 +137,7 @@ bool php_v8_function_unpack_string_args(zval* arguments_zv, int arg_position, v8
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
                 if (Z_TYPE_P(pzval) != IS_OBJECT) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\StringValue objects, %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\StringValue objects, %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      zend_zval_type_name(pzval), i);
 
@@ -147,7 +147,7 @@ bool php_v8_function_unpack_string_args(zval* arguments_zv, int arg_position, v8
 
                 if (!instanceof_function(Z_OBJCE_P(pzval), php_v8_string_class_entry)) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\StringValue, instance of %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\StringValue, instance of %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      ZSTR_VAL(Z_OBJCE_P(pzval)->name), i);
 
@@ -222,7 +222,7 @@ bool php_v8_function_unpack_object_args(zval* arguments_zv, int arg_position, v8
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
                 if (Z_TYPE_P(pzval) != IS_OBJECT) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\ObjectValue objects, %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\ObjectValue objects, %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      zend_zval_type_name(pzval), i);
 
@@ -232,7 +232,7 @@ bool php_v8_function_unpack_object_args(zval* arguments_zv, int arg_position, v8
 
                 if (!instanceof_function(Z_OBJCE_P(pzval), php_v8_object_class_entry)) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\ObjectValue, instance of %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\ObjectValue, instance of %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      ZSTR_VAL(Z_OBJCE_P(pzval)->name), i);
 

src/php_v8_template.cc

@@ -147,7 +147,7 @@ void php_v8_template_Set(v8::Isolate *isolate, v8::Local<T> local_template, N* p
             zend_string *ce_name = zend_get_executed_scope()->name;
 
             zend_throw_error(zend_ce_type_error,
-                             "Argument %d passed to %s::%s() should be instance of \\V8\\PrimitiveValue or \\V8\\Template, instance of %s given",
+                             "Argument %d passed to %s::%s() must be an instance of \\V8\\PrimitiveValue or \\V8\\Template, instance of %s given",
                              arg_position, ZSTR_VAL(ce_name), get_active_function_name(), ZSTR_VAL(Z_OBJCE_P(php_v8_value_zv)->name));
             return;
         }

tests/V8FunctionObject_Call_bad_args.phpt

@@ -56,7 +56,7 @@ try {
 }
 ?>
 --EXPECT--
-TypeError: Argument 3 passed to V8\FunctionObject::Call() should be array of \V8\Value objects, integer given at 0 offset
-TypeError: Argument 3 passed to V8\FunctionObject::Call() should be array of \V8\Value objects, instance of stdClass given at 0 offset
+TypeError: Argument 3 passed to V8\FunctionObject::Call() must be an array of \V8\Value objects, integer given at 0 offset
+TypeError: Argument 3 passed to V8\FunctionObject::Call() must be an array of \V8\Value objects, instance of stdClass given at 0 offset
 V8\Exceptions\Exception: Value is empty. Forgot to call parent::__construct()?: argument 3 passed to V8\FunctionObject::Call() at 0 offset
 V8\Exceptions\Exception: Isolates mismatch: argument 3 passed to V8\FunctionObject::Call() at 0 offset

tests/V8FunctionTemplate_Set.phpt

@@ -52,7 +52,7 @@ console.log(nt.foo);
 
 ?>
 --EXPECT--
-TypeError: Argument 3 passed to V8\ObjectTemplate::Set() should be instance of \V8\PrimitiveValue or \V8\Template, instance of V8\FunctionObject given
+TypeError: Argument 3 passed to V8\ObjectTemplate::Set() must be an instance of \V8\PrimitiveValue or \V8\Template, instance of V8\FunctionObject given
 function Test() { [native code] }
 [object Test]
 function foo() { [native code] }

tests/V8ScriptCompiler_CompileFunctionInContext.phpt

@@ -134,8 +134,8 @@ Compile function: ok
 Compile function: ok
 Compile function: ok
 Compile function: ok
-TypeError: Argument 3 passed to V8\ScriptCompiler::CompileFunctionInContext() should be array of \V8\StringValue, instance of V8\StringObject given at 0 offset
-TypeError: Argument 4 passed to V8\ScriptCompiler::CompileFunctionInContext() should be array of \V8\ObjectValue, instance of V8\StringValue given at 0 offset
+TypeError: Argument 3 passed to V8\ScriptCompiler::CompileFunctionInContext() must be an array of \V8\StringValue, instance of V8\StringObject given at 0 offset
+TypeError: Argument 4 passed to V8\ScriptCompiler::CompileFunctionInContext() must be an array of \V8\ObjectValue, instance of V8\StringValue given at 0 offset
 
 
 Testing: