Use int instead of integer in type errors

PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".

diff --git a/Zend/tests/bug73954.phpt b/Zend/tests/bug73954.phpt
index f911dd583405762cafeb8b8fdff2ab255a93c82a..fb0a6b8f3da84ea9aff0b438a94cc0c9584d2cce 100644 (file)
--- a/Zend/tests/bug73954.phpt
+++ b/Zend/tests/bug73954.phpt
@@ -16,7 +16,7 @@ takes_int(log(tan(3.14)));
 float(NAN)
 bool(true)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %s on line 9 and defined in %s:6
+Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type int, float given, called in %s on line 9 and defined in %s:6
 Stack trace:
 #0 %s(9): takes_int(NAN)
 #1 {main}

diff --git a/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt b/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt
index 9029dc2625390f9c8f7b6a748e22cba847dcd141..1e535ea9f99a232d78b1276007001f71bfa8ae30 100644 (file)
--- a/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt
+++ b/Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt
@@ -49,6 +49,6 @@ Too few arguments to function bar(), 1 passed in %s and exactly 2 expected
 ArgumentCountError
 Too few arguments to function bat(), 1 passed in %s and exactly 2 expected
 TypeError
-Argument 1 passed to bat() must be of the type integer, string given, called in %s
+Argument 1 passed to bat() must be of the type int, string given, called in %s
 TypeError
-Argument 2 passed to bat() must be of the type string, integer given, called in %s
\ No newline at end of file
+Argument 2 passed to bat() must be of the type string, int given, called in %s

diff --git a/Zend/tests/generators/generator_with_type_check.phpt b/Zend/tests/generators/generator_with_type_check.phpt
index 2aa16532dc5e7d4ce5873e625d7476715023f131..12e6d46d76c2ae3464075e2242327e6954701def 100644 (file)
--- a/Zend/tests/generators/generator_with_type_check.phpt
+++ b/Zend/tests/generators/generator_with_type_check.phpt
@@ -6,7 +6,7 @@ function gen(array $a) { yield; }
 gen(42);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to gen() must be of the type array, integer given, called in %sgenerator_with_type_check.php on line 3 and defined in %sgenerator_with_type_check.php:2
+Fatal error: Uncaught TypeError: Argument 1 passed to gen() must be of the type array, int given, called in %sgenerator_with_type_check.php on line 3 and defined in %sgenerator_with_type_check.php:2
 Stack trace:
 #0 %sgenerator_with_type_check.php(3): gen(42)
 #1 {main}

diff --git a/Zend/tests/generators/generator_with_type_check_2.phpt b/Zend/tests/generators/generator_with_type_check_2.phpt
index d8ea4fbf0d710365cf097054f7a89f2e6052c37e..ba1216224c8104ad152c2b429453161e4c216397 100644 (file)
--- a/Zend/tests/generators/generator_with_type_check_2.phpt
+++ b/Zend/tests/generators/generator_with_type_check_2.phpt
@@ -18,5 +18,5 @@ try {
 }
 ?>
 --EXPECTF--
-Argument 1 passed to gen() must be of the type array, integer given, called in %sgenerator_with_type_check_2.php on line 4
-Argument 1 passed to gen() must be of the type array, integer given, called in %sgenerator_with_type_check_2.php on line 10
+Argument 1 passed to gen() must be of the type array, int given, called in %sgenerator_with_type_check_2.php on line 4
+Argument 1 passed to gen() must be of the type array, int given, called in %sgenerator_with_type_check_2.php on line 10

diff --git a/Zend/tests/object_types/return_type_in_class.phpt b/Zend/tests/object_types/return_type_in_class.phpt
index 2d0f771106188511291244c45002d624e0fe6c2b..bef0421f8d4064e610ac80f423adff9600847faa 100644 (file)
--- a/Zend/tests/object_types/return_type_in_class.phpt
+++ b/Zend/tests/object_types/return_type_in_class.phpt
@@ -19,7 +19,7 @@ $three = new class extends Two {
 $three->a();
 --EXPECTF--
 
-Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, integer returned in %s:13
+Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
 Stack trace:
 #0 %s(16): class@anonymous->a()
 #1 {main}

diff --git a/Zend/tests/object_types/return_type_in_function.phpt b/Zend/tests/object_types/return_type_in_function.phpt
index e8ae75f490b1f94ede763b432eeb17b98a4ea92a..5597e27b3fb09c8fefe2ae6a3a80a059a1190295 100644 (file)
--- a/Zend/tests/object_types/return_type_in_function.phpt
+++ b/Zend/tests/object_types/return_type_in_function.phpt
@@ -9,7 +9,7 @@ function a() : object {
 a();
 --EXPECTF--
 
-Fatal error: Uncaught TypeError: Return value of a() must be an object, integer returned in %s:4
+Fatal error: Uncaught TypeError: Return value of a() must be an object, int returned in %s:4
 Stack trace:
 #0 %s(6): a()
 #1 {main}

diff --git a/Zend/tests/object_types/return_type_inheritance_in_class.phpt b/Zend/tests/object_types/return_type_inheritance_in_class.phpt
index 826758f326e287059471157ad645d5a3bb5a1e17..9ecf3cab1cf7cd8e5b3682c37ce2d0521c518b35 100644 (file)
--- a/Zend/tests/object_types/return_type_inheritance_in_class.phpt
+++ b/Zend/tests/object_types/return_type_inheritance_in_class.phpt
@@ -19,7 +19,7 @@ $three = new class extends Two {
 $three->a();
 
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, integer returned in %s:13
+Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
 Stack trace:
 #0 %s(16): class@anonymous->a()
 #1 {main}

diff --git a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
index fe1f6e6c0c081e33922ae2c01fa523fd30421915..eec1ba260bee906bf7ed6a3ae87514de15607293 100644 (file)
--- a/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
+++ b/Zend/tests/object_types/return_type_inheritance_in_interface.phpt
@@ -19,7 +19,7 @@ $three = new class implements Two {
 $three->a();
 
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, integer returned in %s:13
+Fatal error: Uncaught TypeError: Return value of class@anonymous::a() must be an object, int returned in %s:13
 Stack trace:
 #0 %s(16): class@anonymous->a()
 #1 {main}

diff --git a/Zend/tests/object_types/type_hint_in_class_method.phpt b/Zend/tests/object_types/type_hint_in_class_method.phpt
index e41caa0e70968357b5883b2425fe697797ecf7c9..4ea5216c4ecb80b138c7cee1a0e17ad0b8a9f7f7 100644 (file)
--- a/Zend/tests/object_types/type_hint_in_class_method.phpt
+++ b/Zend/tests/object_types/type_hint_in_class_method.phpt
@@ -12,7 +12,7 @@ $one->a(new One());
 $one->a(123);
 --EXPECTF--
 
-Fatal error: Uncaught TypeError: Argument 1 passed to One::a() must be an object, integer given, called in %s:4
+Fatal error: Uncaught TypeError: Argument 1 passed to One::a() must be an object, int given, called in %s:4
 Stack trace:
 #0 %s(9): One->a(123)
 #1 {main}

diff --git a/Zend/tests/object_types/type_hint_in_function.phpt b/Zend/tests/object_types/type_hint_in_function.phpt
index 917726ce2e8294117f09bb1e45bcdf26e117e802..3e923983d7d26a6cb05989336fcd6695d903176a 100644 (file)
--- a/Zend/tests/object_types/type_hint_in_function.phpt
+++ b/Zend/tests/object_types/type_hint_in_function.phpt
@@ -10,7 +10,7 @@ a(new A());
 a(123);
 --EXPECTF--
 
-Fatal error: Uncaught TypeError: Argument 1 passed to a() must be an object, integer given, called in %s.php on line 7 and defined in %s:4
+Fatal error: Uncaught TypeError: Argument 1 passed to a() must be an object, int given, called in %s.php on line 7 and defined in %s:4
 Stack trace:
 #0 %s(7): a(123)
 #1 {main}

diff --git a/Zend/tests/return_types/003.phpt b/Zend/tests/return_types/003.phpt
index e12e215de2494670ed8ab1ff13fe58bbc9e4b3f5..f70500da9fcc05e9335cf765a40e12969eb6ac9a 100644 (file)
--- a/Zend/tests/return_types/003.phpt
+++ b/Zend/tests/return_types/003.phpt
@@ -9,7 +9,7 @@ function test1() : array {
 test1();
 
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, integer returned in %s:%d
+Fatal error: Uncaught TypeError: Return value of test1() must be of the type array, int returned in %s:%d
 Stack trace:
 #0 %s(%d): test1()
 #1 {main}

diff --git a/Zend/tests/return_types/030.phpt b/Zend/tests/return_types/030.phpt
index 288137f05cc014aadd25a40f27a363a4071b5b83..1bb5512c8571db3bb47685f52a1dcaf3f8ecaa65 100644 (file)
--- a/Zend/tests/return_types/030.phpt
+++ b/Zend/tests/return_types/030.phpt
@@ -16,7 +16,7 @@ foo(0);
 ok
 ok
 
-Fatal error: Uncaught TypeError: Return value of foo() must be of the type array or null, integer returned in %s030.php:3
+Fatal error: Uncaught TypeError: Return value of foo() must be of the type array or null, int returned in %s030.php:3
 Stack trace:
 #0 %s030.php(10): foo(0)
 #1 {main}

diff --git a/Zend/tests/return_types/bug70557.phpt b/Zend/tests/return_types/bug70557.phpt
index 8cc123a581db46e1aeacbb17b811eeb0168b1196..cb4eb498b97d0f6ba784a981231fdccbb05359db 100644 (file)
--- a/Zend/tests/return_types/bug70557.phpt
+++ b/Zend/tests/return_types/bug70557.phpt
@@ -16,4 +16,4 @@ try {
 }
 ?>
 --EXPECT--
-string(72) "Return value of getNumber() must be of the type integer, string returned"
+string(68) "Return value of getNumber() must be of the type int, string returned"

diff --git a/Zend/tests/return_types/rfc001.phpt b/Zend/tests/return_types/rfc001.phpt
index 5a1d42b446961ae927505b4948fe0228f18de7fd..3c74acb9235b59bce827e22691ebcb83dacfe443 100644 (file)
--- a/Zend/tests/return_types/rfc001.phpt
+++ b/Zend/tests/return_types/rfc001.phpt
@@ -11,7 +11,7 @@ function get_config(): array {
 get_config();
 
 --EXPECTF--
-Fatal error: Uncaught TypeError: Return value of get_config() must be of the type array, integer returned in %s:%d
+Fatal error: Uncaught TypeError: Return value of get_config() must be of the type array, int returned in %s:%d
 Stack trace:
 #0 %s(%d): get_config()
 #1 {main}

diff --git a/Zend/tests/type_declarations/array_001.phpt b/Zend/tests/type_declarations/array_001.phpt
index 8fc368e2889710ca76e24575431df81b61bcc60a..c3315849a2f51688a1f1f94621064bd6e61c092c 100644 (file)
--- a/Zend/tests/type_declarations/array_001.phpt
+++ b/Zend/tests/type_declarations/array_001.phpt
@@ -12,7 +12,7 @@ foo(123);
 --EXPECTF--
 3
 
-Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %s on line 7 and defined in %s:2
+Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, int given, called in %s on line 7 and defined in %s:2
 Stack trace:
 #0 %s(%d): foo(123)
 #1 {main}

diff --git a/Zend/tests/type_declarations/explicit_weak_include_strict.phpt b/Zend/tests/type_declarations/explicit_weak_include_strict.phpt
index fb53d8ce117db727d5807ca69b11c9a128bfcf45..9773775ae49e2f3fa10cf0a29c8a3526ba2144c9 100644 (file)
--- a/Zend/tests/type_declarations/explicit_weak_include_strict.phpt
+++ b/Zend/tests/type_declarations/explicit_weak_include_strict.phpt
@@ -11,7 +11,7 @@ require 'weak_include_strict_2.inc';
 // calls within that file should stay strict, despite being included by weak file
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type int, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
 Stack trace:
 #0 %s(%d): takes_int(1)
 #1 %s(%d): require('%s')

diff --git a/Zend/tests/type_declarations/internal_function_strict_mode.phpt b/Zend/tests/type_declarations/internal_function_strict_mode.phpt
index 4e792fa8d17396ad5be67edb8024a33a54a870b1..8b70bbae1a42af5ead437541d6740950d343a962 100644 (file)
--- a/Zend/tests/type_declarations/internal_function_strict_mode.phpt
+++ b/Zend/tests/type_declarations/internal_function_strict_mode.phpt
@@ -28,7 +28,7 @@ try {
 ?>
 --EXPECTF--
 *** Trying Ord With Integer
-*** Caught ord() expects parameter 1 to be string, integer given
+*** Caught ord() expects parameter 1 to be string, int given
 *** Trying Array Map With Invalid Callback
 *** Caught array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name or object
 *** Trying Strlen With Float

diff --git a/Zend/tests/type_declarations/iterable_001.phpt b/Zend/tests/type_declarations/iterable_001.phpt
index f0c8bba610448296d91f093cfe275d2fcfadf4b0..b9e811943670336360ee53fbfb613eeaa6d1025e 100644 (file)
--- a/Zend/tests/type_declarations/iterable_001.phpt
+++ b/Zend/tests/type_declarations/iterable_001.phpt
@@ -45,4 +45,4 @@ object(ArrayIterator)#1 (1) {
     int(3)
   }
 }
-Argument 1 passed to test() must be iterable, integer given, called in %s on line %d
+Argument 1 passed to test() must be iterable, int given, called in %s on line %d

diff --git a/Zend/tests/type_declarations/iterable_003.phpt b/Zend/tests/type_declarations/iterable_003.phpt
index 8c91c993d0a821c83097a4890c1aa53294f24931..e5e6af9ae8863776e0e9de2331ff719842dde378 100644 (file)
--- a/Zend/tests/type_declarations/iterable_003.phpt
+++ b/Zend/tests/type_declarations/iterable_003.phpt
@@ -29,4 +29,4 @@ array(0) {
 }
 object(Generator)#2 (0) {
 }
-Return value of baz() must be iterable, integer returned
+Return value of baz() must be iterable, int returned

diff --git a/Zend/tests/type_declarations/scalar_basic.phpt b/Zend/tests/type_declarations/scalar_basic.phpt
index 51c36647373acf98b69fb11bb0bae015abc7b6b5..c2191b9e646e1e45e0c9f88b5f915937d2ef3e88 100644 (file)
--- a/Zend/tests/type_declarations/scalar_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_basic.phpt
@@ -79,16 +79,16 @@ E_NOTICE: A non well formed numeric value encountered on line %d
 int(1)
 
 *** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying int(%d)
 int(%d)
 
 *** Trying float(NAN)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying bool(true)
 int(1)
@@ -97,22 +97,22 @@ int(1)
 int(0)
 
 *** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
 
 *** Trying array(0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
 
 *** Trying object(stdClass)#%s (0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
 
 *** Trying object(Stringable)#%s (0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
 
 *** Trying resource(%d) of type (stream)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
 
 Testing 'float' type:
 

diff --git a/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt b/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt
index dcbb3e87f4fa084950b7342d1ebfacbc1f5ef328..750edb77faf3c2b5da0c3c8a8fbac28b8afb88f0 100644 (file)
--- a/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt
+++ b/Zend/tests/type_declarations/scalar_constant_defaults_error.phpt
@@ -13,7 +13,7 @@ var_dump(int_val());
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to int_val() must be of the type integer, string given, called in %s on line %d and defined in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to int_val() must be of the type int, string given, called in %s on line %d and defined in %s:%d
 Stack trace:
 #0 %s(%d): int_val()
 #1 {main}

diff --git a/Zend/tests/type_declarations/scalar_null.phpt b/Zend/tests/type_declarations/scalar_null.phpt
index 6b9930f2977d311b375ec9d6946cd6f89087c15c..e3beb9feac8ff1580337c6f30ae6ef29ada9207c 100644 (file)
--- a/Zend/tests/type_declarations/scalar_null.phpt
+++ b/Zend/tests/type_declarations/scalar_null.phpt
@@ -37,7 +37,7 @@ echo PHP_EOL . "Done";
 ?>
 --EXPECTF--
 Testing int:
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
 Testing float:
 *** Caught Argument 1 passed to {closure}() must be of the type float, null given, called in %s on line %d
 Testing string:

diff --git a/Zend/tests/type_declarations/scalar_return_basic.phpt b/Zend/tests/type_declarations/scalar_return_basic.phpt
index 4e0650e7e9b67842bf0da0f27414d6356836ffb8..cf58f9150083176391ea9489105ba574332d29dd 100644 (file)
--- a/Zend/tests/type_declarations/scalar_return_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_return_basic.phpt
@@ -76,30 +76,30 @@ int(1)
 E_NOTICE: A non well formed numeric value encountered on line %d
 int(1)
 *** Trying string(1) "a"
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
 *** Trying string(0) ""
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
 *** Trying int(2147483647)
 int(2147483647)
 *** Trying float(NAN)
-*** Caught Return value of {closure}() must be of the type integer, float returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, float returned in %s on line %d
 *** Trying bool(true)
 int(1)
 *** Trying bool(false)
 int(0)
 *** Trying NULL
-*** Caught Return value of {closure}() must be of the type integer, null returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, null returned in %s on line %d
 *** Trying array(0) {
 }
-*** Caught Return value of {closure}() must be of the type integer, array returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, array returned in %s on line %d
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
 *** Trying object(Stringable)#7 (0) {
 }
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
 *** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of the type integer, resource returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, resource returned in %s on line %d
 
 Testing 'float' type:
 *** Trying int(1)

diff --git a/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt b/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
index e8f69bc6990f21408dcf06e3913f1ce8c9170aaf..9c4217203f27a93904c838f2a182987f696993a4 100644 (file)
--- a/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
+++ b/Zend/tests/type_declarations/scalar_return_basic_64bit.phpt
@@ -76,30 +76,30 @@ int(1)
 E_NOTICE: A non well formed numeric value encountered on line %d
 int(1)
 *** Trying string(1) "a"
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
 *** Trying string(0) ""
-*** Caught Return value of {closure}() must be of the type integer, string returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, string returned in %s on line %d
 *** Trying int(9223372036854775807)
 int(9223372036854775807)
 *** Trying float(NAN)
-*** Caught Return value of {closure}() must be of the type integer, float returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, float returned in %s on line %d
 *** Trying bool(true)
 int(1)
 *** Trying bool(false)
 int(0)
 *** Trying NULL
-*** Caught Return value of {closure}() must be of the type integer, null returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, null returned in %s on line %d
 *** Trying array(0) {
 }
-*** Caught Return value of {closure}() must be of the type integer, array returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, array returned in %s on line %d
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
 *** Trying object(Stringable)#7 (0) {
 }
-*** Caught Return value of {closure}() must be of the type integer, object returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, object returned in %s on line %d
 *** Trying resource(5) of type (stream)
-*** Caught Return value of {closure}() must be of the type integer, resource returned in %s on line %d
+*** Caught Return value of {closure}() must be of the type int, resource returned in %s on line %d
 
 Testing 'float' type:
 *** Trying int(1)

diff --git a/Zend/tests/type_declarations/scalar_strict.phpt b/Zend/tests/type_declarations/scalar_strict.phpt
index 40b036e1d418e098c2ef848e4e43289232e4cd27..afef18f6a3ef8d863854f8730fc06c3ecfff757a 100644 (file)
--- a/Zend/tests/type_declarations/scalar_strict.phpt
+++ b/Zend/tests/type_declarations/scalar_strict.phpt
@@ -70,52 +70,52 @@ Testing 'int' type:
 int(1)
 
 *** Trying string(1) "1"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying float(1)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying float(1.5)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying string(2) "1a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying int(2147483647)
 int(2147483647)
 
 *** Trying float(NAN)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
 
 *** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
 
 *** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
 
 *** Trying array(0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
 
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
 
 *** Trying object(Stringable)#7 (0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
 
 *** Trying resource(5) of type (stream)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
 
 Testing 'float' type:
 
@@ -173,7 +173,7 @@ float(NAN)
 Testing 'string' type:
 
 *** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
 
 *** Trying string(1) "1"
 string(1) "1"
@@ -194,7 +194,7 @@ string(1) "a"
 string(0) ""
 
 *** Trying int(2147483647)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
 
 *** Trying float(NAN)
 *** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
@@ -226,7 +226,7 @@ string(0) ""
 Testing 'bool' type:
 
 *** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
 
 *** Trying string(1) "1"
 *** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
@@ -247,7 +247,7 @@ Testing 'bool' type:
 *** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
 
 *** Trying int(2147483647)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
 
 *** Trying float(NAN)
 *** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d

diff --git a/Zend/tests/type_declarations/scalar_strict_64bit.phpt b/Zend/tests/type_declarations/scalar_strict_64bit.phpt
index 3e748ede34f33584b8e4fd71697e989cc691960f..914f0e68079e04338e14297348d91efe86311f1f 100644 (file)
--- a/Zend/tests/type_declarations/scalar_strict_64bit.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_64bit.phpt
@@ -70,52 +70,52 @@ Testing 'int' type:
 int(1)
 
 *** Trying string(1) "1"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying float(1)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying float(1.5)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying string(2) "1a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying string(1) "a"
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying string(0) ""
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying int(9223372036854775807)
 int(9223372036854775807)
 
 *** Trying float(NAN)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying bool(true)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
 
 *** Trying bool(false)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
 
 *** Trying NULL
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
 
 *** Trying array(0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
 
 *** Trying object(stdClass)#6 (0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
 
 *** Trying object(Stringable)#7 (0) {
 }
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
 
 *** Trying resource(5) of type (stream)
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
 
 Testing 'float' type:
 
@@ -173,7 +173,7 @@ float(NAN)
 Testing 'string' type:
 
 *** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
 
 *** Trying string(1) "1"
 string(1) "1"
@@ -194,7 +194,7 @@ string(1) "a"
 string(0) ""
 
 *** Trying int(9223372036854775807)
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
 
 *** Trying float(NAN)
 *** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
@@ -226,7 +226,7 @@ string(0) ""
 Testing 'bool' type:
 
 *** Trying int(1)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
 
 *** Trying string(1) "1"
 *** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
@@ -247,7 +247,7 @@ Testing 'bool' type:
 *** Caught Argument 1 passed to {closure}() must be of the type boolean, string given, called in %s on line %d
 
 *** Trying int(9223372036854775807)
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
 
 *** Trying float(NAN)
 *** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d

diff --git a/Zend/tests/type_declarations/scalar_strict_basic.phpt b/Zend/tests/type_declarations/scalar_strict_basic.phpt
index 3ee94a2059a2f766310b46c04f4e6512fd827e1e..24dff2489d9e4903cbe0c62872720489db46fe61 100644 (file)
--- a/Zend/tests/type_declarations/scalar_strict_basic.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_basic.phpt
@@ -68,28 +68,28 @@ Testing 'int' type:
 int(1)
 
 *** Trying float value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, float given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, float given, called in %s on line %d
 
 *** Trying string value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, string given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, string given, called in %s on line %d
 
 *** Trying true value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
 
 *** Trying false value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, boolean given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, boolean given, called in %s on line %d
 
 *** Trying null value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, null given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, null given, called in %s on line %d
 
 *** Trying array value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, array given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, array given, called in %s on line %d
 
 *** Trying object value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, object given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, object given, called in %s on line %d
 
 *** Trying resource value
-*** Caught Argument 1 passed to {closure}() must be of the type integer, resource given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type int, resource given, called in %s on line %d
 
 Testing 'float' type:
 
@@ -123,7 +123,7 @@ float(1)
 Testing 'string' type:
 
 *** Trying integer value
-*** Caught Argument 1 passed to {closure}() must be of the type string, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type string, int given, called in %s on line %d
 
 *** Trying float value
 *** Caught Argument 1 passed to {closure}() must be of the type string, float given, called in %s on line %d
@@ -152,7 +152,7 @@ string(1) "1"
 Testing 'bool' type:
 
 *** Trying integer value
-*** Caught Argument 1 passed to {closure}() must be of the type boolean, integer given, called in %s on line %d
+*** Caught Argument 1 passed to {closure}() must be of the type boolean, int given, called in %s on line %d
 
 *** Trying float value
 *** Caught Argument 1 passed to {closure}() must be of the type boolean, float given, called in %s on line %d

diff --git a/Zend/tests/type_declarations/strict_call_weak.phpt b/Zend/tests/type_declarations/strict_call_weak.phpt
index e3a606ec1252b7a61831834ebd8e9b965a20a639..d064161480cae58a41cff17a625e67e85fe75c8f 100644 (file)
--- a/Zend/tests/type_declarations/strict_call_weak.phpt
+++ b/Zend/tests/type_declarations/strict_call_weak.phpt
@@ -13,7 +13,7 @@ require 'strict_call_weak_2.inc';
 function_declared_in_weak_mode(1.0);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak.php on line 10 and defined in %sstrict_call_weak_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type int, float given, called in %sstrict_call_weak.php on line 10 and defined in %sstrict_call_weak_2.inc:5
 Stack trace:
 #0 %s(%d): function_declared_in_weak_mode(1)
 #1 {main}

diff --git a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
index 22c5b4319c86a6e91da93275b76484b85eb8970d..e909ee01410ac219ec8d4524dc35424f029cc7f2 100644 (file)
--- a/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
+++ b/Zend/tests/type_declarations/strict_call_weak_explicit.phpt
@@ -13,7 +13,7 @@ require 'strict_call_weak_explicit_2.inc';
 function_declared_in_weak_mode(1.0);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak_explicit.php on line 10 and defined in %sstrict_call_weak_explicit_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to function_declared_in_weak_mode() must be of the type int, float given, called in %sstrict_call_weak_explicit.php on line 10 and defined in %sstrict_call_weak_explicit_2.inc:5
 Stack trace:
 #0 %s(%d): function_declared_in_weak_mode(1)
 #1 {main}

diff --git a/Zend/tests/type_declarations/weak_include_strict.phpt b/Zend/tests/type_declarations/weak_include_strict.phpt
index e49485dbe5e4d43eabeef100264684da586357f0..52f5f55cdb4a8b716529ec8d7672cd060d8e668e 100644 (file)
--- a/Zend/tests/type_declarations/weak_include_strict.phpt
+++ b/Zend/tests/type_declarations/weak_include_strict.phpt
@@ -11,7 +11,7 @@ require 'weak_include_strict_2.inc';
 // calls within that file should stay strict, despite being included by weak file
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
+Fatal error: Uncaught TypeError: Argument 1 passed to takes_int() must be of the type int, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5
 Stack trace:
 #0 %s(%d): takes_int(1)
 #1 %s(%d): require('%s')

diff --git a/Zend/tests/typehints/or_null.phpt b/Zend/tests/typehints/or_null.phpt
index 8c20052165b95d6d43099a48e1a57906390021f1..552db7d058bc4d095a32cefc17140a004d37715d 100644 (file)
--- a/Zend/tests/typehints/or_null.phpt
+++ b/Zend/tests/typehints/or_null.phpt
@@ -231,27 +231,27 @@ TypeError: Argument 1 passed to loadedInterface() must implement interface RealI
 Stack trace:
 #0 %s(26): loadedInterface(Object(stdClass))
 #1 {main}
-TypeError: Argument 1 passed to unloadedClass() must be an instance of I\Dont\Exist or null, integer given, called in %s on line 32 and defined in %s:5
+TypeError: Argument 1 passed to unloadedClass() must be an instance of I\Dont\Exist or null, int given, called in %s on line 32 and defined in %s:5
 Stack trace:
 #0 %s(32): unloadedClass(1)
 #1 {main}
-TypeError: Argument 1 passed to loadedClass() must be an instance of RealClass or null, integer given, called in %s on line 38 and defined in %s:16
+TypeError: Argument 1 passed to loadedClass() must be an instance of RealClass or null, int given, called in %s on line 38 and defined in %s:16
 Stack trace:
 #0 %s(38): loadedClass(1)
 #1 {main}
-TypeError: Argument 1 passed to loadedInterface() must implement interface RealInterface or be null, integer given, called in %s on line 44 and defined in %s:17
+TypeError: Argument 1 passed to loadedInterface() must implement interface RealInterface or be null, int given, called in %s on line 44 and defined in %s:17
 Stack trace:
 #0 %s(44): loadedInterface(1)
 #1 {main}
-TypeError: Argument 1 passed to callableF() must be callable or null, integer given, called in %s on line 52 and defined in %s:49
+TypeError: Argument 1 passed to callableF() must be callable or null, int given, called in %s on line 52 and defined in %s:49
 Stack trace:
 #0 %s(52): callableF(1)
 #1 {main}
-TypeError: Argument 1 passed to iterableF() must be iterable or null, integer given, called in %s on line 60 and defined in %s:57
+TypeError: Argument 1 passed to iterableF() must be iterable or null, int given, called in %s on line 60 and defined in %s:57
 Stack trace:
 #0 %s(60): iterableF(1)
 #1 {main}
-TypeError: Argument 1 passed to intF() must be of the type integer or null, object given, called in %s on line 68 and defined in %s:65
+TypeError: Argument 1 passed to intF() must be of the type int or null, object given, called in %s on line 68 and defined in %s:65
 Stack trace:
 #0 %s(68): intF(Object(stdClass))
 #1 {main}
@@ -267,27 +267,27 @@ TypeError: Return value of returnLoadedInterface() must implement interface Real
 Stack trace:
 #0 %s(98): returnLoadedInterface()
 #1 {main}
-TypeError: Return value of returnUnloadedClassScalar() must be an instance of I\Dont\Exist or null, integer returned in %s:104
+TypeError: Return value of returnUnloadedClassScalar() must be an instance of I\Dont\Exist or null, int returned in %s:104
 Stack trace:
 #0 %s(108): returnUnloadedClassScalar()
 #1 {main}
-TypeError: Return value of returnLoadedClassScalar() must be an instance of RealClass or null, integer returned in %s:114
+TypeError: Return value of returnLoadedClassScalar() must be an instance of RealClass or null, int returned in %s:114
 Stack trace:
 #0 %s(118): returnLoadedClassScalar()
 #1 {main}
-TypeError: Return value of returnLoadedInterfaceScalar() must implement interface RealInterface or be null, integer returned in %s:124
+TypeError: Return value of returnLoadedInterfaceScalar() must implement interface RealInterface or be null, int returned in %s:124
 Stack trace:
 #0 %s(128): returnLoadedInterfaceScalar()
 #1 {main}
-TypeError: Return value of returnCallable() must be callable or null, integer returned in %s:134
+TypeError: Return value of returnCallable() must be callable or null, int returned in %s:134
 Stack trace:
 #0 %s(138): returnCallable()
 #1 {main}
-TypeError: Return value of returnIterable() must be iterable or null, integer returned in %s:144
+TypeError: Return value of returnIterable() must be iterable or null, int returned in %s:144
 Stack trace:
 #0 %s(148): returnIterable()
 #1 {main}
-TypeError: Return value of returnInt() must be of the type integer or null, object returned in %s:154
+TypeError: Return value of returnInt() must be of the type int or null, object returned in %s:154
 Stack trace:
 #0 %s(158): returnInt()
 #1 {main}
@@ -311,7 +311,7 @@ TypeError: Return value of returnMissingIterable() must be iterable or null, non
 Stack trace:
 #0 %s(203): returnMissingIterable()
 #1 {main}
-TypeError: Return value of returnMissingInt() must be of the type integer or null, none returned in %s:209
+TypeError: Return value of returnMissingInt() must be of the type int or null, none returned in %s:209
 Stack trace:
 #0 %s(212): returnMissingInt()
 #1 {main}

diff --git a/Zend/tests/variadic/typehint_error.phpt b/Zend/tests/variadic/typehint_error.phpt
index 153161a09df031d7cf4bedf725cbc3e1b5be2096..d9a5ea291f108e364386eab67ed5d8937f46ff70 100644 (file)
--- a/Zend/tests/variadic/typehint_error.phpt
+++ b/Zend/tests/variadic/typehint_error.phpt
@@ -33,7 +33,7 @@ array(3) {
   }
 }
 
-Fatal error: Uncaught TypeError: Argument 3 passed to test() must be of the type array, integer given, called in %s:%d
+Fatal error: Uncaught TypeError: Argument 3 passed to test() must be of the type array, int given, called in %s:%d
 Stack trace:
 #0 %s(%d): test(Array, Array, 2)
 #1 {main}

diff --git a/Zend/tests/variadic/typehint_suppressed_error.phpt b/Zend/tests/variadic/typehint_suppressed_error.phpt
index ef217b2be0c298aaa6098d8845819267535ef82e..ebc44c38b12bd89e425ab31b0c5dff9765b1f4ce 100644 (file)
--- a/Zend/tests/variadic/typehint_suppressed_error.phpt
+++ b/Zend/tests/variadic/typehint_suppressed_error.phpt
@@ -15,4 +15,4 @@ try {
 
 ?>
 --EXPECTF--
-string(%d) "Argument 3 passed to test() must be of the type array, integer given, called in %s on line %d"
+string(%d) "Argument 3 passed to test() must be of the type array, int given, called in %s on line %d"

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 79d6ab9a6c9c8a89ec76f0929904cf32bd80c4a4..d0ab8a31ecef21c4308afc9ef66ae76ef296c3a2 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -107,7 +107,7 @@ ZEND_API char *zend_get_type_by_const(int type) /* {{{ */
                case _IS_BOOL:
                        return "boolean";
                case IS_LONG:
-                       return "integer";
+                       return "int";
                case IS_DOUBLE:
                        return "float";
                case IS_STRING:
@@ -497,7 +497,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
                                }
 
                                if (!zend_parse_arg_long(arg, p, is_null, check_null, c == 'L')) {
-                                       return "integer";
+                                       return "int";
                                }
                        }
                        break;

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 1baf50a4e8d4b24f249acd307b9f36b1c91548f8..31ce98a1216df5ed4e45b358dd4bf9ae2d7742cf 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -690,7 +690,7 @@ END_EXTERN_C()
 #define FAST_ZPP 1
 
 #define Z_EXPECTED_TYPES(_) \
-       _(Z_EXPECTED_LONG,              "integer") \
+       _(Z_EXPECTED_LONG,              "int") \
        _(Z_EXPECTED_BOOL,              "boolean") \
        _(Z_EXPECTED_STRING,    "string") \
        _(Z_EXPECTED_ARRAY,             "array") \

diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt
index 6765ecf80c9d231217025d785ac27851edb24d54..b864af309ce22e8efe5bf0a762178cbc75ceb6a2 100644 (file)
--- a/ext/calendar/tests/jdtomonthname.phpt
+++ b/ext/calendar/tests/jdtomonthname.phpt
@@ -56,22 +56,22 @@ string(0) ""
 Notice: Array to string conversion in %sjdtomonthname.php on line %d
 Array
 
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: jdmonthname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: jdmonthname() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 === 10000000

diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt
index b9727c8a55d83e46c303e928091392a1019099a5..3d157c1edeae1111acc6206291ae81d830a06aca 100644 (file)
--- a/ext/curl/tests/curl_setopt_error.phpt
+++ b/ext/curl/tests/curl_setopt_error.phpt
@@ -40,6 +40,6 @@ Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
 
 Warning: curl_setopt() expects parameter 1 to be resource, boolean given in %s on line %d
 
-Warning: curl_setopt() expects parameter 2 to be integer, string given in %s on line %d
+Warning: curl_setopt() expects parameter 2 to be int, string given in %s on line %d
 
 Warning: curl_setopt(): Invalid curl configuration option in %scurl_setopt_error.php on line %d

diff --git a/ext/curl/tests/curl_version_variation1.phpt b/ext/curl/tests/curl_version_variation1.phpt
index 7c0106cb6a4c02883ce8a8bfecf96c1452554875..cbf2d4cbaccf8452134c4867f934766fb9ce8616 100644 (file)
--- a/ext/curl/tests/curl_version_variation1.phpt
+++ b/ext/curl/tests/curl_version_variation1.phpt
@@ -110,23 +110,23 @@ bool(true)
 bool(true)
 -- Iteration 10 --
 
-Warning: curl_version() expects parameter 1 to be integer, array given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 11 --
 
-Warning: curl_version() expects parameter 1 to be integer, array given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 12 --
 
-Warning: curl_version() expects parameter 1 to be integer, array given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 13 --
 
-Warning: curl_version() expects parameter 1 to be integer, string given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 14 --
 
-Warning: curl_version() expects parameter 1 to be integer, string given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 15 --
 
@@ -146,11 +146,11 @@ bool(true)
 bool(true)
 -- Iteration 22 --
 
-Warning: curl_version() expects parameter 1 to be integer, object given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 -- Iteration 23 --
 
-Warning: curl_version() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: curl_version() expects parameter 1 to be int, resource given in %s on line %d
 bool(false)
 -- Iteration 24 --
 bool(true)

diff --git a/ext/date/tests/68062.phpt b/ext/date/tests/68062.phpt
index ce2105abae5436d1ade5d74b0bbec70e41bc076e..6b1e16ae6713d18715147027d49df3ef45db7b54 100644 (file)
--- a/ext/date/tests/68062.phpt
+++ b/ext/date/tests/68062.phpt
@@ -10,4 +10,4 @@ echo $tz->getOffset($dt);
 echo $tz->getOffset(1);
 --EXPECTF--
 3600
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s

diff --git a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
index 2ee21a5262e2671a78494cb551a3fe18263f41f8..700da01fead309a92ba9825304908abddc839994 100644 (file)
--- a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt
index e75e14d8e30ef64199f1f53a0215a6c1b2af4237..887e0e0a6e8d401bd9952b501524cfe3ca5f276a 100644 (file)
--- a/ext/date/tests/DateTime_construct_variation2.phpt
+++ b/ext/date/tests/DateTime_construct_variation2.phpt
@@ -118,16 +118,16 @@ fclose( $file_handle);
 *** Testing new DateTime() : usage variation -  unexpected values to second argument $timezone***
 
 -- int 0 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
 
 -- int 1 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
 
 -- int 12345 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
 
 -- int -12345 --
-FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, integer given
+FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, int given
 
 -- float 10.5 --
 FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, float given

diff --git a/ext/date/tests/DateTime_setDate_variation1.phpt b/ext/date/tests/DateTime_setDate_variation1.phpt
index 945f7ae973f9e8c42c9114930fddd8cc36eff49d..a25bdee54fe0a3d06e7f309db4cbe83c473ec985 100644 (file)
--- a/ext/date/tests/DateTime_setDate_variation1.phpt
+++ b/ext/date/tests/DateTime_setDate_variation1.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set
  */
 
 echo "*** Testing DateTime::setDate() : usage variation -  unexpected values to first argument \$year***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setDate() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: DateTime::setDate() expects parameter 1 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setDate_variation2.phpt b/ext/date/tests/DateTime_setDate_variation2.phpt
index e335d2105980bd32b76f1e29014c11ce081dd04a..b3fbf46f4ff98ee29bdd22e92ec443878218858d 100644 (file)
--- a/ext/date/tests/DateTime_setDate_variation2.phpt
+++ b/ext/date/tests/DateTime_setDate_variation2.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set
  */
 
 echo "*** Testing DateTime::setDate() : usage variation -  unexpected values to second argument \$month***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setDate() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: DateTime::setDate() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setDate_variation3.phpt b/ext/date/tests/DateTime_setDate_variation3.phpt
index ef65e45e0e9e676cc28e8c93216cb0df78957522..b1f7aab961752e6ebd4ae17de151c54b0d20cc4d 100644 (file)
--- a/ext/date/tests/DateTime_setDate_variation3.phpt
+++ b/ext/date/tests/DateTime_setDate_variation3.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set
  */
 
 echo "*** Testing DateTime::setDate() : usage variation -  unexpected values to third argument \$day***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setDate() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: DateTime::setDate() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setISODate_variation1.phpt b/ext/date/tests/DateTime_setISODate_variation1.phpt
index 58043e568914e78b791e2011b5a775c48cb32c9a..74f262b5364f86a740c2154bbf85d58ae72eaa9d 100644 (file)
--- a/ext/date/tests/DateTime_setISODate_variation1.phpt
+++ b/ext/date/tests/DateTime_setISODate_variation1.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setISODate() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 1 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setISODate_variation2.phpt b/ext/date/tests/DateTime_setISODate_variation2.phpt
index c40665950a6cd3c3f4ea5449ed5d94263a7c9467..1677d042c64c607365eeb982b3a505fb9d16fd46 100644 (file)
--- a/ext/date/tests/DateTime_setISODate_variation2.phpt
+++ b/ext/date/tests/DateTime_setISODate_variation2.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setISODate() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setISODate_variation3.phpt b/ext/date/tests/DateTime_setISODate_variation3.phpt
index 87c39264a746905c586d886e5d0e35e0df468f4c..63ac22c28be2cb456dee67edc87a4c5f4159ebe3 100644 (file)
--- a/ext/date/tests/DateTime_setISODate_variation3.phpt
+++ b/ext/date/tests/DateTime_setISODate_variation3.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setISODate() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: DateTime::setISODate() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setTime_variation1.phpt b/ext/date/tests/DateTime_setTime_variation1.phpt
index 3f3c1e4c216c8e861137ff2976f7fe1e3e95bb61..ea2942bff3b76caf994c8aaf3c5de17442d40d9f 100644 (file)
--- a/ext/date/tests/DateTime_setTime_variation1.phpt
+++ b/ext/date/tests/DateTime_setTime_variation1.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setTime() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: DateTime::setTime() expects parameter 1 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setTime_variation2.phpt b/ext/date/tests/DateTime_setTime_variation2.phpt
index e2bc153b74cf800f00fbffe7f24320f4009559f5..f3b91ced5b832a276988c3a5eb39180626ba9153 100644 (file)
--- a/ext/date/tests/DateTime_setTime_variation2.phpt
+++ b/ext/date/tests/DateTime_setTime_variation2.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setTime() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: DateTime::setTime() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setTime_variation3.phpt b/ext/date/tests/DateTime_setTime_variation3.phpt
index 59e0cefe1d45f712b695497fdd3bbc79fbad41a4..4a33fa11be4ba0c2030191727aae7c5e53318845 100644 (file)
--- a/ext/date/tests/DateTime_setTime_variation3.phpt
+++ b/ext/date/tests/DateTime_setTime_variation3.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: DateTime::setTime() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: DateTime::setTime() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/DateTime_setTimezone_variation1.phpt b/ext/date/tests/DateTime_setTimezone_variation1.phpt
index b61edcb3f68588280b3ddf5411ec6ef43d2187e1..8baf3e50e2b3ad8dede9e86922f5254d11faea33 100644 (file)
--- a/ext/date/tests/DateTime_setTimezone_variation1.phpt
+++ b/ext/date/tests/DateTime_setTimezone_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: DateTime::setTimezone() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/bug36988.phpt b/ext/date/tests/bug36988.phpt
index 122315098852687ac59c4140265785df9cb4ae10..ab0f3a3c8a7d554a6080bc168e2a92f3f066cf87 100644 (file)
--- a/ext/date/tests/bug36988.phpt
+++ b/ext/date/tests/bug36988.phpt
@@ -9,4 +9,4 @@ $start = microtime(true);
 $a = mktime(1, 1, 1, 1, 1, 11111111111);
 ?>
 --EXPECTF--
-Warning: mktime() expects parameter 6 to be integer, float given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, float given in %s on line %d

diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt
index d8517e6a13712777b30d759ca26566ebf8a798ff..bc528e21d7b9f2b063d777e886d1fc5263d5ba9c 100644 (file)
--- a/ext/date/tests/bug52062.phpt
+++ b/ext/date/tests/bug52062.phpt
@@ -25,7 +25,7 @@ string(32) "5138-11-16 09:46:40 100000000000"
 bool(false)
 string(12) "100000000000"
 
-Warning: DateTime::setTimestamp() expects parameter 1 to be integer, float given in %s on line %d
+Warning: DateTime::setTimestamp() expects parameter 1 to be int, float given in %s on line %d
 string(32) "5138-11-16 09:46:40 100000000000"
 bool(false)
 string(10) "1215752192"
\ No newline at end of file

diff --git a/ext/date/tests/bug70245.phpt b/ext/date/tests/bug70245.phpt
index 4bf62566006e769424bd042ab71469889ec1835b..f754bf65a1770946b1ad5b8969eb061d0c1b91d8 100644 (file)
--- a/ext/date/tests/bug70245.phpt
+++ b/ext/date/tests/bug70245.phpt
@@ -6,5 +6,5 @@ $d = new DateTime('2011-01-15 00:00:00');
 var_dump(strtotime('-1 month', $d));
 ?>
 --EXPECTF--
-Warning: strtotime() expects parameter 2 to be integer, object given in %sbug70245.php on line %d
+Warning: strtotime() expects parameter 2 to be int, object given in %sbug70245.php on line %d
 bool(false)

diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt
index a3539dd97611aefb8856f25ac8ce8e6a90d3efe7..5892e1d37d46c559451455a39ff11ddc2b4372ea 100644 (file)
--- a/ext/date/tests/checkdate_variation1.phpt
+++ b/ext/date/tests/checkdate_variation1.phpt
@@ -112,22 +112,22 @@ bool(false)
 
 -- empty array --
 
-Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: checkdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -150,42 +150,42 @@ bool(false)
 
 -- empty string DQ --
 
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: checkdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: checkdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -196,7 +196,7 @@ bool(false)
 
 -- resource --
 
-Warning: checkdate() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===
 

diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt
index 9948faf86fedf9d0f3167a9a3ec63dee397a8047..d084931e5bf06cdf56f92d5e1917f234606af842 100644 (file)
--- a/ext/date/tests/checkdate_variation2.phpt
+++ b/ext/date/tests/checkdate_variation2.phpt
@@ -112,22 +112,22 @@ bool(false)
 
 -- empty array --
 
-Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: checkdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -150,42 +150,42 @@ bool(false)
 
 -- empty string DQ --
 
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: checkdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: checkdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: checkdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -196,7 +196,7 @@ bool(false)
 
 -- resource --
 
-Warning: checkdate() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: checkdate() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===
 

diff --git a/ext/date/tests/checkdate_variation3.phpt b/ext/date/tests/checkdate_variation3.phpt
index a92bc0ce8c4a189d4a4f1a9eeb76590ea99c0094..1fda22b35ba73b54a69085001c099c43729056a0 100644 (file)
--- a/ext/date/tests/checkdate_variation3.phpt
+++ b/ext/date/tests/checkdate_variation3.phpt
@@ -112,22 +112,22 @@ bool(false)
 
 -- empty array --
 
-Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: checkdate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -150,42 +150,42 @@ bool(false)
 
 -- empty string DQ --
 
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: checkdate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: checkdate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: checkdate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -196,6 +196,6 @@ bool(false)
 
 -- resource --
 
-Warning: checkdate() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: checkdate() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt
index 63a5723cd730ff51eae50d5b038c86d9f84e8edc..55b0fe1771a8d918188717d6d1b04ad9a50b863a 100644 (file)
--- a/ext/date/tests/date_create_variation2.phpt
+++ b/ext/date/tests/date_create_variation2.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle);
 
 -- int 0 --
 
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_create() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_date_set_variation1.phpt b/ext/date/tests/date_date_set_variation1.phpt
index 59823f12b32a0ed98b09a0c403813b07bc94372b..8e5432239e20978274dd7ed85dc2979bee48ff4d 100644 (file)
--- a/ext/date/tests/date_date_set_variation1.phpt
+++ b/ext/date/tests/date_date_set_variation1.phpt
@@ -114,22 +114,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_date_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt
index ef4e8bb868e934b42ac3f1be76312f53bc4e86ca..a41ffe94b7c9ea63f7558ea9098c373c5a27555f 100644 (file)
--- a/ext/date/tests/date_date_set_variation2.phpt
+++ b/ext/date/tests/date_date_set_variation2.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_date_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_date_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_date_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_date_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_date_set() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: date_date_set() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_date_set_variation3.phpt b/ext/date/tests/date_date_set_variation3.phpt
index f304dddba2b8601c5e62eb340195a5f12520ef33..a5510fb50f1fb8ae2f719168db94fd197dca0dbd 100644 (file)
--- a/ext/date/tests/date_date_set_variation3.phpt
+++ b/ext/date/tests/date_date_set_variation3.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_date_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_date_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_date_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_date_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_date_set() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: date_date_set() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_date_set_variation4.phpt b/ext/date/tests/date_date_set_variation4.phpt
index e285afd69f79c30334c746b982c472b6b81b166c..de02a2a42c650b258a44304fd14a50b5a035624b 100644 (file)
--- a/ext/date/tests/date_date_set_variation4.phpt
+++ b/ext/date/tests/date_date_set_variation4.phpt
@@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to f
 --FILE--
 <?php
 /* Prototype  : DateTime date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setDate
  */
 
 echo "*** Testing date_date_set() : usage variation -  unexpected values to forth argument \$day***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_date_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_date_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_date_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_date_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_date_set() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: date_date_set() expects parameter 4 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_error.phpt b/ext/date/tests/date_error.phpt
index ec7ff9da41a35864dcd12f574e41e1f4c6b913df..1fa25e1b0c673dd7de700085d3ec6a1ecf74eb45 100644 (file)
--- a/ext/date/tests/date_error.phpt
+++ b/ext/date/tests/date_error.phpt
@@ -34,6 +34,6 @@ bool(false)
 
 -- Testing date function with more than expected no. of arguments --
 
-Warning: checkdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: checkdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_format_error.phpt b/ext/date/tests/date_format_error.phpt
index a563d0d974b6f2834df99ee591d6d4e0be04d27f..8a170b098f9711f78c4a13ae997930eb6b916239 100644 (file)
--- a/ext/date/tests/date_format_error.phpt
+++ b/ext/date/tests/date_format_error.phpt
@@ -59,7 +59,7 @@ bool(false)
 Warning: date_format() expects parameter 1 to be DateTimeInterface, object given in %sp on line %d
 bool(false)
 
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 Warning: date_format() expects parameter 1 to be DateTimeInterface, null given in %s on line %d

diff --git a/ext/date/tests/date_format_variation1.phpt b/ext/date/tests/date_format_variation1.phpt
index af76a7ef90795540e2f197a54af6160598e6a871..9818ce44d1721cbdd069b352b8d00681ae896d65 100644 (file)
--- a/ext/date/tests/date_format_variation1.phpt
+++ b/ext/date/tests/date_format_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_format() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_format() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_isodate_set_error.phpt b/ext/date/tests/date_isodate_set_error.phpt
index 9accd92d931edc3b2d714f341e8553e1f07b9ce0..43651ef6a0881554bb33f215a1eef09fa2076377 100644 (file)
--- a/ext/date/tests/date_isodate_set_error.phpt
+++ b/ext/date/tests/date_isodate_set_error.phpt
@@ -60,7 +60,7 @@ bool(false)
 Warning: date_isodate_set() expects parameter 1 to be DateTime, object given in %s on line %d
 bool(false)
 
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 Warning: date_isodate_set() expects parameter 1 to be DateTime, null given in %s on line %d

diff --git a/ext/date/tests/date_isodate_set_variation1.phpt b/ext/date/tests/date_isodate_set_variation1.phpt
index 900dc844754e30c700dcf201adc05869a213d537..6bbba71b6c6067d37cae6def751fcc147f23c561 100644 (file)
--- a/ext/date/tests/date_isodate_set_variation1.phpt
+++ b/ext/date/tests/date_isodate_set_variation1.phpt
@@ -114,22 +114,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_isodate_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt
index fe667801a2dbb38702ba96168cf416dd3ec7005e..078abf019109a3f35ccd6861e2b5e591b8799242 100644 (file)
--- a/ext/date/tests/date_isodate_set_variation2.phpt
+++ b/ext/date/tests/date_isodate_set_variation2.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_isodate_set() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: date_isodate_set() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_isodate_set_variation3.phpt b/ext/date/tests/date_isodate_set_variation3.phpt
index 5a7a4a2802177208e2469eb576e3807df3c4bc82..a9906dc97d25492e5460b1800788f6603582b88a 100644 (file)
--- a/ext/date/tests/date_isodate_set_variation3.phpt
+++ b/ext/date/tests/date_isodate_set_variation3.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_isodate_set() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: date_isodate_set() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_isodate_set_variation4.phpt b/ext/date/tests/date_isodate_set_variation4.phpt
index 074df8452fb9e2bf5e5b020afe5ee0eedd242413..0c94d515b05d2a0706d0b1cc1e29c17c68cae964 100644 (file)
--- a/ext/date/tests/date_isodate_set_variation4.phpt
+++ b/ext/date/tests/date_isodate_set_variation4.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_isodate_set() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: date_isodate_set() expects parameter 4 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_modify_error.phpt b/ext/date/tests/date_modify_error.phpt
index ac727f1ca19249f13c7097b1732e5f35b8ee534b..2bfd38bbe6fb3d116c9ec04503b12aca84e783ee 100644 (file)
--- a/ext/date/tests/date_modify_error.phpt
+++ b/ext/date/tests/date_modify_error.phpt
@@ -60,7 +60,7 @@ bool(false)
 Warning: date_modify() expects parameter 1 to be DateTime, object given in %s on line %d
 bool(false)
 
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 Warning: date_modify() expects parameter 1 to be DateTime, null given in %s on line %d

diff --git a/ext/date/tests/date_modify_variation1.phpt b/ext/date/tests/date_modify_variation1.phpt
index afe75e2c699dfd9dc7c3cf8e1d104b7406a856cd..9ca702b82ee93720c006b60f929c4389492099d0 100644 (file)
--- a/ext/date/tests/date_modify_variation1.phpt
+++ b/ext/date/tests/date_modify_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_modify() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_offset_get_error.phpt b/ext/date/tests/date_offset_get_error.phpt
index 8531845ca7bb17a9106f6fc45cdd4c8febdd1b6f..7c1fa2a6910beeb73b44bd132717fbf43e9cb802 100644 (file)
--- a/ext/date/tests/date_offset_get_error.phpt
+++ b/ext/date/tests/date_offset_get_error.phpt
@@ -49,7 +49,7 @@ bool(false)
 Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, object given in %s on line %d
 bool(false)
 
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, null given in %s on line %d

diff --git a/ext/date/tests/date_offset_get_variation1.phpt b/ext/date/tests/date_offset_get_variation1.phpt
index a3d93b3f23162c5f28ea43220fc60fb74802156f..3a90957e89dda1ed8586012fc9e1e184a91a7222 100644 (file)
--- a/ext/date/tests/date_offset_get_variation1.phpt
+++ b/ext/date/tests/date_offset_get_variation1.phpt
@@ -110,22 +110,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_offset_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_sun_info_variation1.phpt b/ext/date/tests/date_sun_info_variation1.phpt
index 1faafea1d970bc1f441a821c896377adf69e7226..caf939efc0581e7d50c24582b9d32e214f2f77e1 100644 (file)
--- a/ext/date/tests/date_sun_info_variation1.phpt
+++ b/ext/date/tests/date_sun_info_variation1.phpt
@@ -413,32 +413,32 @@ array(9) {
 
 -- Iteration 16 --
 
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 17 --
 
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 18 --
 
-Warning: date_sun_info() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- Iteration 19 --
 
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 20 --
 
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 21 --
 
-Warning: date_sun_info() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 22 --
@@ -487,6 +487,6 @@ array(9) {
 
 -- Iteration 24 --
 
-Warning: date_sun_info() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: date_sun_info() expects parameter 1 to be int, resource given in %s on line %d
 bool(false)
 ===Done===

diff --git a/ext/date/tests/date_sunrise_variation1.phpt b/ext/date/tests/date_sunrise_variation1.phpt
index ccb0ad83259f0b9f944a329f6827a7e5a14cae1c..87b2d798641f49fd70e8de8084908276c8047a33 100644 (file)
--- a/ext/date/tests/date_sunrise_variation1.phpt
+++ b/ext/date/tests/date_sunrise_variation1.phpt
@@ -144,46 +144,46 @@ int(28596)
 
 --empty array--
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -218,90 +218,90 @@ int(28596)
 
 --empty string DQ--
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/date_sunrise_variation2.phpt b/ext/date/tests/date_sunrise_variation2.phpt
index 45519798f4bc9b88a2cf2a9edf8ed4e317edd2e0..0a63d42793bd9a075cbe4011335c22019530b7b7 100644 (file)
--- a/ext/date/tests/date_sunrise_variation2.phpt
+++ b/ext/date/tests/date_sunrise_variation2.phpt
@@ -116,12 +116,12 @@ bool(false)
 
 --float 12.3456789000e10--
 
-Warning: date_sunrise() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 --float -12.3456789000e10--
 
-Warning: date_sunrise() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 --float .5--
@@ -129,22 +129,22 @@ int(1218174468)
 
 --empty array--
 
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: date_sunrise() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -167,42 +167,42 @@ int(1218174468)
 
 --empty string DQ--
 
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: date_sunrise() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: date_sunrise() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: date_sunrise() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunrise() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt
index 979fa455a008f22b446324b9852a03bf22d0234f..17558a7e4281d354d52fa62e1f99c6bbc446a8c3 100644 (file)
--- a/ext/date/tests/date_sunrise_variation9.phpt
+++ b/ext/date/tests/date_sunrise_variation9.phpt
@@ -39,23 +39,23 @@ var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $ze
 
 -- Testing date_sunrise() function by passing float 12.3456789000e10 value to time --
 
-Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
 -- Testing date_sunrise() function by passing float -12.3456789000e10 value to time --
 
-Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunrise() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file

diff --git a/ext/date/tests/date_sunset_variation1.phpt b/ext/date/tests/date_sunset_variation1.phpt
index 99b6230338c39622c15cd0c1cd9c6163fb87dd2c..58e885b314a150f79782f87c459293979e43df9c 100644 (file)
--- a/ext/date/tests/date_sunset_variation1.phpt
+++ b/ext/date/tests/date_sunset_variation1.phpt
@@ -144,46 +144,46 @@ int(62545)
 
 --empty array--
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -218,90 +218,90 @@ int(62545)
 
 --empty string DQ--
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/date_sunset_variation2.phpt b/ext/date/tests/date_sunset_variation2.phpt
index 8015995fe018e9066fdfb00892bcfaac39c8c7c2..6c9eca364f079339f893828e2db794a2a1908fc0 100644 (file)
--- a/ext/date/tests/date_sunset_variation2.phpt
+++ b/ext/date/tests/date_sunset_variation2.phpt
@@ -116,12 +116,12 @@ bool(false)
 
 --float 12.3456789000e10--
 
-Warning: date_sunset() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 --float -12.3456789000e10--
 
-Warning: date_sunset() expects parameter 2 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 --float .5--
@@ -129,22 +129,22 @@ int(1218199264)
 
 --empty array--
 
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: date_sunset() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -167,42 +167,42 @@ int(1218199264)
 
 --empty string DQ--
 
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: date_sunset() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: date_sunset() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: date_sunset() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date_sunset() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/date_sunset_variation9.phpt b/ext/date/tests/date_sunset_variation9.phpt
index c18d48e42cae63d74d3e4eb521ab89c9d1a9dfd8..56949b7e8fdb24501cca3fd6d17596287901e5ce 100644 (file)
--- a/ext/date/tests/date_sunset_variation9.phpt
+++ b/ext/date/tests/date_sunset_variation9.phpt
@@ -39,23 +39,23 @@ var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $latitude, $longitude, $zen
 
 -- Testing date_sunset() function by passing float 12.3456789000e10 value to time --
 
-Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
 -- Testing date_sunset() function by passing float -12.3456789000e10 value to time --
 
-Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: date_sunset() expects parameter 1 to be integer, float given in %s on line %d
+Warning: date_sunset() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_time_set_error.phpt b/ext/date/tests/date_time_set_error.phpt
index 5c5ddaf4d2825526eadc8caffa3f61d7f56ec27c..e722cc7151fba62d5044b8cbda01d43fab3f7b79 100644 (file)
--- a/ext/date/tests/date_time_set_error.phpt
+++ b/ext/date/tests/date_time_set_error.phpt
@@ -63,7 +63,7 @@ bool(false)
 Warning: date_time_set() expects parameter 1 to be DateTime, object given in %s on line %d
 bool(false)
 
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 Warning: date_time_set() expects parameter 1 to be DateTime, null given in %s on line %d

diff --git a/ext/date/tests/date_time_set_variation1.phpt b/ext/date/tests/date_time_set_variation1.phpt
index 64e65d58b87f6a689a70e3f8bff718651bdb9c93..27c6903cb286f4325a492916fa4a3b8a768afaff 100644 (file)
--- a/ext/date/tests/date_time_set_variation1.phpt
+++ b/ext/date/tests/date_time_set_variation1.phpt
@@ -114,22 +114,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_time_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt
index 3e77fffadaee05e903ff53777b139fef77c17ab0..6ab19f24eeef7ad01d43f8c02562f686702a2717 100644 (file)
--- a/ext/date/tests/date_time_set_variation2.phpt
+++ b/ext/date/tests/date_time_set_variation2.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_time_set() expects parameter 2 to be integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, array given in %s
 bool(false)
 
 -- int indexed array --
 
-Warning: date_time_set() expects parameter 2 to be integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, array given in %s
 bool(false)
 
 -- associative array --
 
-Warning: date_time_set() expects parameter 2 to be integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, array given in %s
 bool(false)
 
 -- nested arrays --
 
-Warning: date_time_set() expects parameter 2 to be integer, array given in %s
+Warning: date_time_set() expects parameter 2 to be int, array given in %s
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
 bool(false)
 
 -- string DQ --
 
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
 bool(false)
 
 -- string SQ --
 
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
 bool(false)
 
 -- mixed case string --
 
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
 bool(false)
 
 -- heredoc --
 
-Warning: date_time_set() expects parameter 2 to be integer, string given in %s
+Warning: date_time_set() expects parameter 2 to be int, string given in %s
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_time_set() expects parameter 2 to be integer, object given in %s
+Warning: date_time_set() expects parameter 2 to be int, object given in %s
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_time_set() expects parameter 2 to be integer, object given in %s
+Warning: date_time_set() expects parameter 2 to be int, object given in %s
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_time_set() expects parameter 2 to be integer, resource given in %s
+Warning: date_time_set() expects parameter 2 to be int, resource given in %s
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_time_set_variation3.phpt b/ext/date/tests/date_time_set_variation3.phpt
index 12a60a118cd84267bc530f1fe65ffd4191d7a33b..7293580553c8060e7d6d91fcb6a2f7c91e81c805 100644 (file)
--- a/ext/date/tests/date_time_set_variation3.phpt
+++ b/ext/date/tests/date_time_set_variation3.phpt
@@ -184,22 +184,22 @@ object(DateTime)#3 (3) {
 
 -- empty array --
 
-Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_time_set() expects parameter 3 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_time_set() expects parameter 3 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_time_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_time_set() expects parameter 3 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_time_set() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: date_time_set() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_time_set_variation4.phpt b/ext/date/tests/date_time_set_variation4.phpt
index aa05f7dd402fcd751ec9e753fe3bf25c5a38751b..8a0d5c8caa34a900f884a9e0de26233703446780 100644 (file)
--- a/ext/date/tests/date_time_set_variation4.phpt
+++ b/ext/date/tests/date_time_set_variation4.phpt
@@ -184,22 +184,22 @@ object(DateTime)#%d (3) {
 
 -- empty array --
 
-Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date_time_set() expects parameter 4 to be integer, array given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -264,42 +264,42 @@ object(DateTime)#%d (3) {
 
 -- empty string DQ --
 
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date_time_set() expects parameter 4 to be integer, string given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date_time_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date_time_set() expects parameter 4 to be integer, object given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -324,6 +324,6 @@ object(DateTime)#%d (3) {
 
 -- resource --
 
-Warning: date_time_set() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: date_time_set() expects parameter 4 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/date_timestamp_get.phpt b/ext/date/tests/date_timestamp_get.phpt
index ec0258bdc0010997fd7c5dd782541f3391e10121..acdf1e567e531aa858e20119246a1795dfdf97e3 100644 (file)
--- a/ext/date/tests/date_timestamp_get.phpt
+++ b/ext/date/tests/date_timestamp_get.phpt
@@ -17,4 +17,4 @@ bool(true)
 
 
 
-Warning: date_timestamp_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timestamp_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d

diff --git a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
index ed31cb217d7327bcb51ea04146e67a84df7a3116..1b3a94bffd8373342a99958eab1c762314addcb6 100644 (file)
--- a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
@@ -12,4 +12,4 @@ $dftz021 = date_default_timezone_get(); //UTC
 date_timestamp_set(987654321, 123456789);
 ?>
 --EXPECTF--
-Warning: date_timestamp_set() expects parameter 1 to be DateTime, integer given in %s on line %d
\ No newline at end of file
+Warning: date_timestamp_set() expects parameter 1 to be DateTime, int given in %s on line %d
\ No newline at end of file

diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
index 387313b13b27bd226aed2025f13aa8ac614521a1..1243240c2d49e93f281759d02f65baabcb8d267c 100644 (file)
--- a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
@@ -16,4 +16,4 @@ $wrong_parameter = array();
 date_timestamp_set($dtms021, $wrong_parameter);
 ?>
 --EXPECTF--
-Warning: date_timestamp_set() expects parameter 2 to be integer, array given in %s on line %d
\ No newline at end of file
+Warning: date_timestamp_set() expects parameter 2 to be int, array given in %s on line %d
\ No newline at end of file

diff --git a/ext/date/tests/date_timezone_get_error.phpt b/ext/date/tests/date_timezone_get_error.phpt
index 01963c82249edf5aa081c633e3534ad89f548eb4..4d8318431cb48ed5bfa42f6a7c7d0961c731a2cf 100644 (file)
--- a/ext/date/tests/date_timezone_get_error.phpt
+++ b/ext/date/tests/date_timezone_get_error.phpt
@@ -48,7 +48,7 @@ bool(false)
 Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, object given in %s on line %d
 bool(false)
 
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, null given in %s on line %d

diff --git a/ext/date/tests/date_timezone_get_variation1.phpt b/ext/date/tests/date_timezone_get_variation1.phpt
index 4bbd414895db218e22a524989b8ae9ce3dffb9e8..6c60225ce6dab509f59eb2a7dc208e77e9541ba3 100644 (file)
--- a/ext/date/tests/date_timezone_get_variation1.phpt
+++ b/ext/date/tests/date_timezone_get_variation1.phpt
@@ -110,22 +110,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
+Warning: date_timezone_get() expects parameter 1 to be DateTimeInterface, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_timezone_set_error.phpt b/ext/date/tests/date_timezone_set_error.phpt
index 8c9c00d638f76ef7a9b6f1c005d14d89252d3c69..3ceebf7382ec77f4cda755742dd873760abb9fd7 100644 (file)
--- a/ext/date/tests/date_timezone_set_error.phpt
+++ b/ext/date/tests/date_timezone_set_error.phpt
@@ -56,7 +56,7 @@ bool(false)
 Warning: date_timezone_set() expects parameter 1 to be DateTime, object given in %s on line %d
 bool(false)
 
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 Warning: date_timezone_set() expects parameter 1 to be DateTime, null given in %s on line %d

diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt
index 0adaf14b9434658df4ab87324c603c91c41901fc..399681de42652d5a0bcce078c7d1e2131e6fc97d 100644 (file)
--- a/ext/date/tests/date_timezone_set_variation1.phpt
+++ b/ext/date/tests/date_timezone_set_variation1.phpt
@@ -113,22 +113,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 1 to be DateTime, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt
index 46ce4e58147d1fc380858c8aacfab289d781f01d..2c27cd932691b1050ea72599498b8f03be0a5d02 100644 (file)
--- a/ext/date/tests/date_timezone_set_variation2.phpt
+++ b/ext/date/tests/date_timezone_set_variation2.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt
index 597c4d83bb4328ac92537f8cdef36a8c5ae65fab..5d2535c83378f9afd987764dfe7717bb295b2a64 100644 (file)
--- a/ext/date/tests/date_variation2.phpt
+++ b/ext/date/tests/date_variation2.phpt
@@ -132,22 +132,22 @@ string(24) "January 1, 1970, 1:00 am"
 
 -- empty array --
 
-Warning: date() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: date() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: date() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: date() expects parameter 2 to be integer, array given in %s on line %d
+Warning: date() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -170,42 +170,42 @@ string(24) "January 1, 1970, 1:00 am"
 
 -- empty string DQ --
 
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: date() expects parameter 2 to be integer, string given in %s on line %d
+Warning: date() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: date() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: date() expects parameter 2 to be integer, object given in %s on line %d
+Warning: date() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -216,7 +216,7 @@ string(24) "January 1, 1970, 1:00 am"
 
 -- resource --
 
-Warning: date() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: date() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===
 

diff --git a/ext/date/tests/getdate_variation1.phpt b/ext/date/tests/getdate_variation1.phpt
index e0b8bab008667c8041b73418b9bae927eb939c78..c74eb4c71501fa094001f21648b61d2bf0ab847b 100644 (file)
--- a/ext/date/tests/getdate_variation1.phpt
+++ b/ext/date/tests/getdate_variation1.phpt
@@ -175,22 +175,22 @@ array(11) {
 
 --empty array--
 
-Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: getdate() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -351,42 +351,42 @@ array(11) {
 
 --empty string DQ--
 
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: getdate() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: getdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: getdate() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt
index 0f0165edea654d002448d4934bc94bfcf79a0c5f..dcff205f6803d9a171bd56a9f21efefc8c8754ef 100644 (file)
--- a/ext/date/tests/getdate_variation7.phpt
+++ b/ext/date/tests/getdate_variation7.phpt
@@ -27,11 +27,11 @@ var_dump( getdate($timestamp) );
 
 -- Testing getdate() function by passing float 12.3456789000e10 value to timestamp --
 
-Warning: getdate() expects parameter 1 to be integer, float given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
 -- Testing getdate() function by passing float -12.3456789000e10 value to timestamp --
 
-Warning: getdate() expects parameter 1 to be integer, float given in %s on line %d
+Warning: getdate() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file

diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt
index 4b58febaea35a76bc56bbd03061f53d16dc1023e..70c6b67c47cc399d82659eddbd11a8ffbe55a667 100644 (file)
--- a/ext/date/tests/gmdate_variation14.phpt
+++ b/ext/date/tests/gmdate_variation14.phpt
@@ -30,11 +30,11 @@ var_dump( gmdate($format, $timestamp) );
 
 -- Testing gmdate() function with float 12.3456789000e10 to timestamp --
 
-Warning: gmdate() expects parameter 2 to be integer, float given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 -- Testing gmdate() function with float -12.3456789000e10 to timestamp --
 
-Warning: gmdate() expects parameter 2 to be integer, float given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file

diff --git a/ext/date/tests/gmdate_variation2.phpt b/ext/date/tests/gmdate_variation2.phpt
index 3a2ba5e69f7478104b604eb48b19c202bba99047..f22c52fcd0fd44e8f14aaf91fb14f306714b80f6 100644 (file)
--- a/ext/date/tests/gmdate_variation2.phpt
+++ b/ext/date/tests/gmdate_variation2.phpt
@@ -126,22 +126,22 @@ string(24) "1970-01-01T00:00:00+0000"
 
 --empty array--
 
-Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmdate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -164,42 +164,42 @@ string(24) "1970-01-01T00:00:00+0000"
 
 --empty string DQ--
 
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmdate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmdate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmdate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/gmmktime_variation1.phpt b/ext/date/tests/gmmktime_variation1.phpt
index 2792c1000cf9a6d84b64f445352d607754299ccb..d0e4da8fce65a652d833d80835056d4a5bc09422 100644 (file)
--- a/ext/date/tests/gmmktime_variation1.phpt
+++ b/ext/date/tests/gmmktime_variation1.phpt
@@ -110,22 +110,22 @@ int(1218154088)
 
 --empty array--
 
-Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmmktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -148,42 +148,42 @@ int(1218154088)
 
 --empty string DQ--
 
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmmktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmmktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmmktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/gmmktime_variation2.phpt b/ext/date/tests/gmmktime_variation2.phpt
index b53430d46b56c0845e7f22dd489e0f4995c6e1dc..5f77347a7ea65369f6650a9d46eb67a67117be49 100644 (file)
--- a/ext/date/tests/gmmktime_variation2.phpt
+++ b/ext/date/tests/gmmktime_variation2.phpt
@@ -110,22 +110,22 @@ int(1218182408)
 
 --empty array--
 
-Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmmktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -148,42 +148,42 @@ int(1218182408)
 
 --empty string DQ--
 
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmmktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmmktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmmktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/gmmktime_variation3.phpt b/ext/date/tests/gmmktime_variation3.phpt
index 5a7bdcb0bb0f7988ed17b1c64abb34d7c27d8c00..a3878ccd0152f0e44283f19129e6102e19b66aec 100644 (file)
--- a/ext/date/tests/gmmktime_variation3.phpt
+++ b/ext/date/tests/gmmktime_variation3.phpt
@@ -110,22 +110,22 @@ int(1218182880)
 
 --empty array--
 
-Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmmktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -148,42 +148,42 @@ int(1218182880)
 
 --empty string DQ--
 
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmmktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmmktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmmktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/gmmktime_variation4.phpt b/ext/date/tests/gmmktime_variation4.phpt
index de88ab56dcf42e203f83a84183f987d6ddbba5aa..41ae07afa14cd2b70800441c0f3144935999aa8f 100644 (file)
--- a/ext/date/tests/gmmktime_variation4.phpt
+++ b/ext/date/tests/gmmktime_variation4.phpt
@@ -110,22 +110,22 @@ int(1197101288)
 
 --empty array--
 
-Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmmktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -148,42 +148,42 @@ int(1197101288)
 
 --empty string DQ--
 
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmmktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmmktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmmktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/gmmktime_variation5.phpt b/ext/date/tests/gmmktime_variation5.phpt
index 5d7451a348f01d8dc4cc8381fda7beef351f0f31..1ebf1377b3b5cdd9c9da7e4e386716efea4d6baa 100644 (file)
--- a/ext/date/tests/gmmktime_variation5.phpt
+++ b/ext/date/tests/gmmktime_variation5.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to fifth
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
@@ -110,22 +110,22 @@ int(1217491688)
 
 --empty array--
 
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmmktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -148,42 +148,42 @@ int(1217491688)
 
 --empty string DQ--
 
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmmktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmmktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmmktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 5 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/gmmktime_variation6.phpt b/ext/date/tests/gmmktime_variation6.phpt
index 81b930ceb67f5e3c46a54c586454c5d78428e84c..e5e80282cb87162422c0a738430943a574c84e1c 100644 (file)
--- a/ext/date/tests/gmmktime_variation6.phpt
+++ b/ext/date/tests/gmmktime_variation6.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to sixth
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
@@ -106,22 +106,22 @@ int(965722088)
 
 --empty array--
 
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmmktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -144,42 +144,42 @@ int(965722088)
 
 --empty string DQ--
 
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmmktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmmktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmmktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: gmmktime() expects parameter 6 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/gmstrftime_variation2.phpt b/ext/date/tests/gmstrftime_variation2.phpt
index c3ff81d1361555accc20fe60fc09c06ce1073afd..c29241b7938051b135ee2c2b6b32f89c8c5a2cb9 100644 (file)
--- a/ext/date/tests/gmstrftime_variation2.phpt
+++ b/ext/date/tests/gmstrftime_variation2.phpt
@@ -113,12 +113,12 @@ string(20) "Dec 31 1969 23:59:50"
 
 --float 12.3456789000e10--
 
-Warning: gmstrftime() expects parameter 2 to be integer, float given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 --float -12.3456789000e10--
 
-Warning: gmstrftime() expects parameter 2 to be integer, float given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 --float .5--
@@ -126,22 +126,22 @@ string(20) "Jan 01 1970 00:00:00"
 
 --empty array--
 
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: gmstrftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -164,42 +164,42 @@ string(20) "Jan 01 1970 00:00:00"
 
 --empty string DQ--
 
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: gmstrftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: gmstrftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: gmstrftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmstrftime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/idate_variation2.phpt b/ext/date/tests/idate_variation2.phpt
index cfa8076ea0b6320e23434762cba481500b0cd883..16730bbc4bcb7a884e501765872b7c640de1eb80 100644 (file)
--- a/ext/date/tests/idate_variation2.phpt
+++ b/ext/date/tests/idate_variation2.phpt
@@ -107,22 +107,22 @@ int(1970)
 
 --empty array--
 
-Warning: idate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: idate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: idate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: idate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: idate() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -145,42 +145,42 @@ int(1970)
 
 --empty string DQ--
 
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: idate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: idate() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: idate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: idate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: idate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: idate() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt
index dd38a4417041c1a13917b089e3693aecedc702ad..a2fa0c1a621cdb2c79dfc434fc439ce2b7a333f8 100644 (file)
--- a/ext/date/tests/idate_variation3.phpt
+++ b/ext/date/tests/idate_variation3.phpt
@@ -31,11 +31,11 @@ var_dump( idate($format, $timestamp) );
 
 -- Testing idate() function with float 12.3456789000e10 to timestamp --
 
-Warning: idate() expects parameter 2 to be integer, float given in %s on line %d
+Warning: idate() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 -- Testing idate() function with float -12.3456789000e10 to timestamp --
 
-Warning: idate() expects parameter 2 to be integer, float given in %s on line %d
+Warning: idate() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file

diff --git a/ext/date/tests/localtime_variation1.phpt b/ext/date/tests/localtime_variation1.phpt
index b19f0ed64840558b22adbb63702aa3278c053c8e..cc0b3a11384831328219cbfd707b369649fe9f14 100644 (file)
--- a/ext/date/tests/localtime_variation1.phpt
+++ b/ext/date/tests/localtime_variation1.phpt
@@ -226,34 +226,34 @@ array(9) {
 
 --empty array--
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -510,66 +510,66 @@ array(9) {
 
 --empty string DQ--
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/localtime_variation3.phpt b/ext/date/tests/localtime_variation3.phpt
index a8dd3ac35f230c674125889eeef1ce5652b40415..c49cfbb949526803886b12cbe83efc5ad14a33fb 100644 (file)
--- a/ext/date/tests/localtime_variation3.phpt
+++ b/ext/date/tests/localtime_variation3.phpt
@@ -34,17 +34,17 @@ var_dump( localtime($timestamp, $is_associative) );
 
 -- Testing localtime() function with 'float 12.3456789000e10' to timestamp --
 
-Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
 -- Testing localtime() function with 'float -12.3456789000e10' to timestamp --
 
-Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: localtime() expects parameter 1 to be integer, float given in %s on line %d
+Warning: localtime() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt
index 5d0f0c50e04ce8acb58d8c66f82efb7b9d1dd39a..0ccc31da40766226865e1e8d7b5653ff6a4822d2 100644 (file)
--- a/ext/date/tests/mktime_variation1.phpt
+++ b/ext/date/tests/mktime_variation1.phpt
@@ -135,22 +135,22 @@ int(%i)
 
 -- empty array --
 
-Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: mktime() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -173,42 +173,42 @@ int(%i)
 
 -- empty string DQ --
 
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: mktime() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: mktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: mktime() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -219,6 +219,6 @@ int(%i)
 
 -- resource --
 
-Warning: mktime() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: mktime() expects parameter 1 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file

diff --git a/ext/date/tests/mktime_variation2.phpt b/ext/date/tests/mktime_variation2.phpt
index f5f8ef78036342875b1e1c55ef5975e7312ab4c8..b6957ce6dc443169a437c8ce643b808eaacd9d80 100644 (file)
--- a/ext/date/tests/mktime_variation2.phpt
+++ b/ext/date/tests/mktime_variation2.phpt
@@ -129,22 +129,22 @@ int(%i)
 
 -- empty array --
 
-Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: mktime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -167,42 +167,42 @@ int(%i)
 
 -- empty string DQ --
 
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: mktime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: mktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: mktime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -213,6 +213,6 @@ int(%i)
 
 -- resource --
 
-Warning: mktime() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: mktime() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/mktime_variation3.phpt b/ext/date/tests/mktime_variation3.phpt
index 8abf2a2d350bdb0034a9804c617a4b862b117a7d..5ea479e801d08e0bd936f476b3d6348d688a2575 100644 (file)
--- a/ext/date/tests/mktime_variation3.phpt
+++ b/ext/date/tests/mktime_variation3.phpt
@@ -130,22 +130,22 @@ int(%i)
 
 -- empty array --
 
-Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: mktime() expects parameter 3 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -168,42 +168,42 @@ int(%i)
 
 -- empty string DQ --
 
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: mktime() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: mktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: mktime() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -214,6 +214,6 @@ int(%i)
 
 -- resource --
 
-Warning: mktime() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mktime() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/mktime_variation4.phpt b/ext/date/tests/mktime_variation4.phpt
index 1b64c27e8540800e8d281c1bf10658b93a612d55..af6bc1f29cc0097dfce6d5f1102f12b82174dbc9 100644 (file)
--- a/ext/date/tests/mktime_variation4.phpt
+++ b/ext/date/tests/mktime_variation4.phpt
@@ -131,22 +131,22 @@ int(%i)
 
 -- empty array --
 
-Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: mktime() expects parameter 4 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -169,42 +169,42 @@ int(%i)
 
 -- empty string DQ --
 
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: mktime() expects parameter 4 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: mktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: mktime() expects parameter 4 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -215,6 +215,6 @@ int(%i)
 
 -- resource --
 
-Warning: mktime() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: mktime() expects parameter 4 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/mktime_variation5.phpt b/ext/date/tests/mktime_variation5.phpt
index fc36797a0ec3000105683f3df0181c0a308d4949..9fbf70b9071fb258c4addf14239ed56fd775737a 100644 (file)
--- a/ext/date/tests/mktime_variation5.phpt
+++ b/ext/date/tests/mktime_variation5.phpt
@@ -132,22 +132,22 @@ int(%i)
 
 -- empty array --
 
-Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: mktime() expects parameter 5 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -170,42 +170,42 @@ int(%i)
 
 -- empty string DQ --
 
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: mktime() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: mktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: mktime() expects parameter 5 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -216,6 +216,6 @@ int(%i)
 
 -- resource --
 
-Warning: mktime() expects parameter 5 to be integer, resource given in %s on line %d
+Warning: mktime() expects parameter 5 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt
index 0b2a1309150f8eb9e66b868f3482e20c4562e322..6328699b68d5c1960cb923db2d1a7f7d8623dd17 100644 (file)
--- a/ext/date/tests/mktime_variation6.phpt
+++ b/ext/date/tests/mktime_variation6.phpt
@@ -133,22 +133,22 @@ int(%i)
 
 -- empty array --
 
-Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: mktime() expects parameter 6 to be integer, array given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -171,42 +171,42 @@ int(%i)
 
 -- empty string DQ --
 
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: mktime() expects parameter 6 to be integer, string given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: mktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: mktime() expects parameter 6 to be integer, object given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -217,7 +217,7 @@ int(%i)
 
 -- resource --
 
-Warning: mktime() expects parameter 6 to be integer, resource given in %s on line %d
+Warning: mktime() expects parameter 6 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===
 

diff --git a/ext/date/tests/strftime_variation2.phpt b/ext/date/tests/strftime_variation2.phpt
index 599f5f41a5414323eac43cdf436afa1d96114e3b..ac76225eb321e95ee6b9b8fddd0d90a39a7014d2 100644 (file)
--- a/ext/date/tests/strftime_variation2.phpt
+++ b/ext/date/tests/strftime_variation2.phpt
@@ -107,22 +107,22 @@ string(20) "Jan 01 1970 05:30:00"
 
 --empty array--
 
-Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --int indexed array--
 
-Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --associative array--
 
-Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --nested arrays--
 
-Warning: strftime() expects parameter 2 to be integer, array given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 --uppercase NULL--
@@ -145,42 +145,42 @@ string(20) "Jan 01 1970 05:30:00"
 
 --empty string DQ--
 
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --empty string SQ--
 
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string DQ--
 
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --string SQ--
 
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --mixed case string--
 
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --heredoc--
 
-Warning: strftime() expects parameter 2 to be integer, string given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 --instance of classWithToString--
 
-Warning: strftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --instance of classWithoutToString--
 
-Warning: strftime() expects parameter 2 to be integer, object given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 --undefined var--

diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt
index 94034b1749f157c716dec1f81bd15d67d463b7f8..58b266c20f73af28bac228f76c40aede24bfbadb 100644 (file)
--- a/ext/date/tests/strftime_variation23.phpt
+++ b/ext/date/tests/strftime_variation23.phpt
@@ -32,11 +32,11 @@ var_dump( strftime($format, $timestamp) );
 
 -- Testing strftime() function with float 12.3456789000e10 to timestamp --
 
-Warning: strftime() expects parameter 2 to be integer, float given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 -- Testing strftime() function with float -12.3456789000e10 to timestamp --
 
-Warning: strftime() expects parameter 2 to be integer, float given in %s on line %d
+Warning: strftime() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file

diff --git a/ext/date/tests/timezone_name_from_abbr_variation2.phpt b/ext/date/tests/timezone_name_from_abbr_variation2.phpt
index 5b4b671b8132ed9f406b6a23889a28b9162418aa..a3c9a1e1e01c81fd4e0c8041520257ca9c7d88f9 100644 (file)
--- a/ext/date/tests/timezone_name_from_abbr_variation2.phpt
+++ b/ext/date/tests/timezone_name_from_abbr_variation2.phpt
@@ -130,22 +130,22 @@ string(3) "UTC"
 
 -- empty array --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -168,42 +168,42 @@ string(3) "UTC"
 
 -- empty string DQ --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -214,6 +214,6 @@ string(3) "UTC"
 
 -- resource --
 
-Warning: timezone_name_from_abbr() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/timezone_name_from_abbr_variation3.phpt b/ext/date/tests/timezone_name_from_abbr_variation3.phpt
index 803afbaf7527ff6fabb2d6359203375c54adb368..94c38a9e82e66642d61faf7a1a7a744ec2dd1e17 100644 (file)
--- a/ext/date/tests/timezone_name_from_abbr_variation3.phpt
+++ b/ext/date/tests/timezone_name_from_abbr_variation3.phpt
@@ -130,22 +130,22 @@ string(3) "UTC"
 
 -- empty array --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- int indexed array --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- associative array --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- nested arrays --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 
 -- uppercase NULL --
@@ -168,42 +168,42 @@ string(3) "UTC"
 
 -- empty string DQ --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- empty string SQ --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string DQ --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- string SQ --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- mixed case string --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- heredoc --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- instance of classWithToString --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- instance of classWithoutToString --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- undefined var --
@@ -214,6 +214,6 @@ string(3) "UTC"
 
 -- resource --
 
-Warning: timezone_name_from_abbr() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: timezone_name_from_abbr() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/date/tests/timezone_name_get_error.phpt b/ext/date/tests/timezone_name_get_error.phpt
index 3c33e33f4d63743145ecddd79b4cd16ca00ee4f6..185b5640521810e83daca13eb3107b9594d233ac 100644 (file)
--- a/ext/date/tests/timezone_name_get_error.phpt
+++ b/ext/date/tests/timezone_name_get_error.phpt
@@ -48,7 +48,7 @@ bool(false)
 Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
 bool(false)
 
-Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d

diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt
index 7ce1ade30ad82f06f5524b2f85316bdbab5eb1f1..2aff20ac2d6efa9adb7bbf17509c442d75632847 100644 (file)
--- a/ext/date/tests/timezone_offset_get_error.phpt
+++ b/ext/date/tests/timezone_offset_get_error.phpt
@@ -110,7 +110,7 @@ bool(false)
 -- Testing timezone_offset_get() function with an invalid values for $object argument --
 string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of stdClass given"
 
-string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given"
+string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given"
 
 string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, null given"
 
@@ -118,7 +118,7 @@ string(%d) "Argument 1 passed to timezone_offset_get() must be an instance of Da
 -- Testing timezone_offset_get() function with an invalid values for $datetime argument --
 string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, instance of stdClass given"
 
-string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given"
+string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given"
 
 string(%d) "Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, null given"
 

diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt
index edeeb7fea75d7adeb3e67060293972f798a57059..9657fc7c6d0280359fd93df6e84357a8bd9e0852 100644 (file)
--- a/ext/date/tests/timezone_offset_get_variation1.phpt
+++ b/ext/date/tests/timezone_offset_get_variation1.phpt
@@ -123,16 +123,16 @@ fclose( $file_handle );
 *** Testing timezone_offset_get() : usage variation -  unexpected values to first argument $object***
 
 -- int 0 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
 
 -- int 1 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
 
 -- int 12345 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
 
 -- int -12345 --
-Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, integer given
+Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, int given
 
 -- float 10.5 --
 Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, float given

diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt
index 2d007d5e705e935feae024d41c48ff1c1d064eef..76cc165658e9c149c280903a81e635b55b8052d8 100644 (file)
--- a/ext/date/tests/timezone_offset_get_variation2.phpt
+++ b/ext/date/tests/timezone_offset_get_variation2.phpt
@@ -123,16 +123,16 @@ fclose( $file_handle );
 *** Testing timezone_offset_get() : usage variation -  unexpected values to second argument $datetime***
 
 -- int 0 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
 
 -- int 1 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
 
 -- int 12345 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
 
 -- int -12345 --
-Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, integer given
+Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, int given
 
 -- float 10.5 --
 Argument 2 passed to timezone_offset_get() must implement interface DateTimeInterface, float given

diff --git a/ext/date/tests/timezone_transitions_get_error.phpt b/ext/date/tests/timezone_transitions_get_error.phpt
index 142cfda2ff19265454694554fbbfad8cda264c38..159c883efbdbcece8b87ed9b365f02a4383202d9 100644 (file)
--- a/ext/date/tests/timezone_transitions_get_error.phpt
+++ b/ext/date/tests/timezone_transitions_get_error.phpt
@@ -50,7 +50,7 @@ bool(false)
 Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
 bool(false)
 
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d

diff --git a/ext/date/tests/timezone_transitions_get_variation1.phpt b/ext/date/tests/timezone_transitions_get_variation1.phpt
index 9ebe2861e6070407ce3e2d6bdca414e682e6575f..8ea7ab1bc399cb0e654246dba97a184e7ea6080f 100644 (file)
--- a/ext/date/tests/timezone_transitions_get_variation1.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation1.phpt
@@ -110,22 +110,22 @@ fclose( $file_handle );
 
 -- int 0 --
 
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 1 --
 
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int 12345 --
 
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- int -12345 --
 
-Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, int given in %s on line %d
 bool(false)
 
 -- float 10.5 --

diff --git a/ext/date/tests/timezone_transitions_get_variation2.phpt b/ext/date/tests/timezone_transitions_get_variation2.phpt
index 07a394e9f956bfc0342edd55f1fc53d93d3148ee..5c7951d502ad013018529ed6adfb5edb7e5948ee 100644 (file)
--- a/ext/date/tests/timezone_transitions_get_variation2.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation2.phpt
@@ -143,7 +143,7 @@ int(8)
 
 -- empty array --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -151,7 +151,7 @@ int(1)
 
 -- int indexed array --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -159,7 +159,7 @@ int(1)
 
 -- associative array --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -167,7 +167,7 @@ int(1)
 
 -- nested arrays --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -199,7 +199,7 @@ int(8)
 
 -- empty string DQ --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -207,7 +207,7 @@ int(1)
 
 -- empty string SQ --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -215,7 +215,7 @@ int(1)
 
 -- string DQ --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -223,7 +223,7 @@ int(1)
 
 -- string SQ --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -231,7 +231,7 @@ int(1)
 
 -- mixed case string --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -239,7 +239,7 @@ int(1)
 
 -- heredoc --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -247,7 +247,7 @@ int(1)
 
 -- instance of classWithToString --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, object given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -255,7 +255,7 @@ int(1)
 
 -- instance of classWithoutToString --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, object given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -271,7 +271,7 @@ int(8)
 
 -- resource --
 
-Warning: timezone_transitions_get() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 2 to be int, resource given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d

diff --git a/ext/date/tests/timezone_transitions_get_variation3.phpt b/ext/date/tests/timezone_transitions_get_variation3.phpt
index 0d2889c3592c81e22077057c48654df878ac2e9a..975e77ff3477f8591259aecbef62dda24fec8449 100644 (file)
--- a/ext/date/tests/timezone_transitions_get_variation3.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation3.phpt
@@ -143,7 +143,7 @@ int(1)
 
 -- empty array --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -151,7 +151,7 @@ int(1)
 
 -- int indexed array --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -159,7 +159,7 @@ int(1)
 
 -- associative array --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -167,7 +167,7 @@ int(1)
 
 -- nested arrays --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, array given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -199,7 +199,7 @@ int(1)
 
 -- empty string DQ --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -207,7 +207,7 @@ int(1)
 
 -- empty string SQ --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -215,7 +215,7 @@ int(1)
 
 -- string DQ --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -223,7 +223,7 @@ int(1)
 
 -- string SQ --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -231,7 +231,7 @@ int(1)
 
 -- mixed case string --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -239,7 +239,7 @@ int(1)
 
 -- heredoc --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, string given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -247,7 +247,7 @@ int(1)
 
 -- instance of classWithToString --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, object given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -255,7 +255,7 @@ int(1)
 
 -- instance of classWithoutToString --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, object given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
@@ -271,7 +271,7 @@ int(1)
 
 -- resource --
 
-Warning: timezone_transitions_get() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: timezone_transitions_get() expects parameter 3 to be int, resource given in %s on line %d
 string(7) "boolean"
 
 Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d

diff --git a/ext/exif/tests/exif_tagname_variation1-64bit.phpt b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
index 22298af2ae55c527a120ecbce289c2885ec9ac71..4e61c25bb964ffac7ea7c41630f891ee65047250 100644 (file)
--- a/ext/exif/tests/exif_tagname_variation1-64bit.phpt
+++ b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
@@ -126,23 +126,23 @@ bool(false)
 bool(false)
 -- Iteration 10 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 15 --
 bool(false)
@@ -154,11 +154,11 @@ bool(false)
 bool(false)
 -- Iteration 19 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 bool(false)
@@ -166,11 +166,11 @@ bool(false)
 bool(false)
 -- Iteration 23 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, object given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, object given in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 -- Iteration 25 --
 bool(false)

diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index 44d2568f4961c446a7969babb5626edd87176eee..207b200aac24a0f0d1c6273beb7ed8981981a880 100644 (file)
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -120,23 +120,23 @@ bool(false)
 bool(false)
 -- Iteration 8 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, array given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 13 --
 bool(false)
@@ -148,11 +148,11 @@ bool(false)
 bool(false)
 -- Iteration 17 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, string given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 19 --
 bool(false)
@@ -160,11 +160,11 @@ bool(false)
 bool(false)
 -- Iteration 21 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, object given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, object given in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: exif_tagname() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: exif_tagname() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 -- Iteration 23 --
 bool(false)

diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
index 511df600c144380eb25d31cde08976aae5919803..c4883981ce75d86e6b41492580308ae55ab568dc 100644 (file)
--- a/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -38,7 +38,7 @@ Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or direct
 Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line 12
 bool(false)
 
-Warning: finfo_open() expects parameter 1 to be integer, array given in %sfinfo_open_error.php on line 13
+Warning: finfo_open() expects parameter 1 to be int, array given in %sfinfo_open_error.php on line 13
 bool(false)
 
 Warning: finfo_open() expects at most 2 parameters, 3 given in %sfinfo_open_error.php on line 14
@@ -47,7 +47,7 @@ bool(false)
 Notice: finfo_open(): Warning: using regular magic file `%smagic' in %sfinfo_open_error.php on line 15
 resource(6) of type (file_info)
 
-Warning: finfo_open() expects parameter 1 to be integer, string given in %sfinfo_open_error.php on line 16
+Warning: finfo_open() expects parameter 1 to be int, string given in %sfinfo_open_error.php on line 16
 bool(false)
-finfo::finfo() expects parameter 1 to be integer, string given
+finfo::finfo() expects parameter 1 to be int, string given
 ===DONE===

diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt
index 0214533a109ed62935ab494aff1e5cca29f2f72b..67c0b89f5f39cb2aea8c2e3df92112cce5b21e11 100644 (file)
--- a/ext/filter/tests/007.phpt
+++ b/ext/filter/tests/007.phpt
@@ -50,15 +50,15 @@ Warning: filter_has_var() expects parameter 2 to be string, array given in %s007
 bool(false)
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be integer, string given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, string given in %s007.php on line %d
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be integer, array given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, array given in %s007.php on line %d
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be integer, array given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, array given in %s007.php on line %d
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be integer, string given in %s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be int, string given in %s007.php on line %d
 bool(false)
 Done

diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt
index 40dd27bc528f87fc6e3c9b617fad81140b2f6bd0..38b436f58dcb793fe59bc97dc314f3c9e9f90274 100644 (file)
--- a/ext/filter/tests/010.phpt
+++ b/ext/filter/tests/010.phpt
@@ -54,7 +54,7 @@ array(7) {
   }
 }
 
-Warning: filter_var() expects parameter 2 to be integer, array given in %s on line %d
+Warning: filter_var() expects parameter 2 to be int, array given in %s on line %d
 NULL
 string(1) "1"
 string(1) "1"

diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt
index 2598fd537505aa899056a649e76e5ab56c5a9f64..b5075d182128c4063de15082accec38531959cf1 100644 (file)
--- a/ext/filter/tests/011.phpt
+++ b/ext/filter/tests/011.phpt
@@ -40,10 +40,10 @@ float(12345.7)
 string(29) "<p>string</p>"
 bool(false)
 
-Warning: filter_var() expects parameter 2 to be integer, string given in %s011.php on line %d
+Warning: filter_var() expects parameter 2 to be int, string given in %s011.php on line %d
 NULL
 
-Warning: filter_input() expects parameter 3 to be integer, string given in %s011.php on line %d
+Warning: filter_input() expects parameter 3 to be int, string given in %s011.php on line %d
 NULL
 
 Warning: filter_var() expects at most 3 parameters, 5 given in %s011.php on line %d

diff --git a/ext/filter/tests/040.phpt b/ext/filter/tests/040.phpt
index 03c5091ccb268cee51673bacd6d4e5d112b1597f..1d578a4f1375357c2bb2a97c7ce3790de8967e4e 100644 (file)
--- a/ext/filter/tests/040.phpt
+++ b/ext/filter/tests/040.phpt
@@ -40,6 +40,6 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be integer, string given in %s on line %d
+Warning: filter_has_var() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 Done

diff --git a/ext/ftp/tests/004.phpt b/ext/ftp/tests/004.phpt
index 21b8aabbeb889618c0eba052a001565188a7e651..3fcf272e3b1cc156efd9de22fce6fbc0226a57f8 100644 (file)
--- a/ext/ftp/tests/004.phpt
+++ b/ext/ftp/tests/004.phpt
@@ -37,7 +37,7 @@ var_dump(ftp_quit($ftp));
 bool(true)
 string(4) "UNIX"
 
-Warning: ftp_alloc() expects parameter 2 to be integer, array given in %s004.php on line 12
+Warning: ftp_alloc() expects parameter 2 to be int, array given in %s004.php on line 12
 bool(false)
 
 Warning: ftp_cdup() expects exactly 1 parameter, 2 given in %s004.php on line 13

diff --git a/ext/ftp/tests/ftp_ssl_connect_error.phpt b/ext/ftp/tests/ftp_ssl_connect_error.phpt
index 6deec03e5ed715fdc5e711431e9556d796733e68..f139696c7f219c9dbe968c5fe705823c6ee52c58 100644 (file)
--- a/ext/ftp/tests/ftp_ssl_connect_error.phpt
+++ b/ext/ftp/tests/ftp_ssl_connect_error.phpt
@@ -37,9 +37,9 @@ bool(false)
 
 Warning: ftp_ssl_connect() expects parameter 1 to be string, array given in %s on line %d
 
-Warning: ftp_ssl_connect() expects parameter 2 to be integer, array given in %s on line %d
+Warning: ftp_ssl_connect() expects parameter 2 to be int, array given in %s on line %d
 
-Warning: ftp_ssl_connect() expects parameter 3 to be integer, array given in %s on line %d
+Warning: ftp_ssl_connect() expects parameter 3 to be int, array given in %s on line %d
 
 -- Testing ftp_ssl_connect() function with more than expected no. of arguments --
 

diff --git a/ext/gd/tests/imagechar_error3.phpt b/ext/gd/tests/imagechar_error3.phpt
index 31b1c2386f72de02f56eacb3ef354740e8ca36ae..5fff2013bf1b0c98db7e6feca0bf51940a75c139 100644 (file)
--- a/ext/gd/tests/imagechar_error3.phpt
+++ b/ext/gd/tests/imagechar_error3.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 'string', 5, 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagechar_error4.phpt b/ext/gd/tests/imagechar_error4.phpt
index 263da50e607228fb5ed075f813bc7d9d96943d2e..9220584ae8a5d7a60d8f68cea703bac45438b1de 100644 (file)
--- a/ext/gd/tests/imagechar_error4.phpt
+++ b/ext/gd/tests/imagechar_error4.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 'string', 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 3 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagechar_error5.phpt b/ext/gd/tests/imagechar_error5.phpt
index 8d47dc377bc5b35b4e57c382ca4b10cbc5da10f6..7ea0e72a8224a01ccd856f2afe0cd2bd88fd150a 100644 (file)
--- a/ext/gd/tests/imagechar_error5.phpt
+++ b/ext/gd/tests/imagechar_error5.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 5, 'string', 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 4 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagechar_error7.phpt b/ext/gd/tests/imagechar_error7.phpt
index 1d7819265c873ab7d050d8e4169d105efcf48edf..3d847f3410147c4b0f1b29b5fb4bc3230cfc0227 100644 (file)
--- a/ext/gd/tests/imagechar_error7.phpt
+++ b/ext/gd/tests/imagechar_error7.phpt
@@ -14,4 +14,4 @@ $result = imagechar($image, 1, 5, 5, 'C', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagechar() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagechar() expects parameter 6 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagecharup_error3.phpt b/ext/gd/tests/imagecharup_error3.phpt
index a44b766484c1e9c780e5e133800afb8e896c3f26..13f716b133c28e441123856e882e40f7ff7062db 100644 (file)
--- a/ext/gd/tests/imagecharup_error3.phpt
+++ b/ext/gd/tests/imagecharup_error3.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 'string', 5, 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagecharup_error4.phpt b/ext/gd/tests/imagecharup_error4.phpt
index f1824f1344c66ac06ad3c7b4099a467bbef3dffd..b403d0eec7a452fbcae9d9c5a7fcd66671973165 100644 (file)
--- a/ext/gd/tests/imagecharup_error4.phpt
+++ b/ext/gd/tests/imagecharup_error4.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 'string', 5, 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 3 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagecharup_error5.phpt b/ext/gd/tests/imagecharup_error5.phpt
index 73c2d075fecbbb3424036f8efe81e8121c61979a..a4a7c88100ea5295570e0f29c005013cbdcb1316 100644 (file)
--- a/ext/gd/tests/imagecharup_error5.phpt
+++ b/ext/gd/tests/imagecharup_error5.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 5, 'string', 'C', 1);
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 4 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagecharup_error7.phpt b/ext/gd/tests/imagecharup_error7.phpt
index fe1fe073da81ff271a666f9e1a6bc44ae77f6516..c10835daaec9b7e90205e130eed19fc8efc1ecca 100644 (file)
--- a/ext/gd/tests/imagecharup_error7.phpt
+++ b/ext/gd/tests/imagecharup_error7.phpt
@@ -14,4 +14,4 @@ $result = imagecharup($image, 1, 5, 5, 'C', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagecharup() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagecharup() expects parameter 6 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt
index 60d690bfbe3f822d0b4a43252e5bfd464934cf3f..1e628a7b55933be7c58cb5933313407ae8ee3ccd 100644 (file)
--- a/ext/gd/tests/imagecolorallocate_variation1.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation1.phpt
@@ -117,22 +117,22 @@ foreach($values as $key => $value) {
 
 -- int 0 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- int 1 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- int 12345 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- int -12345 --
 
-Warning: imagecolorallocate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imagecolorallocate() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- float 10.5 --

diff --git a/ext/gd/tests/imagecolorallocate_variation2.phpt b/ext/gd/tests/imagecolorallocate_variation2.phpt
index 7de60bc19f0660ad6f74a61bb5a25ad2ec7f327b..9f631af210def5fca2d1772eb1820453ae0b324e 100644 (file)
--- a/ext/gd/tests/imagecolorallocate_variation2.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation2.phpt
@@ -126,22 +126,22 @@ int(2570)
 
 --empty array--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 --int indexed array--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 --associative array--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 --nested arrays--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 --uppercase NULL--
@@ -164,42 +164,42 @@ int(2570)
 
 --empty string DQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --empty string SQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --string DQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --string SQ--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --mixed case string--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --heredoc--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --instance of classWithToString--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 --instance of classWithoutToString--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 --undefined var--
@@ -210,6 +210,6 @@ int(2570)
 
 --file resource--
 
-Warning: imagecolorallocate() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index 3fe1f50f82d498a5c2f98e3117e79d57f6dbec39..76bb4ba3600394cc1d94ac30ad1576f07fb112f5 100644 (file)
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -125,22 +125,22 @@ int(655370)
 
 --empty array--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 --int indexed array--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 --associative array--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 --nested arrays--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 --uppercase NULL--
@@ -163,42 +163,42 @@ int(655370)
 
 --empty string DQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 --empty string SQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 --string DQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 --string SQ--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 --mixed case string--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 --heredoc--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 --instance of classWithToString--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
 --instance of classWithoutToString--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
 --undefined var--
@@ -209,6 +209,6 @@ int(655370)
 
 --file resource--
 
-Warning: imagecolorallocate() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/gd/tests/imagecolorallocate_variation4.phpt b/ext/gd/tests/imagecolorallocate_variation4.phpt
index e4ef7c62a21236730463c586b81b2779a0cdc5d9..d1e1f4551345e5748347b4c09bbf11e84e3239c4 100644 (file)
--- a/ext/gd/tests/imagecolorallocate_variation4.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation4.phpt
@@ -125,22 +125,22 @@ int(657920)
 
 --empty array--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 --int indexed array--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 --associative array--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 --nested arrays--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 --uppercase NULL--
@@ -163,42 +163,42 @@ int(657920)
 
 --empty string DQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 --empty string SQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 --string DQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 --string SQ--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 --mixed case string--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 --heredoc--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, string given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 --instance of classWithToString--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, object given in %s on line %d
 NULL
 
 --instance of classWithoutToString--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, object given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, object given in %s on line %d
 NULL
 
 --undefined var--
@@ -209,6 +209,6 @@ int(657920)
 
 --file resource--
 
-Warning: imagecolorallocate() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: imagecolorallocate() expects parameter 4 to be int, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
index d0df2a7d6b491d9349bcdc325d6e008eb9b99292..f1e82b37799a4de9ce28f4c94201f9479c9e73d9 100644 (file)
--- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, array(), 255, 255, 50);
 imagecolorallocatealpha($img, tmpfile(), 255, 255, 50);
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 2 to be int, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 2 to be int, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 2 to be integer, resource given in %s on line %d
\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 2 to be int, resource given in %s on line %d
\ No newline at end of file

diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
index ab92960c207235c01e13a1847354dd32c199df94..51018f797da56a9f29f221f96fdf2960e8da9189 100644 (file)
--- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, array(), 255, 50);
 imagecolorallocatealpha($img, 255, tmpfile(), 255, 50);
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 3 to be int, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 3 to be int, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 3 to be integer, resource given in %s on line %d
\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 3 to be int, resource given in %s on line %d
\ No newline at end of file

diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
index 708e95e6801273f01eefaa9bfbcb2cf85ac4e151..4c517e5c37deacd56cc41f832c4fdb686cf736f0 100644 (file)
--- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, 255, array(), 50);
 imagecolorallocatealpha($img, 255, 255, tmpfile(), 50);
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 4 to be int, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 4 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 4 to be int, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 4 to be integer, resource given in %s on line %d
\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 4 to be int, resource given in %s on line %d
\ No newline at end of file

diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
index fd4341036582b555dad716d81345cc09e1f4bad1..f1fcc0df73470e0cef79e2983677b466abbeb2a1 100644 (file)
--- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
@@ -15,8 +15,8 @@ imagecolorallocatealpha($img, 255, 255, 255, array());
 imagecolorallocatealpha($img, 255, 255, 255, tmpfile());
 ?>
 --EXPECTF--
-Warning: imagecolorallocatealpha() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 5 to be int, %s given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 5 to be integer, array given in %s on line %d
+Warning: imagecolorallocatealpha() expects parameter 5 to be int, array given in %s on line %d
 
-Warning: imagecolorallocatealpha() expects parameter 5 to be integer, resource given in %s on line %d
\ No newline at end of file
+Warning: imagecolorallocatealpha() expects parameter 5 to be int, resource given in %s on line %d
\ No newline at end of file

diff --git a/ext/gd/tests/imagecolorclosesthwb.phpt b/ext/gd/tests/imagecolorclosesthwb.phpt
index 79df5a11eb0d7e6eb4c84cc5ed41d8f73a34abef..efe9c5035e1b61d4dc33d61afeac51192c680fc8 100644 (file)
--- a/ext/gd/tests/imagecolorclosesthwb.phpt
+++ b/ext/gd/tests/imagecolorclosesthwb.phpt
@@ -26,5 +26,5 @@ NULL
 Warning: imagecolorclosesthwb() expects parameter 1 to be resource, null given in %s on line %d
 NULL
 
-Warning: imagecolorclosesthwb() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagecolorclosesthwb() expects parameter 2 to be int, string given in %s on line %d
 NULL

diff --git a/ext/gd/tests/imagecreatetruecolor_error1.phpt b/ext/gd/tests/imagecreatetruecolor_error1.phpt
index 7ec75aa66f4509a916a6f43f601be3fd11c65383..6acce135126bb3bff780b70725f2bac09f088b79 100644 (file)
--- a/ext/gd/tests/imagecreatetruecolor_error1.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error1.phpt
@@ -13,6 +13,6 @@ $image = imagecreatetruecolor('s', 30);
 $image = imagecreatetruecolor(30, 's');
 ?>
 --EXPECTF--
-Warning: imagecreatetruecolor() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 1 to be int, %s given in %s on line %d
 
-Warning: imagecreatetruecolor() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index 62ff43a62f41eee2493de5d4ecf9f445c39ad5e2..7d96f8793fcf546cb59c8a7b6005d9157ef73669 100644 (file)
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -19,6 +19,6 @@ Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
 
 Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
 
-Warning: imagecreatetruecolor() expects parameter 1 to be integer, float given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 1 to be int, float given in %s on line %d
 
-Warning: imagecreatetruecolor() expects parameter 2 to be integer, float given in %s on line %d
+Warning: imagecreatetruecolor() expects parameter 2 to be int, float given in %s on line %d

diff --git a/ext/gd/tests/imageellipse_error2.phpt b/ext/gd/tests/imageellipse_error2.phpt
index d9062f653173be94831a7dbee79888f03c8eb419..3eb3681c0d1e1dd9fa6edfc9dbff3d8250e5e21b 100644 (file)
--- a/ext/gd/tests/imageellipse_error2.phpt
+++ b/ext/gd/tests/imageellipse_error2.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 'wrong param', 150, 300, 200, 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imageellipse_error3.phpt b/ext/gd/tests/imageellipse_error3.phpt
index fca825ff2f28c9d44488a179a078b6a95e5b58ba..692149dd168576e64cad327efd29552ef096c3be 100644 (file)
--- a/ext/gd/tests/imageellipse_error3.phpt
+++ b/ext/gd/tests/imageellipse_error3.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 'wrong param', 300, 200, 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 3 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imageellipse_error4.phpt b/ext/gd/tests/imageellipse_error4.phpt
index c8d6eb0fa066dce7c5bc3666ab8397aa7e20df4d..e93334ba54741c154b9106f960fdad7fd77498f4 100644 (file)
--- a/ext/gd/tests/imageellipse_error4.phpt
+++ b/ext/gd/tests/imageellipse_error4.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 'wrong param', 200, 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 4 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imageellipse_error5.phpt b/ext/gd/tests/imageellipse_error5.phpt
index e4d247322562747dfdc988204b44a081d338ace7..a86e25e4618a40af39fcbc3f8cfa5d25c63e6d43 100644 (file)
--- a/ext/gd/tests/imageellipse_error5.phpt
+++ b/ext/gd/tests/imageellipse_error5.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 300, 'wrong param', 16777215);
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 5 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imageellipse_error6.phpt b/ext/gd/tests/imageellipse_error6.phpt
index d3eebd140e191abc134ea1065da6f73dcdc6e6ab..74d1ac2f1e4619b0b69b17adece5354631bbb6da 100644 (file)
--- a/ext/gd/tests/imageellipse_error6.phpt
+++ b/ext/gd/tests/imageellipse_error6.phpt
@@ -18,4 +18,4 @@ imageellipse($image, 200, 150, 300, 200, 'wrong param');
 
 ?>
 --EXPECTF--
-Warning: imageellipse() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imageellipse() expects parameter 6 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagefilltoborder_error2.phpt b/ext/gd/tests/imagefilltoborder_error2.phpt
index 8ad1f4004eda532751b2a6588d5acbf48b8df0a9..2c70ce9f7c457726d8d54ff8215e01dd88aa24b0 100644 (file)
--- a/ext/gd/tests/imagefilltoborder_error2.phpt
+++ b/ext/gd/tests/imagefilltoborder_error2.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 'wrong param', 50, imagecolorallocate( $image, 0, 0,
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagefilltoborder_error3.phpt b/ext/gd/tests/imagefilltoborder_error3.phpt
index b0e089cfa05eef9e717b53c460de0323ae912612..74f01183a5fcff4762dbab0ce8446894c1fe484e 100644 (file)
--- a/ext/gd/tests/imagefilltoborder_error3.phpt
+++ b/ext/gd/tests/imagefilltoborder_error3.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 'wrong param', imagecolorallocate( $image, 0, 0,
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 3 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagefilltoborder_error4.phpt b/ext/gd/tests/imagefilltoborder_error4.phpt
index 94a6123a96777428bfd08e5b878c7627d55d83d7..3eaa719cd9a306f66759e30ce110fbfc77df1d40 100644 (file)
--- a/ext/gd/tests/imagefilltoborder_error4.phpt
+++ b/ext/gd/tests/imagefilltoborder_error4.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 50, 'wrong param', imagecolorallocate( $image, 25
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 4 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagefilltoborder_error5.phpt b/ext/gd/tests/imagefilltoborder_error5.phpt
index 6f4255ae3b5e7d370ee02f13a9a7f0c32e9b9cd4..b9eb07982d0049bee7382b31a8597b2528f15117 100644 (file)
--- a/ext/gd/tests/imagefilltoborder_error5.phpt
+++ b/ext/gd/tests/imagefilltoborder_error5.phpt
@@ -23,4 +23,4 @@ imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), 'wrong
 
 ?> 
 --EXPECTF--
-Warning: imagefilltoborder() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imagefilltoborder() expects parameter 5 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagefilter_error14.phpt b/ext/gd/tests/imagefilter_error14.phpt
index 50359a29d0f3dc1dc24af5e1241286a16b7dcf5a..6da2d8385ef69266b3a5294e898a86a35773b371 100644 (file)
--- a/ext/gd/tests/imagefilter_error14.phpt
+++ b/ext/gd/tests/imagefilter_error14.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_COLORIZE, 'wrong parameter', 255, 255));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
 bool(false)

diff --git a/ext/gd/tests/imagefilter_error16.phpt b/ext/gd/tests/imagefilter_error16.phpt
index c4ecc0b96af89b4328f320c6301c9a160d0a0439..d0351f9f7447f5b89dd148de7c96472f29f117c7 100644 (file)
--- a/ext/gd/tests/imagefilter_error16.phpt
+++ b/ext/gd/tests/imagefilter_error16.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_CONTRAST, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
 bool(false)

diff --git a/ext/gd/tests/imagefilter_error19.phpt b/ext/gd/tests/imagefilter_error19.phpt
index a225d6391f36f79547483e6c8fa848a61a1e8e8d..aa2599445713fd6a2eb6dc1c43123303933366c3 100644 (file)
--- a/ext/gd/tests/imagefilter_error19.phpt
+++ b/ext/gd/tests/imagefilter_error19.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_BRIGHTNESS, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
 bool(false)

diff --git a/ext/gd/tests/imagefilter_error2.phpt b/ext/gd/tests/imagefilter_error2.phpt
index a9fefd377ad472cfdf47e6eec9766ce9529f1a84..d4cca5c8d763b1004daea52ed5c9558f4eb5736e 100644 (file)
--- a/ext/gd/tests/imagefilter_error2.phpt
+++ b/ext/gd/tests/imagefilter_error2.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 2 to be int, string given in %s on line %d
 NULL

diff --git a/ext/gd/tests/imagefilter_error3.phpt b/ext/gd/tests/imagefilter_error3.phpt
index 413183d4bb77dc9205d4ffac70e67f9aa079d36d..844f12a82449c2c21846e272cac3d199b767274e 100644 (file)
--- a/ext/gd/tests/imagefilter_error3.phpt
+++ b/ext/gd/tests/imagefilter_error3.phpt
@@ -14,5 +14,5 @@ $image = imagecreatetruecolor(180, 30);
 var_dump(imagefilter($image, IMG_FILTER_PIXELATE, 'wrong parameter'));
 ?>
 --EXPECTF--
-Warning: imagefilter() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagefilter() expects parameter 3 to be int, string given in %s on line %d
 bool(false)

diff --git a/ext/gd/tests/imagefontheight_error1.phpt b/ext/gd/tests/imagefontheight_error1.phpt
index 34aa4a89034d604401d19434805fdbff1c7c0629..e324772c5fd00fca304002fd5b1af97031c1f082 100644 (file)
--- a/ext/gd/tests/imagefontheight_error1.phpt
+++ b/ext/gd/tests/imagefontheight_error1.phpt
@@ -12,4 +12,4 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 imagefontheight('string');
 ?>
 --EXPECTF--
-Warning: imagefontheight() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imagefontheight() expects parameter 1 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagefontwidth_error1.phpt b/ext/gd/tests/imagefontwidth_error1.phpt
index c1a1463b9ba7fd82cdd7e03659572c3b9862fa3d..46178a22f20299e663534e014af6abef74f1a138 100644 (file)
--- a/ext/gd/tests/imagefontwidth_error1.phpt
+++ b/ext/gd/tests/imagefontwidth_error1.phpt
@@ -12,4 +12,4 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 imagefontwidth('string');
 ?>
 --EXPECTF--
-Warning: imagefontwidth() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imagefontwidth() expects parameter 1 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt
index bd1d5aaf1f319eba74b80613ee28d35e0ab3ff95..83210f789f5f59026a34fdaea1310a601710e880 100644 (file)
--- a/ext/gd/tests/imagelayereffect_error2.phpt
+++ b/ext/gd/tests/imagelayereffect_error2.phpt
@@ -15,4 +15,4 @@ $image = imagecreatetruecolor(180, 30);
 $layer = imagelayereffect($image, 'IMG_EFFECT_REPLACE');
 ?>
 --EXPECTF--
-Warning: imagelayereffect() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagelayereffect() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagerectangle_error3.phpt b/ext/gd/tests/imagerectangle_error3.phpt
index 350ee1bf826f588d90541b0b4ffa2a1cc362021d..93a2acb3399e158b03329edca322c22e9a17a91b 100644 (file)
--- a/ext/gd/tests/imagerectangle_error3.phpt
+++ b/ext/gd/tests/imagerectangle_error3.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 'wrong param', 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagerectangle_error4.phpt b/ext/gd/tests/imagerectangle_error4.phpt
index 4c448dc0272ebacc089c472a7ca14e969c617611..b9253545fc1e0291c71ae7e0b8764f834d09e8e0 100644 (file)
--- a/ext/gd/tests/imagerectangle_error4.phpt
+++ b/ext/gd/tests/imagerectangle_error4.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 'wrong param', 50, 50, imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 3 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagerectangle_error5.phpt b/ext/gd/tests/imagerectangle_error5.phpt
index fa9486e3de947b19363f697829284add2caf592f..6be6b5301def8f91a399a1717ad025463aae7f80 100644 (file)
--- a/ext/gd/tests/imagerectangle_error5.phpt
+++ b/ext/gd/tests/imagerectangle_error5.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 0, 'wrong param', 50, imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 4 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagerectangle_error6.phpt b/ext/gd/tests/imagerectangle_error6.phpt
index 1523a9ec575e880022963707386282a4092120ba..2b89543c315642dee7b5ef321534d26b93cabb8b 100644 (file)
--- a/ext/gd/tests/imagerectangle_error6.phpt
+++ b/ext/gd/tests/imagerectangle_error6.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 0, 50, 'wrong param', imagecolorallocate($image, 255, 255, 255) );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 5 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagerectangle_error7.phpt b/ext/gd/tests/imagerectangle_error7.phpt
index ee6326feffb2cf098c1ede31b7b61e5e44a570d6..dfec56439f4fea714ef3f935fb3a4e584ee726d4 100644 (file)
--- a/ext/gd/tests/imagerectangle_error7.phpt
+++ b/ext/gd/tests/imagerectangle_error7.phpt
@@ -16,4 +16,4 @@ $image = imagecreatetruecolor( 100, 100 );
 imagerectangle( $image, 0, 0, 50, 50, 'wrong param' );
 ?> 
 --EXPECTF--
-Warning: imagerectangle() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagerectangle() expects parameter 6 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt
index 263e18bcc3c7f9783cfae930115d0c03562ef3c9..f829cbebc5b58b5761c4e7c93d08cf89fdfdf015 100644 (file)
--- a/ext/gd/tests/imagesetthickness_error2.phpt
+++ b/ext/gd/tests/imagesetthickness_error2.phpt
@@ -17,8 +17,8 @@ imagesetthickness($image, $image);
 
 ?>
 --EXPECTF--
-Warning: imagesetthickness() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imagesetthickness() expects parameter 2 to be int, string given in %s on line %d
 
-Warning: imagesetthickness() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imagesetthickness() expects parameter 2 to be int, array given in %s on line %d
 
-Warning: imagesetthickness() expects parameter 2 to be integer, resource given in %s on line %d
\ No newline at end of file
+Warning: imagesetthickness() expects parameter 2 to be int, resource given in %s on line %d
\ No newline at end of file

diff --git a/ext/gd/tests/imagestring_error3.phpt b/ext/gd/tests/imagestring_error3.phpt
index 464e46e8d207ae4932b358286e860ab0e1cc04c2..783e89e19ae0beed67d965b59b15dd54e93e512d 100644 (file)
--- a/ext/gd/tests/imagestring_error3.phpt
+++ b/ext/gd/tests/imagestring_error3.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 'string', 5, 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagestring_error4.phpt b/ext/gd/tests/imagestring_error4.phpt
index f782b7bda42169cee672e2b773489055bd5c6872..3db02d97231be6a80029f3123b3c35483ef2a192 100644 (file)
--- a/ext/gd/tests/imagestring_error4.phpt
+++ b/ext/gd/tests/imagestring_error4.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 'string', 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 3 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagestring_error5.phpt b/ext/gd/tests/imagestring_error5.phpt
index d774314797214eaa5a080228c5ec2d2022e7d845..05d674e6aaa7c9d38dca9cbedef4e4a46e05705b 100644 (file)
--- a/ext/gd/tests/imagestring_error5.phpt
+++ b/ext/gd/tests/imagestring_error5.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 'string', 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 4 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagestring_error7.phpt b/ext/gd/tests/imagestring_error7.phpt
index 2f44682a930eca63085def29a67e6c20a8d98e53..8d9e017e1b3ea87fef3952b25fa2df198264689b 100644 (file)
--- a/ext/gd/tests/imagestring_error7.phpt
+++ b/ext/gd/tests/imagestring_error7.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 5, 'String', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 6 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagestringup_error3.phpt b/ext/gd/tests/imagestringup_error3.phpt
index e4cfe98c75f582a7f5cf8b6244561b36c3508d41..d4367498299af5d3885e1afd1ca9df43920d0bfc 100644 (file)
--- a/ext/gd/tests/imagestringup_error3.phpt
+++ b/ext/gd/tests/imagestringup_error3.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 'string', 5, 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestringup() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: imagestringup() expects parameter 2 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagestringup_error4.phpt b/ext/gd/tests/imagestringup_error4.phpt
index 0b525cea261d40565f496c9dbfed43ee4584e748..7d8b2fd9ce7bda6d677afcc37ef216f8e2c0dbc7 100644 (file)
--- a/ext/gd/tests/imagestringup_error4.phpt
+++ b/ext/gd/tests/imagestringup_error4.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 1, 'string', 5, 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestringup() expects parameter 3 to be integer, %s given in %s on line %d
+Warning: imagestringup() expects parameter 3 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagestringup_error5.phpt b/ext/gd/tests/imagestringup_error5.phpt
index d774314797214eaa5a080228c5ec2d2022e7d845..05d674e6aaa7c9d38dca9cbedef4e4a46e05705b 100644 (file)
--- a/ext/gd/tests/imagestringup_error5.phpt
+++ b/ext/gd/tests/imagestringup_error5.phpt
@@ -14,4 +14,4 @@ $result = imagestring($image, 1, 5, 'string', 'String', 1);
 
 ?>
 --EXPECTF--
-Warning: imagestring() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: imagestring() expects parameter 4 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagestringup_error7.phpt b/ext/gd/tests/imagestringup_error7.phpt
index 460993656739b696b13dac4cb5098989073efd08..6afa7cb3a72bfd104315d58c245d0a844115def6 100644 (file)
--- a/ext/gd/tests/imagestringup_error7.phpt
+++ b/ext/gd/tests/imagestringup_error7.phpt
@@ -14,4 +14,4 @@ $result = imagestringup($image, 1, 5, 5, 'String', 'font');
 
 ?>
 --EXPECTF--
-Warning: imagestringup() expects parameter 6 to be integer, %s given in %s on line %d
+Warning: imagestringup() expects parameter 6 to be int, %s given in %s on line %d

diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index 46e3f487e0b38ec5be40ec2d87140b0f8dbc8bed..41d59782744520b3cfab2514c1d72aa2c2d7ac94 100644 (file)
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -19,10 +19,10 @@ imagetruecolortopalette($image, true, null);
 
 ?>
 --EXPECTF--
-Warning: imagetruecolortopalette() expects parameter 3 to be integer, string given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be int, string given in %s on line %d
 
-Warning: imagetruecolortopalette() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be int, resource given in %s on line %d
 
-Warning: imagetruecolortopalette() expects parameter 3 to be integer, array given in %s on line %d
+Warning: imagetruecolortopalette() expects parameter 3 to be int, array given in %s on line %d
 
 Warning: imagetruecolortopalette(): Number of colors has to be greater than zero and no more than %d in %s on line %d

diff --git a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
index f73e133026716d75d760531db545c250c950103c..dfff6a6daccdbe6b9af1705da156f339b66a911a 100644 (file)
--- a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
@@ -21,7 +21,7 @@ Warning: ngettext() expects parameter 1 to be string, array given in %s on line
 
 Warning: ngettext() expects parameter 2 to be string, array given in %s on line 3
 
-Warning: ngettext() expects parameter 3 to be integer, array given in %s on line 4
+Warning: ngettext() expects parameter 3 to be int, array given in %s on line 4
 
 Warning: ngettext() expects exactly 3 parameters, 0 given in %s on line 5
 

diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt
index 6140b0cebf0084c1c7d352c7e3537a7bb85db606..b1b7b7d57e4f686ed4b69d9cf695da6ce600ac39 100644 (file)
--- a/ext/gmp/tests/gmp_pow.phpt
+++ b/ext/gmp/tests/gmp_pow.phpt
@@ -57,10 +57,10 @@ NULL
 Warning: gmp_pow() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: gmp_pow() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmp_pow() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gmp_pow() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmp_pow() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d

diff --git a/ext/gmp/tests/gmp_random.phpt b/ext/gmp/tests/gmp_random.phpt
index da4ca5c7bd135fa2e44f3ae06ce815b799d2d24b..5533224b2cec9852f3d9f11dec4df8dbeffaac5c 100644 (file)
--- a/ext/gmp/tests/gmp_random.phpt
+++ b/ext/gmp/tests/gmp_random.phpt
@@ -40,7 +40,7 @@ string(%d) "%d"
 
 Deprecated: Function gmp_random() is deprecated in %s on line %d
 
-Warning: gmp_random() expects parameter 1 to be integer, array given in %s on line %d
+Warning: gmp_random() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 Deprecated: Function gmp_random() is deprecated in %s on line %d
@@ -50,11 +50,11 @@ NULL
 
 Deprecated: Function gmp_random() is deprecated in %s on line %d
 
-Warning: gmp_random() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Deprecated: Function gmp_random() is deprecated in %s on line %d
 
-Warning: gmp_random() expects parameter 1 to be integer, string given in %s on line %d
+Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d
 NULL
 Done

diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt
index df3e596a1927ca05ca0158e0fa8581a54ee5ab44..4df78bdf7a7c83c972a67b6a05bb11a928ce498b 100644 (file)
--- a/ext/gmp/tests/gmp_strval.phpt
+++ b/ext/gmp/tests/gmp_strval.phpt
@@ -40,13 +40,13 @@ NULL
 Warning: gmp_strval(): Unable to convert variable to GMP - string is not an integer in %s on line %d
 bool(false)
 
-Warning: gmp_strval() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Warning: gmp_strval(): Bad base for conversion: -1 (should be between 2 and %d or -2 and -%d) in %s on line %d
 bool(false)
 
-Warning: gmp_strval() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d
@@ -68,10 +68,10 @@ Warning: gmp_strval(): Bad base for conversion: 100000 (should be between 2 and
 bool(false)
 string(8) "-3373333"
 
-Warning: gmp_strval() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gmp_strval() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gmp_strval() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d

diff --git a/ext/hash/tests/hash_equals.phpt b/ext/hash/tests/hash_equals.phpt
index 25304f6b0ab7951db4d32a8098c2e2d1c60635b1..8fdf22967e77857767d8fe32222d854f82c93b96 100644 (file)
--- a/ext/hash/tests/hash_equals.phpt
+++ b/ext/hash/tests/hash_equals.phpt
@@ -27,13 +27,13 @@ bool(false)
 bool(false)
 bool(true)
 
-Warning: hash_equals(): Expected known_string to be a string, integer given in %s on line %d
+Warning: hash_equals(): Expected known_string to be a string, int given in %s on line %d
 bool(false)
 
-Warning: hash_equals(): Expected user_string to be a string, integer given in %s on line %d
+Warning: hash_equals(): Expected user_string to be a string, int given in %s on line %d
 bool(false)
 
-Warning: hash_equals(): Expected known_string to be a string, integer given in %s on line %d
+Warning: hash_equals(): Expected known_string to be a string, int given in %s on line %d
 bool(false)
 
 Warning: hash_equals(): Expected known_string to be a string, null given in %s on line %d

diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
index f89658a47dd0af9dbd918b73710cbb00e24c5775..4e547c131f9ac1f2d592e895131c697e1948ae4a 100644 (file)
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
@@ -236,7 +236,7 @@ array(5) {
 
 -- Iteration 7 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, float given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 -- Iteration 8 --
@@ -393,32 +393,32 @@ array(5) {
 
 -- Iteration 16 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 17 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 18 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 19 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 20 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 21 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, object given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- Iteration 22 --
@@ -461,6 +461,6 @@ array(5) {
 
 -- Iteration 24 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 Done

diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
index 4ee232e835c51b21d5f7bd3097f089d2e55b742a..e17525e0fe53a3ab56c6e814e8d18f4366a9e8d6 100644 (file)
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
@@ -239,7 +239,7 @@ array(5) {
 
 -- Iteration 7 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, float given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 -- Iteration 8 --
@@ -396,32 +396,32 @@ array(5) {
 
 -- Iteration 16 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 17 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 18 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 19 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 20 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 21 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, object given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 
 -- Iteration 22 --
@@ -464,6 +464,6 @@ array(5) {
 
 -- Iteration 24 --
 
-Warning: iconv_mime_decode_headers() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: iconv_mime_decode_headers() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 Done

diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
index f4508e986039eda92bdf72978025321ed5fb4ced..c4e3c4d400cb45295829c1a7c4845d7aaa50cf36 100644 (file)
--- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
@@ -128,7 +128,7 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67"
 
 -- Iteration 7 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, float given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, float given in %s on line %d
 string(0) ""
 
 -- Iteration 8 --
@@ -157,32 +157,32 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67"
 
 -- Iteration 16 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
 string(0) ""
 
 -- Iteration 17 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
 string(0) ""
 
 -- Iteration 18 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
 string(0) ""
 
 -- Iteration 19 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
 string(0) ""
 
 -- Iteration 20 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, string given in %s on line %d
 string(0) ""
 
 -- Iteration 21 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, object given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, object given in %s on line %d
 string(0) ""
 
 -- Iteration 22 --
@@ -193,6 +193,6 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67"
 
 -- Iteration 24 --
 
-Warning: iconv_mime_decode() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: iconv_mime_decode() expects parameter 2 to be int, resource given in %s on line %d
 string(0) ""
 Done

diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt
index ea889a07bd0c8a6d66a2f43ee87afb849b12ac0c..3983da6f84ff74e8fcd9d0cc3996091167e5cc25 100644 (file)
--- a/ext/iconv/tests/iconv_strpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3.phpt
@@ -139,7 +139,7 @@ bool(false)
 --
 float(123456789000)
 
-Warning: iconv_strpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 --
 float(1.23456789E-9)
@@ -168,33 +168,33 @@ int(8)
 --
 string(0) ""
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(0) ""
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(6) "string"
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(6) "string"
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(11) "hello world"
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 object(classA)#%d (%d) {
 }
 
-Warning: iconv_strpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 --
 NULL
@@ -205,6 +205,6 @@ int(8)
 --
 resource(%d) of type (stream)
 
-Warning: iconv_strpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 Done

diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
index c4e3e141a11e1a029a6fed27cc18079b9c3e5352..d2dd8a7495ec4abeab134a5c701c197fc8524e13 100644 (file)
--- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
@@ -166,33 +166,33 @@ int(8)
 --
 string(0) ""
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(0) ""
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(6) "string"
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(6) "string"
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 string(11) "hello world"
 
-Warning: iconv_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 --
 object(classA)#%d (%d) {
 }
 
-Warning: iconv_strpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 --
 NULL
@@ -203,6 +203,6 @@ int(8)
 --
 resource(%d) of type (stream)
 
-Warning: iconv_strpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: iconv_strpos() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 Done

diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt
index 4de03ddc523342c1b39a8dad60aede99465b4425..688d310764424011c6a50deac93f78bd85887bcb 100644 (file)
--- a/ext/imap/tests/imap_close_variation1.phpt
+++ b/ext/imap/tests/imap_close_variation1.phpt
@@ -94,22 +94,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 2 --
 
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 3 --
 
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 4 --
 
-Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+Warning: imap_close() expects parameter 1 to be resource, int given in %simap_close_variation1.php on line 80
 NULL
 
 -- Iteration 5 --

diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt
index f1d36d0abe8bedc5936a2e1bb26b60129bd8666e..febf063ad41142366b2c591ec50cd59776364f58 100644 (file)
--- a/ext/imap/tests/imap_close_variation2.phpt
+++ b/ext/imap/tests/imap_close_variation2.phpt
@@ -189,19 +189,19 @@ CL_EXPUNGE was not set, 3 msgs in mailbox
 
 -- Iteration 16 --
 
-Warning: imap_close() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_close() expects parameter 2 to be int, string given in %s on line %d
 NULL
 CL_EXPUNGE was not set, 3 msgs in mailbox
 
 -- Iteration 17 --
 
-Warning: imap_close() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_close() expects parameter 2 to be int, string given in %s on line %d
 NULL
 CL_EXPUNGE was not set, 3 msgs in mailbox
 
 -- Iteration 18 --
 
-Warning: imap_close() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_close() expects parameter 2 to be int, array given in %s on line %d
 NULL
 CL_EXPUNGE was not set, 3 msgs in mailbox
 

diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt
index 437cdcfa8afd79257eb1971a06466960aeedd247..2919219df8e82d494e6c7bafac687ce4519c41f9 100644 (file)
--- a/ext/imap/tests/imap_fetch_overview_variation1.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt
@@ -99,22 +99,22 @@ foreach($inputs as $input) {
 
 -- Testing with first argument value: int(0)
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Testing with first argument value: int(1)
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Testing with first argument value: int(12345)
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Testing with first argument value: int(-2345)
 
-Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetch_overview() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Testing with first argument value: float(10.5)

diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt
index ac9087c3a2b9d7b6c35777178939fe3484f5a849..f5f856a477883784a11dbf7be196cf59b7e8507a 100644 (file)
--- a/ext/imap/tests/imap_fetchbody_variation1.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation1.phpt
@@ -99,22 +99,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
 NULL
 
 -- Iteration 2 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
 NULL
 
 -- Iteration 3 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
 NULL
 
 -- Iteration 4 --
 
-Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+Warning: imap_fetchbody() expects parameter 1 to be resource, int given in %s on line 85
 NULL
 
 -- Iteration 5 --

diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt
index 8565e233c9be65a661f3d69ae9189e1a134cd1cb..7744ee8ec0a99fb0adbe3329f626e64ef9bbfee0 100644 (file)
--- a/ext/imap/tests/imap_fetchbody_variation2.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation2.phpt
@@ -176,37 +176,37 @@ bool(false)
 
 -- Iteration 16 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: imap_fetchbody() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imap_fetchbody() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 23 --

diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt
index 22d56b1bd3e628dae96444cddf12930d1c6a8f56..b247ae1ed5064d2486ba286ae2fa0ff9cdde4e94 100644 (file)
--- a/ext/imap/tests/imap_fetchheader_variation1.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation1.phpt
@@ -110,22 +110,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: imap_fetchheader() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt
index 64ed2be3190a3fbfcfede44020db8d76c2fb3dd5..9f3e64812dbd41a5b13da0dd3e062b70cdd43013 100644 (file)
--- a/ext/imap/tests/imap_fetchheader_variation2.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation2.phpt
@@ -209,52 +209,52 @@ bool(false)
 
 -- Iteration 16 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, string given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 24 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, array given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 25 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, object given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 26 --
@@ -269,6 +269,6 @@ bool(false)
 
 -- Iteration 28 --
 
-Warning: imap_fetchheader() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: imap_fetchheader() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt
index 9e616df60e212f3d0aafd31ffd8c1b1c6797ca29..181f042531a7a1ed9ad5aadf59fe09163a0aba76 100644 (file)
--- a/ext/imap/tests/imap_timeout_basic.phpt
+++ b/ext/imap/tests/imap_timeout_basic.phpt
@@ -44,7 +44,7 @@ Checking with no parameters
 Warning: imap_timeout() expects at least 1 parameter, 0 given in %s on line %d
 Checking with incorrect parameter type
 
-Warning: imap_timeout() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: imap_timeout() expects parameter 1 to be int, %s given in %s on line %d
 GET values:
 int(%d)
 int(%d)

diff --git a/ext/interbase/tests/ibase_drop_db_001.phpt b/ext/interbase/tests/ibase_drop_db_001.phpt
index 7526e13144e9a7fbfb224b4cf36354953de9184e..31db4034ba4405bffcc677d47a7070e2ddb2363c 100644 (file)
--- a/ext/interbase/tests/ibase_drop_db_001.phpt
+++ b/ext/interbase/tests/ibase_drop_db_001.phpt
@@ -24,7 +24,7 @@ var_dump(ibase_drop_db(NULL));
 resource(%d) of type (Firebird/InterBase link)
 bool(true)
 
-Warning: ibase_drop_db() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ibase_drop_db() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Warning: ibase_drop_db() expects parameter 1 to be resource, null given in %s on line %d

diff --git a/ext/interbase/tests/ibase_num_fields_001.phpt b/ext/interbase/tests/ibase_num_fields_001.phpt
index f1e0e4ab4f889a559ee948458e00286229554c87..3c4074e24421c23dab24e47e6f962502a0ef6f9e 100644 (file)
--- a/ext/interbase/tests/ibase_num_fields_001.phpt
+++ b/ext/interbase/tests/ibase_num_fields_001.phpt
@@ -18,7 +18,7 @@ var_dump(ibase_num_fields());
 --EXPECTF--
 int(2)
 
-Warning: ibase_num_fields() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ibase_num_fields() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Warning: ibase_num_fields() expects exactly 1 parameter, 0 given in %s on line %d

diff --git a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
index c3353d5c7ffbad44e7e78e25ee3f1888ad6afa52..ee53c068e9d8a20bc352f87a740f55c90b7d679f 100644 (file)
--- a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
+++ b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
@@ -25,7 +25,7 @@ Warning: IntlBreakIterator::following() expects exactly 1 parameter, 2 given in
 Warning: IntlBreakIterator::following(): breakiter_following: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlBreakIterator::following() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::following() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlBreakIterator::following(): breakiter_following: bad arguments in %s on line %d
 bool(false)
@@ -35,7 +35,7 @@ Warning: IntlBreakIterator::preceding() expects exactly 1 parameter, 2 given in
 Warning: IntlBreakIterator::preceding(): breakiter_preceding: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlBreakIterator::preceding() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::preceding() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlBreakIterator::preceding(): breakiter_preceding: bad arguments in %s on line %d
 bool(false)
@@ -45,7 +45,7 @@ Warning: IntlBreakIterator::isBoundary() expects exactly 1 parameter, 2 given in
 Warning: IntlBreakIterator::isBoundary(): breakiter_is_boundary: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlBreakIterator::isBoundary() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::isBoundary() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlBreakIterator::isBoundary(): breakiter_is_boundary: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/breakiter_getLocale_error.phpt b/ext/intl/tests/breakiter_getLocale_error.phpt
index 4ad7267837ac7a22657ee1f83ccac278b6635d03..9e37a31e612981e9f4211e427b5845c87a46de48 100644 (file)
--- a/ext/intl/tests/breakiter_getLocale_error.phpt
+++ b/ext/intl/tests/breakiter_getLocale_error.phpt
@@ -22,7 +22,7 @@ Warning: IntlBreakIterator::getLocale() expects exactly 1 parameter, 2 given in
 Warning: IntlBreakIterator::getLocale(): breakiter_get_locale: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlBreakIterator::getLocale() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::getLocale() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlBreakIterator::getLocale(): breakiter_get_locale: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
index 164b75c7e716dfa02cc8569802273fe53feeb24d..12a55e7e0fff31a981d5f2d7215f4201c5117496 100644 (file)
--- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
@@ -18,7 +18,7 @@ var_dump($it->getPartsIterator(-1));
 ==DONE==
 --EXPECTF--
 
-Warning: IntlBreakIterator::getPartsIterator() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::getPartsIterator() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlBreakIterator::getPartsIterator(): breakiter_get_parts_iterator: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/breakiter_next_error.phpt b/ext/intl/tests/breakiter_next_error.phpt
index a7aea4505f15601c04d3cd36a891a226c2cb9a90..0472ed4a44481d02f1402b33a5fbc2f28952384c 100644 (file)
--- a/ext/intl/tests/breakiter_next_error.phpt
+++ b/ext/intl/tests/breakiter_next_error.phpt
@@ -21,7 +21,7 @@ Warning: IntlBreakIterator::next() expects exactly 1 parameter, 2 given in %s on
 Warning: IntlBreakIterator::next(): breakiter_next: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlBreakIterator::next() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlBreakIterator::next() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlBreakIterator::next(): breakiter_next: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt
index fc0584c61a465799d6fb9d505ca0f60987ee9828..ad2cbc356ec8f0594300fede5f70e1ce766c61fe 100644 (file)
--- a/ext/intl/tests/calendar_add_error.phpt
+++ b/ext/intl/tests/calendar_add_error.phpt
@@ -38,7 +38,7 @@ Warning: intlcal_add() expects exactly 3 parameters, 4 given in %s on line %d
 Warning: intlcal_add(): intlcal_add: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_add(1, 2, 3)
 #1 {main}

diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt
index 7d57b93a3331a56c3a379b2e4efd13caf73a191c..279e3d816e3832431f5c444e476dd442e99c43d2 100644 (file)
--- a/ext/intl/tests/calendar_before_after_error.phpt
+++ b/ext/intl/tests/calendar_before_after_error.phpt
@@ -67,9 +67,9 @@ bool(false)
 error: 2, IntlCalendar::before() expects exactly 1 parameter, 0 given
 error: 2, IntlCalendar::before(): intlcal_before/after: bad arguments
 bool(false)
-error: 0, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, int given
 
-error: 0, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, int given
 
 error: 2, IntlCalendar::after() expects exactly 1 parameter, 2 given
 error: 2, IntlCalendar::after(): intlcal_before/after: bad arguments

diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt
index 7ff2ff08672c5295381d9272cf7cf71bd24b8d8c..bffa103eac7b5d14e5a8d171b96a5504644185fe 100644 (file)
--- a/ext/intl/tests/calendar_clear_error.phpt
+++ b/ext/intl/tests/calendar_clear_error.phpt
@@ -29,7 +29,7 @@ bool(false)
 Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_clear(1, 2)
 #1 {main}

diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index a9f164d38f84352c9282a22bd2e7ff927b16baf6..bdfe8c27cb39787647f8fd2f2e45242c9fd48ef6 100644 (file)
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -51,8 +51,8 @@ error: 2, IntlCalendar::equals(): intlcal_equals: bad arguments
 bool(false)
 error: 0, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, instance of stdClass given
 
-error: 0, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, int given
 
 error: 0, Argument 2 passed to intlcal_equals() must be an instance of IntlCalendar, array given
 
-error: 0, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, int given

diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt
index f9d88d447bbc212d6f18932c04442b5b0628670f..d09df4445222e0da5970eaad1fa6bc13c1b3f6d1 100644 (file)
--- a/ext/intl/tests/calendar_fieldDifference_error.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_field_difference() expects exactly 3 parameters, 4 given in %s
 Warning: intlcal_field_difference(): intlcal_field_difference: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_field_difference(1, 0, 1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
index 9d39666f060c10b93722b9b8cbd851f669160228..bb10a2642dd3135ae19858f775e94e7048528160 100644 (file)
--- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
@@ -36,12 +36,12 @@ Warning: IntlCalendar::getDayOfWeekType() expects exactly 1 parameter, 0 given i
 Warning: IntlCalendar::getDayOfWeekType(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
 bool(false)
 
-Warning: intlcal_get_day_of_week_type() expects parameter 2 to be integer, string given in %s on line %d
+Warning: intlcal_get_day_of_week_type() expects parameter 2 to be int, string given in %s on line %d
 
 Warning: intlcal_get_day_of_week_type(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_day_of_week_type(1, 1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
index 3bae010c4a198bf55c745cdeb1729f17d47ad39a..4d623f711f92dd64d21b4394ac437247c6645e79 100644 (file)
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_first_day_of_week() expects exactly 1 parameter, 2 given in
 Warning: intlcal_get_first_day_of_week(): intlcal_get_first_day_of_week: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_first_day_of_week(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt
index 47c62e3957599565e1599edf2645b5a912e70300..01ba795bdca8bec2e5e88c3be94f549306a625ad 100644 (file)
--- a/ext/intl/tests/calendar_getLocale_error.phpt
+++ b/ext/intl/tests/calendar_getLocale_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_get_locale() expects exactly 2 parameters, 1 given in %s on lin
 Warning: intlcal_get_locale(): intlcal_get_locale: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_locale(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
index 216363bec3ef66624272ba81ae38a130989bbae1..b2c7e5b46c5c9f71f2ff63c660d2ec86178580f1 100644 (file)
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_minimal_days_in_first_week() expects exactly 1 parameter, 2
 Warning: intlcal_get_minimal_days_in_first_week(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_minimal_days_in_first_week(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
index cb1ae4ea4b8c5bc060f392de506e46ede8df78f6..270f484a36327028f16e8602b5dc9e16647803b7 100644 (file)
--- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
@@ -44,7 +44,7 @@ Warning: intlcal_get_repeated_wall_time_option() expects exactly 1 parameter, 2
 Warning: intlcal_get_repeated_wall_time_option(): intlcal_get_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_skipped_wall_time_option(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt
index 15c1a50455aa75c570f4bf9d8ad1f121c04fc32f..5941b9ada0608166192f04a68471c4e6573bd532 100644 (file)
--- a/ext/intl/tests/calendar_getTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_time_zone() expects exactly 1 parameter, 2 given in %s on l
 Warning: intlcal_get_time_zone(): intlcal_get_time_zone: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_time_zone(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt
index 8c75ca5722301dd676bdb1968e93d53720951fe7..359b816997794c59e9d49ecce05529d7e3ebc16a 100644 (file)
--- a/ext/intl/tests/calendar_getTime_error.phpt
+++ b/ext/intl/tests/calendar_getTime_error.phpt
@@ -28,7 +28,7 @@ Warning: intlcal_get_time() expects exactly 1 parameter, 2 given in %s on line %
 Warning: intlcal_get_time(): intlcal_get_time: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_time(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt
index 95499a60acea966b0ea6aa8d53c9bb7320ea279e..b5f32d5768ac07b928cdccf9cdb782f4d6f609ed 100644 (file)
--- a/ext/intl/tests/calendar_getType_error.phpt
+++ b/ext/intl/tests/calendar_getType_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_type() expects exactly 1 parameter, 2 given in %s on line %
 Warning: intlcal_get_type(): intlcal_get_type: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_type(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
index f77a60fc784f029d9bd0d2945e8c4c0b7f0e64e9..10a31a339aec7191099a7bf63462b33e5227f2a8 100644 (file)
--- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
@@ -41,7 +41,7 @@ Warning: intlcal_get_weekend_transition() expects exactly 2 parameters, 1 given
 Warning: intlcal_get_weekend_transition(): intlcal_get_weekend_transition: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_weekend_transition(1, 1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
index 5d74a7d72d0a76d2fc79776bd6ce554454db19d2..999c050b9f53b16d4fe70d7ebb154834f5cb1449 100644 (file)
--- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
+++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
@@ -98,11 +98,11 @@ bool(false)
 
 Warning: intlcal_get_minimum(): intlcal_get_minimum: invalid field in %s on line %d
 bool(false)
-error: 0, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, int given
 
-error: 0, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, int given
 
-error: 0, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, int given
 
-error: 0, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, int given
 

diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
index 309e35562339f22b988b37ac7a1787f6a37ca170..989fb8b7cdcee8d75ccfefb7c49a83933ae1216c 100644 (file)
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
@@ -53,17 +53,17 @@ bool(false)
 Warning: IntlCalendar::getActualMinimum(): intlcal_get_actual_minimum: invalid field in %s on line %d
 bool(false)
 
-Warning: IntlCalendar::get() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlCalendar::get() expects parameter 1 to be int, string given in %s on line %d
 
 Warning: IntlCalendar::get(): intlcal_get: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlCalendar::getActualMaximum() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlCalendar::getActualMaximum() expects parameter 1 to be int, string given in %s on line %d
 
 Warning: IntlCalendar::getActualMaximum(): intlcal_get_actual_maximum: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlCalendar::getActualMinimum() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlCalendar::getActualMinimum() expects parameter 1 to be int, string given in %s on line %d
 
 Warning: IntlCalendar::getActualMinimum(): intlcal_get_actual_minimum: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index 88b03f8cdb53bb5f2186a7d34020c2cac0ece58c..f7026e07195ade5cf0c682668559c1bdc9b90925 100644 (file)
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -96,18 +96,18 @@ error: 2, intlcal_get_actual_maximum(): intlcal_get_actual_maximum: invalid fiel
 bool(false)
 error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: invalid field
 bool(false)
-error: 2, intlcal_get() expects parameter 2 to be integer, string given
+error: 2, intlcal_get() expects parameter 2 to be int, string given
 error: 2, intlcal_get(): intlcal_get: bad arguments
 bool(false)
-error: 2, intlcal_get_actual_maximum() expects parameter 2 to be integer, string given
+error: 2, intlcal_get_actual_maximum() expects parameter 2 to be int, string given
 error: 2, intlcal_get_actual_maximum(): intlcal_get_actual_maximum: bad arguments
 bool(false)
-error: 2, intlcal_get_actual_minimum() expects parameter 2 to be integer, string given
+error: 2, intlcal_get_actual_minimum() expects parameter 2 to be int, string given
 error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: bad arguments
 bool(false)
-error: 0, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, int given
 
-error: 0, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, int given
 
-error: 0, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, int given
 

diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt
index 1de9e2a830f90bd427d21aaffe16f0ee4b346f3d..6ed1f48c3cf64f1a4b7d3a36ddf5ea73c72738c8 100644 (file)
--- a/ext/intl/tests/calendar_inDaylightTime_error.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_in_daylight_time() expects exactly 1 parameter, 2 given in %s o
 Warning: intlcal_in_daylight_time(): intlcal_in_daylight_time: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_in_daylight_time(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index 35b8fc189a795fa898ef474d036066f3aa024f30..e7f8765fef6b0b90013613f1757243ff05dfba03 100644 (file)
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -50,16 +50,16 @@ try {
 }
 
 --EXPECT--
-error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, int given
 
 error: 2, IntlCalendar::isEquivalentTo() expects exactly 1 parameter, 2 given
 error: 2, IntlCalendar::isEquivalentTo(): intlcal_is_equivalent_to: bad arguments
 bool(false)
-error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, int given
 
 error: 2, intlcal_is_equivalent_to() expects exactly 2 parameters, 1 given
 error: 2, intlcal_is_equivalent_to(): intlcal_is_equivalent_to: bad arguments
 bool(false)
-error: 0, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
+error: 0, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, int given
 
-error: 0, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, int given

diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt
index 8cc8e969e7ce2cbe6b39c4e58914a22ffd5c3f4f..26fb95c173b8427857b9c6350e27a0b29726e63b 100644 (file)
--- a/ext/intl/tests/calendar_isLenient_error.phpt
+++ b/ext/intl/tests/calendar_isLenient_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_is_lenient() expects exactly 1 parameter, 2 given in %s on line
 Warning: intlcal_is_lenient(): intlcal_is_lenient: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_is_lenient(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt
index a8efa34218294d43dcc667457ab9ea5f87b5d6b6..53b244879fb65ec5b2e984cb58abdee28d327401 100644 (file)
--- a/ext/intl/tests/calendar_isSet_error.phpt
+++ b/ext/intl/tests/calendar_isSet_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_is_set() expects exactly 2 parameters, 1 given in %s on line %d
 Warning: intlcal_is_set(): intlcal_is_set: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_is_set(1, 2)
 #1 {main}

diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt
index 417bcb4c23690bb1bdef75acc071320d67f178bd..a4a7ff20602f9d07d8c465b80553ede4671a2e79 100644 (file)
--- a/ext/intl/tests/calendar_isWeekend_error.phpt
+++ b/ext/intl/tests/calendar_isWeekend_error.phpt
@@ -36,7 +36,7 @@ Warning: intlcal_is_weekend() expects parameter 2 to be float, string given in %
 Warning: intlcal_is_weekend(): intlcal_is_weekend: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_is_weekend(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
index 2b8c303cbb350e9566ff5352b4992e729bfd5b40..c476bfb62ad374c9cc43fb00f2688f830793b38d 100644 (file)
--- a/ext/intl/tests/calendar_roll_error.phpt
+++ b/ext/intl/tests/calendar_roll_error.phpt
@@ -34,7 +34,7 @@ bool(false)
 Warning: intlcal_roll(): intlcal_set: too many arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_roll(1, 2, 3)
 #1 {main}

diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
index 466690dbee2c69e93974e7423951aad395646740..82cc3f245d3c5f4f9dfd39025d477a2bd50d0bf5 100644 (file)
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
@@ -37,7 +37,7 @@ bool(false)
 Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_first_day_of_week(1, 2)
 #1 {main}

diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index 9619dc564c3d4c1b65460df456a0739cbf05df5f..dce763816924cd54f43319abe60eb0754905cd3f 100644 (file)
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -41,7 +41,7 @@ Warning: intlcal_set_lenient() expects parameter 2 to be boolean, array given in
 Warning: intlcal_set_lenient(): intlcal_set_lenient: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_lenient(1, false)
 #1 {main}

diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index ee88f6d63092e64570f7ff287b73cab08b1c0ea0..bf7584ade1f193c2b93941157308f90cd3703f93 100644 (file)
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -36,7 +36,7 @@ bool(false)
 Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2)
 #1 {main}

diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index 27f6215d52c2b14dcac38a8af28a5dbe37eea413..24362174f24c59990c907fc9d19c7791d0beef7f 100644 (file)
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -53,12 +53,12 @@ Warning: IntlCalendar::setRepeatedWallTimeOption() expects exactly 1 parameter,
 Warning: IntlCalendar::setRepeatedWallTimeOption(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlCalendar::setSkippedWallTimeOption() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlCalendar::setSkippedWallTimeOption() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlCalendar::setSkippedWallTimeOption(): intlcal_set_skipped_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlCalendar::setRepeatedWallTimeOption() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlCalendar::setRepeatedWallTimeOption() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlCalendar::setRepeatedWallTimeOption(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
@@ -79,7 +79,7 @@ Warning: intlcal_set_repeated_wall_time_option() expects exactly 2 parameters, 1
 Warning: intlcal_set_repeated_wall_time_option(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_repeated_wall_time_option(1, 1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt
index 4dee131ef7d355295aa32f9033c40e5515148688..9ed6238d3470b0b6d8f66a7bad0b501742cf0a0d 100644 (file)
--- a/ext/intl/tests/calendar_setTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error.phpt
@@ -51,4 +51,4 @@ bool(false)
 error: 2, intlcal_set_time_zone() expects exactly 2 parameters, 3 given
 error: 2, intlcal_set_time_zone(): intlcal_set_time_zone: bad arguments
 bool(false)
-error: 0, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, integer given
+error: 0, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, int given

diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt
index 00bb7eb91da1ac3d1c1ec78956f3aca7d137823f..3d45933ee77eab9ef7b9f1ba0279eb3dbb0a62c2 100644 (file)
--- a/ext/intl/tests/calendar_setTime_error.phpt
+++ b/ext/intl/tests/calendar_setTime_error.phpt
@@ -34,7 +34,7 @@ Warning: intlcal_set_time() expects exactly 2 parameters, 3 given in %s on line
 Warning: intlcal_set_time(): intlcal_set_time: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_time(1)
 #1 {main}

diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt
index c232b5640a98a1a4c96a1df8814e0aa7e6aaf58b..929f7427aaaa4f2ba4a93a053027ea828df19b8a 100644 (file)
--- a/ext/intl/tests/calendar_set_error.phpt
+++ b/ext/intl/tests/calendar_set_error.phpt
@@ -38,7 +38,7 @@ bool(false)
 Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set(1, 2, 3)
 #1 {main}

diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt
index 3d3ada22b952173412dc5a604d72f6e04fa2cec4..27a74674bd1f35d1cbc14aa5dac69ce44af4cca7 100644 (file)
--- a/ext/intl/tests/calendar_toDateTime_error.phpt
+++ b/ext/intl/tests/calendar_toDateTime_error.phpt
@@ -38,7 +38,7 @@ bool(false)
 Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d
 string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_to_date_time(3)
 #1 {main}

diff --git a/ext/intl/tests/dateformat_formatObject_error.phpt b/ext/intl/tests/dateformat_formatObject_error.phpt
index 221602d1359ebffd6b148b6879d925f58fb06395..24e21b50d8a43bde20ede74f024dcb113fcdcd9e 100644 (file)
--- a/ext/intl/tests/dateformat_formatObject_error.phpt
+++ b/ext/intl/tests/dateformat_formatObject_error.phpt
@@ -36,7 +36,7 @@ var_dump(IntlDateFormatter::formatObject($cal, "YYYY", array()));
 Warning: IntlDateFormatter::formatObject() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 
-Warning: IntlDateFormatter::formatObject() expects parameter 1 to be object, integer given in %s on line %d
+Warning: IntlDateFormatter::formatObject() expects parameter 1 to be object, int given in %s on line %d
 bool(false)
 
 Warning: IntlDateFormatter::formatObject(): datefmt_format_object: the passed object must be an instance of either IntlCalendar or DateTime in %s on line %d

diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt
index ccc87d9703ec1f2fd5e80c5538eb27565d082605..30dedbb3451c72000e7100d22cd451790140a6e0 100644 (file)
--- a/ext/intl/tests/gregoriancalendar___construct_error.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt
@@ -38,4 +38,4 @@ NULL
 
 Exception: IntlGregorianCalendar::__construct(): intlgregcal_create_instance: no variant with 4 arguments (excluding trailing NULLs) in %s on line %d
 
-Exception: IntlGregorianCalendar::__construct() expects parameter 6 to be integer, array given in %s on line %d
+Exception: IntlGregorianCalendar::__construct() expects parameter 6 to be int, array given in %s on line %d

diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
index dd37788dd1111ee18b88f0f37fcf15d71411d62f..76c5cbc65216e7be615881197c13265252005b2c 100644 (file)
--- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
@@ -27,7 +27,7 @@ Warning: intlgregcal_get_gregorian_change() expects exactly 1 parameter, 2 given
 Warning: intlgregcal_get_gregorian_change(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlgregcal_get_gregorian_change(1)
 #1 {main}

diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
index 6c4803c68c2eb6413fb0ba07895f4c7545c84fe5..125dc15cc144ede62a71ca88240be6041d9b2421 100644 (file)
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
@@ -30,7 +30,7 @@ Warning: IntlGregorianCalendar::isLeapYear() expects exactly 1 parameter, 0 give
 Warning: IntlGregorianCalendar::isLeapYear(): intlgregcal_is_leap_year: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlGregorianCalendar::isLeapYear() expects parameter 1 to be integer, string given in %s on line %d
+Warning: IntlGregorianCalendar::isLeapYear() expects parameter 1 to be int, string given in %s on line %d
 
 Warning: IntlGregorianCalendar::isLeapYear(): intlgregcal_is_leap_year: bad arguments in %s on line %d
 bool(false)
@@ -45,7 +45,7 @@ Warning: intlgregcal_is_leap_year() expects exactly 2 parameters, 1 given in %s
 Warning: intlgregcal_is_leap_year(): intlgregcal_is_leap_year: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlgregcal_is_leap_year(1, 2)
 #1 {main}

diff --git a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
index f45672c178dfa0364c155dc95962c2f38be215ee..74833eb14ab2962c3091e9de639b4d5a20fa9371 100644 (file)
--- a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
@@ -39,7 +39,7 @@ Warning: intlgregcal_set_gregorian_change() expects exactly 2 parameters, 1 give
 Warning: intlgregcal_set_gregorian_change(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, int given in %s:%d
 Stack trace:
 #0 %s(%d): intlgregcal_set_gregorian_change(1, 4)
 #1 {main}

diff --git a/ext/intl/tests/idn_uts46_errors.phpt b/ext/intl/tests/idn_uts46_errors.phpt
index 5de890ea6783159bdb2d1cd03617cccd2f5f0e63..6a99bde64910c7c7e5877c47b27ba388200ce764 100644 (file)
--- a/ext/intl/tests/idn_uts46_errors.phpt
+++ b/ext/intl/tests/idn_uts46_errors.phpt
@@ -43,7 +43,7 @@ var_dump($foo["errors"]==IDNA_ERROR_CONTEXTJ);
 => PHP level errors
 bad args:
 
-Warning: idn_to_ascii() expects parameter 3 to be integer, array given in %s on line %d
+Warning: idn_to_ascii() expects parameter 3 to be int, array given in %s on line %d
 
 Warning: idn_to_ascii(): idn_to_ascii: bad arguments in %s on line %d
 NULL

diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
index 6dc68a7a8cd3e41c5c4e2661437b26e157fa396c..febca6f91b704eddfee465a0528682dae902ff5d 100644 (file)
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
@@ -23,7 +23,7 @@ Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects at least 1 paramete
 Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 1 to be integer, array given in %s on line %d
+Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 1 to be int, array given in %s on line %d
 
 Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
 bool(false)
@@ -36,7 +36,7 @@ Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 2 to be s
 Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 3 to be integer, string given in %s on line %d
+Warning: IntlTimeZone::createTimeZoneIDEnumeration() expects parameter 3 to be int, string given in %s on line %d
 
 Warning: IntlTimeZone::createTimeZoneIDEnumeration(): intltz_create_time_zone_id_enumeration: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index 4089c42e3c48916826ae85a669d971e4a8f96437..bca02c4080f2b5b5715a09fc5546f2b269a18a77 100644 (file)
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -24,7 +24,7 @@ Warning: IntlTimeZone::getDisplayName() expects parameter 1 to be boolean, array
 Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlTimeZone::getDisplayName() expects parameter 2 to be integer, array given in %s on line %d
+Warning: IntlTimeZone::getDisplayName() expects parameter 2 to be int, array given in %s on line %d
 
 Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/timezone_getEquivalentID_error.phpt b/ext/intl/tests/timezone_getEquivalentID_error.phpt
index d1f7da0f47dfa9e345cd185fa792a770a04ff635..f22ca4eefdfaa47ab8f5a9d292df2b0b6c7c4c97 100644 (file)
--- a/ext/intl/tests/timezone_getEquivalentID_error.phpt
+++ b/ext/intl/tests/timezone_getEquivalentID_error.phpt
@@ -20,7 +20,7 @@ Warning: IntlTimeZone::getEquivalentID() expects exactly 2 parameters, 1 given i
 Warning: IntlTimeZone::getEquivalentID(): intltz_get_equivalent_id: bad arguments in %s on line %d
 bool(false)
 
-Warning: IntlTimeZone::getEquivalentID() expects parameter 2 to be integer, string given in %s on line %d
+Warning: IntlTimeZone::getEquivalentID() expects parameter 2 to be int, string given in %s on line %d
 
 Warning: IntlTimeZone::getEquivalentID(): intltz_get_equivalent_id: bad arguments in %s on line %d
 bool(false)

diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index ecc5e2bef83ce14ee9ed1878aee30db105b87986..f36e28494ac7c05f196b777738a0a83672ddc150 100644 (file)
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -35,7 +35,7 @@ Warning: intltz_to_date_time_zone() expects exactly 1 parameter, 0 given in %s o
 Warning: intltz_to_date_time_zone(): intltz_to_date_time_zone: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeError: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, int given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_to_date_time_zone(1)
 #1 {main}

diff --git a/ext/intl/tests/transliterator_create_from_rule_error.phpt b/ext/intl/tests/transliterator_create_from_rule_error.phpt
index f9125017c7f3a1231e495fbf6c9e80545188d491..7ec6cd0a5a59fe8ef1f804e35eac5f8c0176856b 100644 (file)
--- a/ext/intl/tests/transliterator_create_from_rule_error.phpt
+++ b/ext/intl/tests/transliterator_create_from_rule_error.phpt
@@ -37,7 +37,7 @@ Warning: Transliterator::createFromRules() expects at least 1 parameter, 0 given
 Warning: Transliterator::createFromRules(): transliterator_create_from_rules: bad arguments in %s on line %d
 transliterator_create_from_rules: bad arguments: U_ILLEGAL_ARGUMENT_ERROR
 
-Warning: Transliterator::createFromRules() expects parameter 2 to be integer, string given in %s on line %d
+Warning: Transliterator::createFromRules() expects parameter 2 to be int, string given in %s on line %d
 
 Warning: Transliterator::createFromRules(): transliterator_create_from_rules: bad arguments in %s on line %d
 transliterator_create_from_rules: bad arguments: U_ILLEGAL_ARGUMENT_ERROR

diff --git a/ext/ldap/tests/ldap_err2str_error.phpt b/ext/ldap/tests/ldap_err2str_error.phpt
index c60bc52185a3e684d3dce4117aca29bb2eca0e55..0963ac41016f6dfd075c74d0a75df8b89d3e5ee9 100644 (file)
--- a/ext/ldap/tests/ldap_err2str_error.phpt
+++ b/ext/ldap/tests/ldap_err2str_error.phpt
@@ -23,6 +23,6 @@ NULL
 Warning: ldap_err2str() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: ldap_err2str() expects parameter 1 to be integer, string given in %s on line %d
+Warning: ldap_err2str() expects parameter 1 to be int, string given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/libxml/tests/004.phpt b/ext/libxml/tests/004.phpt
index aa87ab75039b4be275d2e4e89f53b073baf6f789..9d5121089d0480b8f6cbb4cb541058483a0db812 100644 (file)
--- a/ext/libxml/tests/004.phpt
+++ b/ext/libxml/tests/004.phpt
@@ -37,7 +37,7 @@ Warning: libxml_set_streams_context() expects parameter 1 to be resource, string
 NULL
 bool(true)
 
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, integer given in %s004.php on line %d
+Warning: libxml_set_streams_context() expects parameter 1 to be resource, int given in %s004.php on line %d
 NULL
 bool(true)
 

diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
index d8712e3949fe05acff66b97e5178fdb60433cd8d..66014fa8a59bb931e2d97e2a1d5bfb1ba560721a 100644 (file)
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
@@ -173,32 +173,32 @@ string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr
 
 -- Iteration 16 --
 
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, string given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, object given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 22 --
@@ -211,6 +211,6 @@ string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr
 
 -- Iteration 24 --
 
-Warning: mb_encode_mimeheader() expects parameter 5 to be integer, resource given in %s on line %d
+Warning: mb_encode_mimeheader() expects parameter 5 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/mbstring/tests/mb_split_variation3.phpt b/ext/mbstring/tests/mb_split_variation3.phpt
index 3ef13513dacab399e2e9ae72247533ab1a852765..ccf614b8bfa42c5ea03ad75a44d9a252f126aa97 100644 (file)
--- a/ext/mbstring/tests/mb_split_variation3.phpt
+++ b/ext/mbstring/tests/mb_split_variation3.phpt
@@ -285,32 +285,32 @@ array(1) {
 
 -- Iteration 16 --
 
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 17 --
 
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 18 --
 
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 19 --
 
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 20 --
 
-Warning: mb_split() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
 -- Iteration 21 --
 
-Warning: mb_split() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 
 -- Iteration 22 --
@@ -327,6 +327,6 @@ array(1) {
 
 -- Iteration 24 --
 
-Warning: mb_split() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_split() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 Done

diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt
index 9907356ccdc63743622b45b4fac3f80c8a33bedd..025105ae735586eb8f8dcf678e163e1fc41e8d6a 100644 (file)
--- a/ext/mbstring/tests/mb_stripos_variation3.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation3.phpt
@@ -170,32 +170,32 @@ int(8)
 
 -- Iteration 18 --
 
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mb_stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mb_stripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -206,6 +206,6 @@ int(8)
 
 -- Iteration 26 --
 
-Warning: mb_stripos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_stripos() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt
index ce43080dc352eb7adda85cb194330eea1bdc9dde..cbdeda2b385cf3063948089b783b1fe3b6a690ff 100644 (file)
--- a/ext/mbstring/tests/mb_strpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation3.phpt
@@ -170,32 +170,32 @@ int(8)
 
 -- Iteration 18 --
 
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mb_strpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mb_strpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -206,6 +206,6 @@ int(8)
 
 -- Iteration 26 --
 
-Warning: mb_strpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_strpos() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
index cc3843e10281008b1c73dd4c87e4983d98e6ef64..16f92bfdfacd932ed1d586ee4f9447a7b10763c4 100644 (file)
--- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
@@ -165,32 +165,32 @@ int(8)
 
 -- Iteration 16 --
 
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mb_strripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mb_strripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 22 --
@@ -201,7 +201,7 @@ int(8)
 
 -- Iteration 24 --
 
-Warning: mb_strripos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: mb_strripos() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 Done
 

diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
index 544a6a3f22d8b4ea2da9ef220757fabcb7907d7d..68dd8341163d3401620291514c74ac0d04dc3cf6 100644 (file)
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
@@ -187,7 +187,7 @@ mysqli_result->unknown = ''
 
 Constructor:
 
-Warning: mysqli_result::__construct() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mysqli_result::__construct() expects parameter 2 to be int, string given in %s on line %d
 
 Warning: mysqli_result::__construct() expects parameter 1 to be mysqli, string given in %s on line %d
 done!
\ No newline at end of file

diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt
index b30b11cd276f6e5b29cfebc810ff04d258d67ea1..37b872302f0854ce9c2f05ad55289635e7d99483 100644 (file)
--- a/ext/mysqli/tests/mysqli_field_seek.phpt
+++ b/ext/mysqli/tests/mysqli_field_seek.phpt
@@ -218,7 +218,7 @@ Warning: mysqli_field_seek(): Invalid field offset in %s on line %d
 bool(false)
 bool(false)
 
-Warning: mysqli_field_seek() expects parameter 2 to be integer, float given in %s on line %d
+Warning: mysqli_field_seek() expects parameter 2 to be int, float given in %s on line %d
 NULL
 bool(true)
 object(stdClass)#%d (13) {

diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
index 31eb574422558cc62e5a11650afe18b5212a3b0e..826d225baee4e12a39e4da6a46a38beebb97df2b 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
@@ -118,7 +118,7 @@ if (!function_exists('mysqli_stmt_get_result'))
        require_once("clean_table.inc");
 ?>
 --EXPECTF--
-Warning: mysqli_result::data_seek() expects parameter 1 to be integer, float given in %s on line %d
+Warning: mysqli_result::data_seek() expects parameter 1 to be int, float given in %s on line %d
 
 Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d
 

diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index 912c27b9892b32e94d6e855a22b4cdacfe437b4a..bb377a90d8691e0a26ed9804187c1dd3bb2d7fb9 100644 (file)
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -62,13 +62,13 @@ object(OCI-Lob)#%d (1) {
 }
 int(0)
 
-Warning: OCI-Lob::write() expects parameter 2 to be integer, string given in %slob_002.php on line %d
+Warning: OCI-Lob::write() expects parameter 2 to be int, string given in %slob_002.php on line %d
 NULL
 int(4)
 int(40000)
 int(40004)
 
-Warning: OCI-Lob::seek() expects parameter 1 to be integer, string given in %slob_002.php on line %d
+Warning: OCI-Lob::seek() expects parameter 1 to be int, string given in %slob_002.php on line %d
 NULL
 bool(false)
 int(40004)

diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt
index aa4c254dda154f63c37b61ca76d0bbd1430e5ca2..94249bef18126fb13324abadae21e8ff74bd5c99 100644 (file)
--- a/ext/oci8/tests/lob_026.phpt
+++ b/ext/oci8/tests/lob_026.phpt
@@ -73,7 +73,7 @@ NULL
 bool(true)
 int(3)
 
-Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, integer given in %s on line %d
+Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, int given in %s on line %d
 NULL
 bool(true)
 array(2) {

diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt
index 98fe3ed225031ef3025f406011a122876b164e34..45e236178ecce242785c72eb0f2081118c466869 100644 (file)
--- a/ext/oci8/tests/privileged_connect.phpt
+++ b/ext/oci8/tests/privileged_connect.phpt
@@ -21,5 +21,5 @@ Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_c
 
 Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
 
-Warning: oci_connect() expects parameter 5 to be integer, string given in %s on line %d
+Warning: oci_connect() expects parameter 5 to be int, string given in %s on line %d
 Done

diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt
index 9581675ad2e642b6a85ba136219acf528d5ce6bf..849505b7228c84331586134f887261c1604169e2 100644 (file)
--- a/ext/oci8/tests/privileged_connect1.phpt
+++ b/ext/oci8/tests/privileged_connect1.phpt
@@ -23,5 +23,5 @@ Warning: oci_connect(): ORA-%d: %s in %s on line %d
 
 Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
 
-Warning: oci_connect() expects parameter 5 to be integer, string given in %s on line %d
+Warning: oci_connect() expects parameter 5 to be int, string given in %s on line %d
 Done

diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt
index 6900f13205e6529daa896037efff0a5b35b17549..8f5767315adc269280c3fdb4d1552715d8cb29ef 100644 (file)
--- a/ext/odbc/tests/odbc_data_source_001.phpt
+++ b/ext/odbc/tests/odbc_data_source_001.phpt
@@ -23,7 +23,7 @@ var_dump(odbc_data_source($conn, SQL_FETCH_FIRST));
 Warning: odbc_data_source(): Invalid fetch type (0) in %s on line %d
 bool(false)
 
-Warning: odbc_data_source() expects parameter 2 to be integer, string given in %s on line %d
+Warning: odbc_data_source() expects parameter 2 to be int, string given in %s on line %d
 NULL
 array(%d) {
 %a

diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index dfdddf88c0ebdbd400fb200593c7e27d57496dfd..cfb13876a25c2b63958db2af765e8a8959fbcab5 100644 (file)
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -28,11 +28,11 @@ odbc_exec($conn, NULL);
 
 ?>
 --EXPECTF--
-Warning: odbc_exec() expects parameter 3 to be integer, string given in %s on line %d
+Warning: odbc_exec() expects parameter 3 to be int, string given in %s on line %d
 
 Warning: odbc_exec(): SQL error: %s in %s on line %d
 
-Warning: odbc_exec() expects parameter 3 to be integer, string given in %s on line %d
+Warning: odbc_exec() expects parameter 3 to be int, string given in %s on line %d
 
 Warning: odbc_exec(): SQL error: %s in %s on line %d
 

diff --git a/ext/opcache/tests/method_call_on_literal.phpt b/ext/opcache/tests/method_call_on_literal.phpt
index bf89caa4184df982868d26d9a98a612b673e00ff..1f7d9792fa370919f0d9e8a2c9fb320e77af7531 100644 (file)
--- a/ext/opcache/tests/method_call_on_literal.phpt
+++ b/ext/opcache/tests/method_call_on_literal.phpt
@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-Call to a member function foo() on integer
+Call to a member function foo() on int

diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt
index e0f52d739f1e97f86f139399cfedfb06fc597a6b..24db4a4afc7d0d10201a8318ac018a5ae082a839 100644 (file)
--- a/ext/openssl/tests/openssl_csr_new_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_new_basic.phpt
@@ -26,10 +26,10 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions"
 echo "Done\n";
 ?>
 --EXPECTF--    
-Warning: openssl_csr_new() expects parameter 1 to be array, integer given in %s on line %d
+Warning: openssl_csr_new() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: openssl_csr_new() expects parameter 1 to be array, integer given in %s on line %d
+Warning: openssl_csr_new() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: openssl_csr_new(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d

diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt
index 572bb36695613179631c0a9c7dce544ab1f17a4a..a9961c2357c69452f5f2e2b7ed6e941c95cd54a6 100644 (file)
--- a/ext/openssl/tests/openssl_csr_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt
@@ -56,7 +56,7 @@ bool(false)
 Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d
 bool(false)
 
-Warning: openssl_csr_sign() expects parameter 4 to be integer, string given in %s on line %d
+Warning: openssl_csr_sign() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 Warning: openssl_csr_sign() expects parameter 5 to be array, string given in %s on line %d
@@ -76,7 +76,7 @@ Warning: openssl_csr_sign(): key array must be of the form array(0 => key, 1 =>
 Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d
 bool(false)
 
-Warning: openssl_csr_sign() expects parameter 4 to be integer, array given in %s on line %d
+Warning: openssl_csr_sign() expects parameter 4 to be int, array given in %s on line %d
 NULL
 resource(%d) of type (OpenSSL X.509)
 

diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt
index 4155e2bc88dc5735ff481f6c96e6e665cc84eef6..a739cb60ac3bfd45ca9d28e70eec76aaf0024a13 100644 (file)
--- a/ext/pcre/tests/grep2.phpt
+++ b/ext/pcre/tests/grep2.phpt
@@ -24,7 +24,7 @@ var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR);
 Warning: preg_grep() expects at most 3 parameters, 4 given in %sgrep2.php on line 3
 NULL
 
-Warning: preg_grep() expects parameter 2 to be array, integer given in %sgrep2.php on line 4
+Warning: preg_grep() expects parameter 2 to be array, int given in %sgrep2.php on line 4
 NULL
 
 Warning: preg_grep(): Compilation failed: quantifier does not follow a repeatable item at offset 0 in %sgrep2.php on line 5

diff --git a/ext/pcre/tests/preg_replace_callback3.phpt b/ext/pcre/tests/preg_replace_callback3.phpt
index fc3218b9e7cb2730024803b52b566ecb790d4010..320fe3c77a3a91f5e234e2cdc9eb425c8050ad2b 100644 (file)
--- a/ext/pcre/tests/preg_replace_callback3.phpt
+++ b/ext/pcre/tests/preg_replace_callback3.phpt
@@ -36,9 +36,9 @@ string(1) "3"
 Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid callback in %s on line %d
 string(1) "3"
 
-Warning: preg_replace_callback() expects parameter 4 to be integer, string given in %s on line %d
+Warning: preg_replace_callback() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
-Warning: preg_replace_callback() expects parameter 4 to be integer, array given in %s on line %d
+Warning: preg_replace_callback() expects parameter 4 to be int, array given in %s on line %d
 NULL
 Done

diff --git a/ext/pcre/tests/preg_replace_callback_array2.phpt b/ext/pcre/tests/preg_replace_callback_array2.phpt
index 8e70bb06e8c1119f89297012151a585a0f1012bc..5908eeb278350b3fb59b3ca334d07e66e5eb96b6 100644 (file)
--- a/ext/pcre/tests/preg_replace_callback_array2.phpt
+++ b/ext/pcre/tests/preg_replace_callback_array2.phpt
@@ -40,19 +40,19 @@ NULL
 Warning: preg_replace_callback_array() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: preg_replace_callback_array() expects parameter 1 to be array, integer given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: preg_replace_callback_array() expects parameter 1 to be array, integer given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: preg_replace_callback_array() expects parameter 1 to be array, integer given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: preg_replace_callback_array() expects parameter 3 to be integer, string given in %s on line %d
+Warning: preg_replace_callback_array() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: preg_replace_callback() expects parameter 4 to be integer, array given in %s on line %d
+Warning: preg_replace_callback() expects parameter 4 to be int, array given in %s on line %d
 NULL
 string(0) ""
 

diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
index 72b53156a2ccbc39b574029a6f67265366e206f8..10ce72f8c6dd29552606b1decf1aac61e04d0d54 100644 (file)
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
@@ -38,7 +38,7 @@ try {
        if (false !== ($tmp = @$stmt->getColumnMeta(-1)))
                printf("[004] Expecting false got %s\n", var_export($tmp, true));
 
-       // Warning: PDOStatement::getColumnMeta() expects parameter 1 to be integer, array given in
+       // Warning: PDOStatement::getColumnMeta() expects parameter 1 to be int, array given in
        if (false !== ($tmp = @$stmt->getColumnMeta(array())))
                printf("[005] Expecting false got %s\n", var_export($tmp, true));
 

diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt
index 4d0887f66f90c1572ef7e16caaaedc27cb4bc748..8564d4f17e263f89fa1a5ba201f3cf00cadeb53f 100644 (file)
--- a/ext/phar/tests/badparameters.phpt
+++ b/ext/phar/tests/badparameters.phpt
@@ -151,13 +151,13 @@ Warning: Phar::createDefaultStub() expects parameter 1 to be a valid path, array
 
 Warning: Phar::loadPhar() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
 
-Warning: Phar::canCompress() expects parameter 1 to be integer, %string given in %sbadparameters.php on line %d
+Warning: Phar::canCompress() expects parameter 1 to be int, %string given in %sbadparameters.php on line %d
 
 Exception: Phar::__construct() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
 
-Warning: Phar::convertToExecutable() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::convertToExecutable() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
 
-Warning: Phar::convertToData() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::convertToData() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
 
 Warning: PharData::delete() expects parameter 1 to be a valid path, array given in %sbadparameters.php on line %d
 Cannot write out phar archive, phar is read-only
@@ -177,10 +177,10 @@ Warning: Phar::setDefaultStub() expects parameter 1 to be %string, array given i
 Cannot change stub: phar.readonly=1
 Cannot set signature algorithm, phar is read-only
 
-Warning: Phar::compress() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::compress() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
 Cannot compress phar archive, phar is read-only
 
-Warning: Phar::compressFiles() expects parameter 1 to be integer, array given in %sbadparameters.php on line %d
+Warning: Phar::compressFiles() expects parameter 1 to be int, array given in %sbadparameters.php on line %d
 Phar is readonly, cannot change compression
 
 Warning: Phar::copy() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d

diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index 7328ba510b65e55d997b633b89b0096c7fd92e05..c269a8b34f09389e4a68179b8179d14d4de3bf69 100644 (file)
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -59,6 +59,6 @@ string(%d) "phar://%sphar_bz2.phar/tar_004.php"
 bool(true)
 bool(true)
 
-Warning: Phar::isFileFormat() expects parameter 1 to be integer, array given in %sphar_bz2.php on line %d
+Warning: Phar::isFileFormat() expects parameter 1 to be int, array given in %sphar_bz2.php on line %d
 Unknown file format specified
 ===DONE===

diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt
index ddc4d37393363a476ac592b9687acd7741b0c9eb..9544a1a5e075e96fce46e363e94517459e1dc9e3 100644 (file)
--- a/ext/phar/tests/pharfileinfo_chmod.phpt
+++ b/ext/phar/tests/pharfileinfo_chmod.phpt
@@ -29,5 +29,5 @@ $b->chmod(0666);
 --EXPECTF--
 Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod
 
-Warning: PharFileInfo::chmod() expects parameter 1 to be integer, array given in %spharfileinfo_chmod.php on line %d
+Warning: PharFileInfo::chmod() expects parameter 1 to be int, array given in %spharfileinfo_chmod.php on line %d
 ===DONE===
\ No newline at end of file

diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt
index 2c3bac88636cb0c83c6f80da56a793b3b4a2603e..551776194ee553d9ad224dc54df9f034b61c3bf4 100644 (file)
--- a/ext/phar/tests/pharfileinfo_compression.phpt
+++ b/ext/phar/tests/pharfileinfo_compression.phpt
@@ -76,7 +76,7 @@ var_dump($b->decompress());
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>
 --EXPECTF--
-Warning: PharFileInfo::isCompressed() expects parameter 1 to be integer, array given in %spharfileinfo_compression.php on line 11
+Warning: PharFileInfo::isCompressed() expects parameter 1 to be int, array given in %spharfileinfo_compression.php on line 11
 Unknown compression type specified
 Unknown compression type specified
 Cannot compress with Gzip compression, not possible with tar-based phar archives

diff --git a/ext/posix/tests/posix_getgrgid_variation.phpt b/ext/posix/tests/posix_getgrgid_variation.phpt
index 7abd32b97ff8a7d97ce4a3012a42544af1c6cf97..235e080a6c5a483e168c72ec49901a636f6dbcc6 100644 (file)
--- a/ext/posix/tests/posix_getgrgid_variation.phpt
+++ b/ext/posix/tests/posix_getgrgid_variation.phpt
@@ -97,7 +97,7 @@ valid output
 
 Arg value 101234567000 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, float given in %s on line %d
 valid output
 
 Arg value 1.07654321E-9 
@@ -110,35 +110,35 @@ Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getgrgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Arg value  
@@ -161,22 +161,22 @@ valid output
 
 Arg value  
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value  
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value string 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value string 
 
-Warning: posix_getgrgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getgrgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value  

diff --git a/ext/posix/tests/posix_getpgid_variation.phpt b/ext/posix/tests/posix_getpgid_variation.phpt
index 478164c210b08cb7c6dc93f3b025d4f178288c2d..bbf062d998901786be11b17a5bff4d483545473b 100644 (file)
--- a/ext/posix/tests/posix_getpgid_variation.phpt
+++ b/ext/posix/tests/posix_getpgid_variation.phpt
@@ -97,7 +97,7 @@ valid output
 
 Arg value 101234567000 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, float given in %s on line %d
 valid output
 
 Arg value 1.07654321E-9 
@@ -110,35 +110,35 @@ Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpgid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Arg value  
@@ -161,22 +161,22 @@ valid output
 
 Arg value  
 
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value  
 
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value string 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value string 
 
-Warning: posix_getpgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpgid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value  

diff --git a/ext/posix/tests/posix_getpwuid_variation.phpt b/ext/posix/tests/posix_getpwuid_variation.phpt
index fa000f5b8ad8004afdfb47f8f6ab016589d1c70c..9bcddea83279654a8756dc7f550612a2cdc53eca 100644 (file)
--- a/ext/posix/tests/posix_getpwuid_variation.phpt
+++ b/ext/posix/tests/posix_getpwuid_variation.phpt
@@ -97,7 +97,7 @@ valid output
 
 Arg value 101234567000 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, float given in %s on line %d
 valid output
 
 Arg value 1.07654321E-9 
@@ -110,35 +110,35 @@ Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Notice: Array to string conversion in %sposix_getpwuid_variation.php on line %d
 
 Arg value Array 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, array given in %s on line %d
 valid output
 
 Arg value  
@@ -161,22 +161,22 @@ valid output
 
 Arg value  
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value  
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value string 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value string 
 
-Warning: posix_getpwuid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_getpwuid() expects parameter 1 to be int, string given in %s on line %d
 valid output
 
 Arg value  

diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt
index 9d2a25962437a41e538afb32a32aba34c48116e0..cb9d384153e6128f1fde8b798d9761048decc0d5 100644 (file)
--- a/ext/posix/tests/posix_getsid_error.phpt
+++ b/ext/posix/tests/posix_getsid_error.phpt
@@ -22,7 +22,7 @@ var_dump( posix_getsid(-1) );
 Warning: posix_getsid() expects exactly 1 parameter, 0 given in %s on line %d
 bool(false)
 
-Warning: posix_getsid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_getsid() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 bool(false)
 ===DONE===

diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt
index e7db4a67940454baa4c9a501fd5f896ebf462e2c..2fdd808f1fdce3599185ae14c1ea03e10f4149c9 100644 (file)
--- a/ext/posix/tests/posix_initgroups.phpt
+++ b/ext/posix/tests/posix_initgroups.phpt
@@ -13,6 +13,6 @@ var_dump(posix_initgroups(NULL, NULL));
 
 ?>
 --EXPECTF--
-Warning: posix_initgroups() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_initgroups() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 bool(false)

diff --git a/ext/posix/tests/posix_initgroups_basic.phpt b/ext/posix/tests/posix_initgroups_basic.phpt
index afed61033591ddd7b5cecf062da6e29524b6bbd0..b97f1dc167974eb895058f4ceea3541c1ad98b8d 100644 (file)
--- a/ext/posix/tests/posix_initgroups_basic.phpt
+++ b/ext/posix/tests/posix_initgroups_basic.phpt
@@ -16,7 +16,7 @@ var_dump(posix_initgroups(NULL, NULL));
 --EXPECTF--
 Basic test of POSIX posix_initgroups function
 
-Warning: posix_initgroups() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_initgroups() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 bool(false)
 ===DONE====

diff --git a/ext/posix/tests/posix_kill_variation1.phpt b/ext/posix/tests/posix_kill_variation1.phpt
index d26f11df032424548d0b7c4a1390150f888df2e5..1a3fa20d79ad4a0366a13fcf64574379fe8941b0 100644 (file)
--- a/ext/posix/tests/posix_kill_variation1.phpt
+++ b/ext/posix/tests/posix_kill_variation1.phpt
@@ -91,7 +91,7 @@ bool(false)
 
 Arg value 101234567000 
 
-Warning: posix_kill() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
 Arg value 1.07654321E-9 
@@ -104,35 +104,35 @@ Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
 Arg value  
@@ -155,22 +155,22 @@ bool(false)
 
 Arg value  
 
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 Arg value  
 
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 Arg value string 
 
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 Arg value string 
 
-Warning: posix_kill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
 Arg value  

diff --git a/ext/posix/tests/posix_kill_variation2.phpt b/ext/posix/tests/posix_kill_variation2.phpt
index 399151a7ed7ce59c9653e4828366a716fecd6a56..d3fe6e78da06479c8ae53c0e4d4cc26517197bd9 100644 (file)
--- a/ext/posix/tests/posix_kill_variation2.phpt
+++ b/ext/posix/tests/posix_kill_variation2.phpt
@@ -91,7 +91,7 @@ bool(false)
 
 Arg value 101234567000 
 
-Warning: posix_kill() expects parameter 2 to be integer, float given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, float given in %s on line %d
 bool(false)
 
 Arg value 1.07654321E-9 
@@ -104,35 +104,35 @@ Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 Notice: Array to string conversion in %sposix_kill_variation2.php on line %d
 
 Arg value Array 
 
-Warning: posix_kill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 
 Arg value  
@@ -155,22 +155,22 @@ bool(false)
 
 Arg value  
 
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 Arg value  
 
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 Arg value string 
 
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 Arg value string 
 
-Warning: posix_kill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: posix_kill() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 
 Arg value  

diff --git a/ext/posix/tests/posix_seteuid_error2.phpt b/ext/posix/tests/posix_seteuid_error2.phpt
index cf724c13a5832252d1c5993c6ad229dfa812b17b..1073d8c44a5953face08f7344389c3316ad1bf6d 100644 (file)
--- a/ext/posix/tests/posix_seteuid_error2.phpt
+++ b/ext/posix/tests/posix_seteuid_error2.phpt
@@ -49,7 +49,7 @@ foreach ( $variation_array as $var ) {
 ?>
 --EXPECTF--
 *** Test substituting argument 1 with object values ***
-Error: 2 - posix_seteuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_seteuid() expects parameter 1 to be int, object given, %s
 bool(false)
-Error: 2 - posix_seteuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_seteuid() expects parameter 1 to be int, object given, %s
 bool(false)

diff --git a/ext/posix/tests/posix_seteuid_variation1.phpt b/ext/posix/tests/posix_seteuid_variation1.phpt
index 44546c47bfcea05dbc63ffa80f10a6470827d01e..d205c9917c58cc6aca64dfb633b2e4185cf138a1 100644 (file)
--- a/ext/posix/tests/posix_seteuid_variation1.phpt
+++ b/ext/posix/tests/posix_seteuid_variation1.phpt
@@ -28,14 +28,14 @@ foreach ( $variation_array as $var ) {
 
 ?>
 --EXPECTF--
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_seteuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)

diff --git a/ext/posix/tests/posix_seteuid_variation3.phpt b/ext/posix/tests/posix_seteuid_variation3.phpt
index 413c6c21bd5b90a3f5b0cc2a97bf5d6408cf7cd1..1d89c8b9138bdbf77ba89adf799cdba64812a2ad 100644 (file)
--- a/ext/posix/tests/posix_seteuid_variation3.phpt
+++ b/ext/posix/tests/posix_seteuid_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
 bool(false)
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 22
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 22
 bool(false)
 bool(false)
 bool(false)

diff --git a/ext/posix/tests/posix_seteuid_variation4.phpt b/ext/posix/tests/posix_seteuid_variation4.phpt
index 7dc10f85c703cbc31234c514729a674e588bde02..455c5e2533453a292fa6c1985f7d0f848cf9c3ee 100644 (file)
--- a/ext/posix/tests/posix_seteuid_variation4.phpt
+++ b/ext/posix/tests/posix_seteuid_variation4.phpt
@@ -38,9 +38,9 @@ foreach ( $variation_array as $var ) {
 bool(false)
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_seteuid() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_seteuid() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 bool(false)

diff --git a/ext/posix/tests/posix_seteuid_variation6.phpt b/ext/posix/tests/posix_seteuid_variation6.phpt
index 10fd2a81b6133699645f9ebbd1e5477f0b4355b5..e514b7cd74a90b5945e68df3c12a4851cf11d5c3 100644 (file)
--- a/ext/posix/tests/posix_seteuid_variation6.phpt
+++ b/ext/posix/tests/posix_seteuid_variation6.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
 --EXPECTF--
 *** Test substituting argument 1 with string values ***
 
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)
 
-Warning: posix_seteuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_seteuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)

diff --git a/ext/posix/tests/posix_setgid_variation1.phpt b/ext/posix/tests/posix_setgid_variation1.phpt
index 64b83ec3cd378aa300a093363d30d1c7dd444b38..7aadaf3657ce9c868281028c72e4d6bcdf78d421 100644 (file)
--- a/ext/posix/tests/posix_setgid_variation1.phpt
+++ b/ext/posix/tests/posix_setgid_variation1.phpt
@@ -33,15 +33,15 @@ foreach ( $variation_array as $var ) {
 --EXPECTF--
 *** Test substituting argument 1 with array values ***
 
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 ===DONE===

diff --git a/ext/posix/tests/posix_setgid_variation3.phpt b/ext/posix/tests/posix_setgid_variation3.phpt
index 4ae575f6995bf54dc18a2152a271a888f308b489..92580c9373fff20c0c8ad20dd1a7f2c3032495f2 100644 (file)
--- a/ext/posix/tests/posix_setgid_variation3.phpt
+++ b/ext/posix/tests/posix_setgid_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
 bool(false)
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 bool(false)
 bool(false)

diff --git a/ext/posix/tests/posix_setgid_variation4.phpt b/ext/posix/tests/posix_setgid_variation4.phpt
index 15d3cf56d89a2612ccab6fd509dfc43565f8ab14..4292c0dfc55bb5e96d86ccc4738a1ee0a5cce47d 100644 (file)
--- a/ext/posix/tests/posix_setgid_variation4.phpt
+++ b/ext/posix/tests/posix_setgid_variation4.phpt
@@ -37,10 +37,10 @@ foreach ( $variation_array as $var ) {
 bool(false)
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 bool(false)
 ===DONE===

diff --git a/ext/posix/tests/posix_setgid_variation6.phpt b/ext/posix/tests/posix_setgid_variation6.phpt
index a711d05c9af46690756da82aa693a79640d92f81..abee8ed222cd46015739048f9fef7028394ecf4b 100644 (file)
--- a/ext/posix/tests/posix_setgid_variation6.phpt
+++ b/ext/posix/tests/posix_setgid_variation6.phpt
@@ -50,9 +50,9 @@ foreach ( $variation_array as $var ) {
 ===DONE===
 --EXPECTF--
 *** Test substituting argument 1 with object values ***
-Error: 2 - posix_setgid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setgid() expects parameter 1 to be int, object given, %s
 bool(false)
-Error: 2 - posix_setgid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setgid() expects parameter 1 to be int, object given, %s
 bool(false)
 ===DONE===
        
\ No newline at end of file

diff --git a/ext/posix/tests/posix_setgid_variation7.phpt b/ext/posix/tests/posix_setgid_variation7.phpt
index 3dc691fbb7c0888810b6bd94073c5b5b032fc22a..0c4ef502f4eed832aa33a40ddd7e5b029d74badb 100644 (file)
--- a/ext/posix/tests/posix_setgid_variation7.phpt
+++ b/ext/posix/tests/posix_setgid_variation7.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
 --EXPECTF--
 *** Test substituting argument 1 with string values ***
 
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: posix_setgid() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_setgid() expects parameter 1 to be int, string given in %s on line %d
 bool(false)

diff --git a/ext/posix/tests/posix_setuid_error2.phpt b/ext/posix/tests/posix_setuid_error2.phpt
index 5473f48897102b50cc0e9cbca4c196e2ee32072c..577b9d31029b0be0a5196bc80c9bda0cfe256a53 100644 (file)
--- a/ext/posix/tests/posix_setuid_error2.phpt
+++ b/ext/posix/tests/posix_setuid_error2.phpt
@@ -49,7 +49,7 @@ foreach ( $variation_array as $var ) {
 ?>
 --EXPECTF--
 *** Test substituting argument 1 with object values ***
-Error: 2 - posix_setuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setuid() expects parameter 1 to be int, object given, %s
 bool(false)
-Error: 2 - posix_setuid() expects parameter 1 to be integer, object given, %s
+Error: 2 - posix_setuid() expects parameter 1 to be int, object given, %s
 bool(false)

diff --git a/ext/posix/tests/posix_setuid_variation1.phpt b/ext/posix/tests/posix_setuid_variation1.phpt
index 6748d7b9e8371670b609ddb212206d9ee0d1f914..44e02e0a27f905af0c404e283f2d5168d88d709f 100644 (file)
--- a/ext/posix/tests/posix_setuid_variation1.phpt
+++ b/ext/posix/tests/posix_setuid_variation1.phpt
@@ -28,14 +28,14 @@ foreach ( $variation_array as $var ) {
 
 ?>
 --EXPECTF--
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, array given in %s on line 15
+Warning: posix_setuid() expects parameter 1 to be int, array given in %s on line 15
 bool(false)

diff --git a/ext/posix/tests/posix_setuid_variation3.phpt b/ext/posix/tests/posix_setuid_variation3.phpt
index 0042b72ee3d7ac52a20f9a526010c66d22ab22a4..f5620024850741009cec50aa094b44dface8e2e7 100644 (file)
--- a/ext/posix/tests/posix_setuid_variation3.phpt
+++ b/ext/posix/tests/posix_setuid_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
 bool(false)
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 22
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 22
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 22
 bool(false)
 bool(false)
 bool(false)

diff --git a/ext/posix/tests/posix_setuid_variation4.phpt b/ext/posix/tests/posix_setuid_variation4.phpt
index 185ef8f53c592433faa01fe0e97559e928ce793b..419f675bf5aa62ef8f81e4253900890ce2dd4cf3 100644 (file)
--- a/ext/posix/tests/posix_setuid_variation4.phpt
+++ b/ext/posix/tests/posix_setuid_variation4.phpt
@@ -38,9 +38,9 @@ foreach ( $variation_array as $var ) {
 bool(false)
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setuid() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_setuid() expects parameter 1 to be int, float given in %s on line %d
 bool(false)
 bool(false)

diff --git a/ext/posix/tests/posix_setuid_variation6.phpt b/ext/posix/tests/posix_setuid_variation6.phpt
index 0536b8d199cfd9de8f1a9d091e77a0705c429578..e902b07ddca33c9546b7bb22b647e9a4bc841532 100644 (file)
--- a/ext/posix/tests/posix_setuid_variation6.phpt
+++ b/ext/posix/tests/posix_setuid_variation6.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
 --EXPECTF--
 *** Test substituting argument 1 with string values ***
 
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)
 
-Warning: posix_setuid() expects parameter 1 to be integer, string given in %s on line 21
+Warning: posix_setuid() expects parameter 1 to be int, string given in %s on line 21
 bool(false)

diff --git a/ext/posix/tests/posix_strerror_variation1.phpt b/ext/posix/tests/posix_strerror_variation1.phpt
index 40fff34be87841ed00a0be7b5a11f6d1b7a3e6ef..43ef566893a670a1198b52463feb904af563d72a 100644 (file)
--- a/ext/posix/tests/posix_strerror_variation1.phpt
+++ b/ext/posix/tests/posix_strerror_variation1.phpt
@@ -90,7 +90,7 @@ string
 
 Arg value 101234567000 
 
-Warning: posix_strerror() expects parameter 1 to be integer, float given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, float given in %s on line %d
 boolean
 
 Arg value 1.07654321E-9 
@@ -103,35 +103,35 @@ Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
 boolean
 
 Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
 boolean
 
 Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
 boolean
 
 Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
 boolean
 
 Notice: Array to string conversion in %sposix_strerror_variation1.php on line %d
 
 Arg value Array 
 
-Warning: posix_strerror() expects parameter 1 to be integer, array given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, array given in %s on line %d
 boolean
 
 Arg value  
@@ -154,22 +154,22 @@ string
 
 Arg value  
 
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
 boolean
 
 Arg value  
 
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
 boolean
 
 Arg value string 
 
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
 boolean
 
 Arg value string 
 
-Warning: posix_strerror() expects parameter 1 to be integer, string given in %s on line %d
+Warning: posix_strerror() expects parameter 1 to be int, string given in %s on line %d
 boolean
 
 Arg value  

diff --git a/ext/pspell/tests/002.phpt b/ext/pspell/tests/002.phpt
index 3b32b5f1500a33aa9839444e5314322ee85df92a..1b0dc2cdfa1518a9739b08d1df062ae79ea6130e 100644 (file)
--- a/ext/pspell/tests/002.phpt
+++ b/ext/pspell/tests/002.phpt
@@ -36,7 +36,7 @@ bool(false)
 bool(true)
 bool(true)
 
-Warning: pspell_clear_session() expects parameter 1 to be integer, object given in %s on line %d
+Warning: pspell_clear_session() expects parameter 1 to be int, object given in %s on line %d
 NULL
 bool(true)
 bool(false)

diff --git a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
index fd8118650fcb39a2646bf3c30e45b4be1e46b435..f85e95f26f5904f715b032376cb0def6021d0739 100644 (file)
--- a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
+++ b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
@@ -87,13 +87,13 @@ string(21) "/** My Doc comment */"
 Reflecting on class constant TestClass::PROT
 
 __toString():
-string(42) "Constant [ protected integer PROT ] { 4 }
+string(38) "Constant [ protected int PROT ] { 4 }
 "
 export():
-string(42) "Constant [ protected integer PROT ] { 4 }
+string(38) "Constant [ protected int PROT ] { 4 }
 "
 export():
-Constant [ protected integer PROT ] { 4 }
+Constant [ protected int PROT ] { 4 }
 
 NULL
 getName():

diff --git a/ext/reflection/tests/ReflectionClassConstant_getValue.phpt b/ext/reflection/tests/ReflectionClassConstant_getValue.phpt
index e447d15357bb1f51b848815d070f5217530545f6..5ff0baf6e29adc7d2974877e7be8cb0c771d30d4 100644 (file)
--- a/ext/reflection/tests/ReflectionClassConstant_getValue.phpt
+++ b/ext/reflection/tests/ReflectionClassConstant_getValue.phpt
@@ -24,13 +24,13 @@ echo new ReflectionClass('C');
 ?>
 --EXPECTF--
 int(2)
-Constant [ public integer X ] { 2 }
+Constant [ public int X ] { 2 }
 Class [ <user> class C ] {
   @@ %s 12-15
 
   - Constants [2] {
-    Constant [ public integer X ] { 2 }
-    Constant [ public integer Y ] { 1 }
+    Constant [ public int X ] { 2 }
+    Constant [ public int Y ] { 1 }
   }
 
   - Static properties [0] {

diff --git a/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt b/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt
index 9ccc285433108ce54db7e290df77d6d66e2b5351..30694bf536618b58cb6e56dcb7e0a720c5662786 100644 (file)
--- a/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt
+++ b/ext/reflection/tests/ReflectionClass_export_array_bug72222.phpt
@@ -13,7 +13,7 @@ Class [ <user> class A ] {
   @@ %s 2-5
 
   - Constants [2] {
-    Constant [ public integer A ] { 8 }
+    Constant [ public int A ] { 8 }
     Constant [ public array B ] { Array }
   }
 

diff --git a/ext/reflection/tests/ReflectionClass_getMethods_002.phpt b/ext/reflection/tests/ReflectionClass_getMethods_002.phpt
index fae86e1642d61ec7cf813f89896cc018006b7593..b6a78aa318451c8f4bfbe369177c8ffbbb22bbd9 100644 (file)
--- a/ext/reflection/tests/ReflectionClass_getMethods_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethods_002.phpt
@@ -13,6 +13,6 @@ $rc->getMethods('X', true);
 ?>
 --EXPECTF--
 Test invalid arguments:
-Warning: ReflectionClass::getMethods() expects parameter 1 to be integer, string given in %s on line 4
+Warning: ReflectionClass::getMethods() expects parameter 1 to be int, string given in %s on line 4
 
 Warning: ReflectionClass::getMethods() expects at most 1 parameter, 2 given in %s on line 5

diff --git a/ext/reflection/tests/ReflectionClass_getProperties_002.phpt b/ext/reflection/tests/ReflectionClass_getProperties_002.phpt
index fc4d5648a4c342235f6759c8f6e32a6f26ec2494..1f7dc24d74e010bcec752b4dfb0cd24fb8854440 100644 (file)
--- a/ext/reflection/tests/ReflectionClass_getProperties_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperties_002.phpt
@@ -12,6 +12,6 @@ $rc->getProperties('X', true);
 ?>
 --EXPECTF--
 Test invalid arguments:
-Warning: ReflectionClass::getProperties() expects parameter 1 to be integer, string given in %s on line 4
+Warning: ReflectionClass::getProperties() expects parameter 1 to be int, string given in %s on line 4
 
 Warning: ReflectionClass::getProperties() expects at most 1 parameter, 2 given in %s on line 5

diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt
index 179d63afade08989907377d72260a5b94476f03d..fab6387e05ec25ed799874f7b49bb0938bc8c931 100644 (file)
--- a/ext/reflection/tests/ReflectionClass_toString_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt
@@ -12,9 +12,9 @@ echo $rc;
 Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
 
   - Constants [3] {
-    Constant [ public integer IS_IMPLICIT_ABSTRACT ] { 16 }
-    Constant [ public integer IS_EXPLICIT_ABSTRACT ] { 32 }
-    Constant [ public integer IS_FINAL ] { 4 }
+    Constant [ public int IS_IMPLICIT_ABSTRACT ] { 16 }
+    Constant [ public int IS_EXPLICIT_ABSTRACT ] { 32 }
+    Constant [ public int IS_FINAL ] { 4 }
   }
 
   - Static properties [0] {

diff --git a/ext/reflection/tests/ReflectionObject_constructor_error.phpt b/ext/reflection/tests/ReflectionObject_constructor_error.phpt
index baa6129edf16fada26b51f4c6943c228b9c86569..71a1166b1394c60e9aa7f85fc4cae6b2440be821 100644 (file)
--- a/ext/reflection/tests/ReflectionObject_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_constructor_error.phpt
@@ -30,7 +30,7 @@ object(ReflectionObject)#%d (1) {
   string(0) ""
 }
 
-Warning: ReflectionObject::__construct() expects parameter 1 to be object, integer given in %s on line 7
+Warning: ReflectionObject::__construct() expects parameter 1 to be object, int given in %s on line 7
 object(ReflectionObject)#%d (1) {
   ["name"]=>
   string(0) ""

diff --git a/ext/reflection/tests/ReflectionObject_isInstance_error.phpt b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
index b0fb071e1fb78d15a68a4d35160782613ec62b1b..f8f088057c6901c470cda574e459dfdf9ecada50 100644 (file)
--- a/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
@@ -22,7 +22,7 @@ NULL
 Warning: ReflectionClass::isInstance() expects exactly 1 parameter, 2 given in %s on line 7
 NULL
 
-Warning: ReflectionClass::isInstance() expects parameter 1 to be object, integer given in %s on line 8
+Warning: ReflectionClass::isInstance() expects parameter 1 to be object, int given in %s on line 8
 NULL
 
 Warning: ReflectionClass::isInstance() expects parameter 1 to be object, float given in %s on line 9

diff --git a/ext/reflection/tests/bug29986.phpt b/ext/reflection/tests/bug29986.phpt
index f5aa62a00b1a0f04adb0dfeec6a2e019971ef20f..7e414504aa6117158e0a156240917d373dae85bd 100644 (file)
--- a/ext/reflection/tests/bug29986.phpt
+++ b/ext/reflection/tests/bug29986.phpt
@@ -23,7 +23,7 @@ Class [ <user> class just_constants ] {
     Constant [ public boolean BOOLEAN_CONSTANT ] { 1 }
     Constant [ public null NULL_CONSTANT ] {  }
     Constant [ public string STRING_CONSTANT ] { This is a string }
-    Constant [ public integer INTEGER_CONSTANT ] { 1000 }
+    Constant [ public int INTEGER_CONSTANT ] { 1000 }
     Constant [ public float FLOAT_CONSTANT ] { 3.14159265 }
   }
 

diff --git a/ext/session/tests/session_start_error.phpt b/ext/session/tests/session_start_error.phpt
index 5a0bcefc2a7cbe5146c9cfc41d3274cc205474a7..02aab25f9e0d3930e08991d8ce8ab350327348f5 100644 (file)
--- a/ext/session/tests/session_start_error.phpt
+++ b/ext/session/tests/session_start_error.phpt
@@ -98,7 +98,7 @@ ob_end_flush();
 
 -- Iteration 1 --
 
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -106,7 +106,7 @@ bool(false)
 
 -- Iteration 2 --
 
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -114,7 +114,7 @@ bool(false)
 
 -- Iteration 3 --
 
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
@@ -122,7 +122,7 @@ bool(false)
 
 -- Iteration 4 --
 
-Warning: session_start() expects parameter 1 to be array, integer given in %s on line %d
+Warning: session_start() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d

diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
index 8ed21432852c8252b6a98238f198c7783cc01ee9..c968a33970b86acac4a3b3c72955b500e9d7ab6b 100644 (file)
--- a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
@@ -13,7 +13,7 @@ var_dump($xml->xpath("BBBB"));
 --EXPECTF--
 Notice: Undefined variable: x in %s on line %d
 
-Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d
+Warning: simplexml_load_string() expects parameter 3 to be int, float given in %s on line %d
 
 Fatal error: Uncaught Error: Call to a member function xpath() on null in %s:%d
 Stack trace:

diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt
index 2b81629d7e954bfa8072425e3f27fcd64da36353..31908921da2a3d1bb0aff43f9375d09398119a44 100644 (file)
--- a/ext/snmp/tests/snmp-object-error.phpt
+++ b/ext/snmp/tests/snmp-object-error.phpt
@@ -76,8 +76,8 @@ var_dump($session->max_oids);
 ?>
 --EXPECTF--
 SNMP::__construct() expects at least 3 parameters, 2 given
-SNMP::__construct() expects parameter 4 to be integer, string given
-SNMP::__construct() expects parameter 5 to be integer, string given
+SNMP::__construct() expects parameter 4 to be int, string given
+SNMP::__construct() expects parameter 5 to be int, string given
 Unknown SNMP protocol version
 Exception handling
 
@@ -100,10 +100,10 @@ Warning: SNMP::get(): Invalid or uninitialized SNMP object in %s on line %d
 bool(false)
 bool(true)
 
-Warning: SNMP::walk() expects parameter 3 to be integer, string given in %s on line %d
+Warning: SNMP::walk() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 
-Warning: SNMP::walk() expects parameter 4 to be integer, string given in %s on line %d
+Warning: SNMP::walk() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 
 Warning: SNMP::get() expects at least 1 parameter, 0 given in %s on line %d

diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt
index a255a763f25e705674cbd9d5e24b0c065b635d17..d9bca8a4e95a2e2ffec5ddb1396a799ca10694fb 100644 (file)
--- a/ext/snmp/tests/snmp2_real_walk.phpt
+++ b/ext/snmp/tests/snmp2_real_walk.phpt
@@ -52,10 +52,10 @@ var_dump($return);
 --EXPECTF--
 Checking error handling
 
-Warning: snmp2_real_walk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmp2_real_walk() expects parameter 4 to be int, %s given in %s on line %d
 bool(false)
 
-Warning: snmp2_real_walk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmp2_real_walk() expects parameter 5 to be int, %s given in %s on line %d
 bool(false)
 Checking working
 Single OID

diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt
index 6d03693dac44530ca2240c2ea80dc2ba7380389a..a9c1f55ba9293512d53880818470f24186cbd9c5 100644 (file)
--- a/ext/snmp/tests/snmp2_walk.phpt
+++ b/ext/snmp/tests/snmp2_walk.phpt
@@ -60,10 +60,10 @@ var_dump($return);
 --EXPECTF--
 Checking error handling
 
-Warning: snmp2_walk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmp2_walk() expects parameter 4 to be int, %s given in %s on line %d
 bool(false)
 
-Warning: snmp2_walk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmp2_walk() expects parameter 5 to be int, %s given in %s on line %d
 bool(false)
 Checking working
 Single OID

diff --git a/ext/snmp/tests/snmp_get_quick_print.phpt b/ext/snmp/tests/snmp_get_quick_print.phpt
index 1876047d4f69940b6d2f83cf6f24aaed728436b7..f88df7d618e35a2a27de71e0637c7977a5ce0f7e 100644 (file)
--- a/ext/snmp/tests/snmp_get_quick_print.phpt
+++ b/ext/snmp/tests/snmp_get_quick_print.phpt
@@ -29,7 +29,7 @@ Checking error handling
 Warning: snmp_get_quick_print() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: snmp_set_quick_print() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: snmp_set_quick_print() expects parameter 1 to be int, %s given in %s on line %d
 bool(false)
 
 Warning: snmp_set_quick_print() expects exactly 1 parameter, 0 given in %s on line %d

diff --git a/ext/snmp/tests/snmp_get_valueretrieval.phpt b/ext/snmp/tests/snmp_get_valueretrieval.phpt
index 38937332b99d6572e18cf1c99676312ec05913be..74202bc693607eb6536301dbf0d099eea26479e2 100644 (file)
--- a/ext/snmp/tests/snmp_get_valueretrieval.phpt
+++ b/ext/snmp/tests/snmp_get_valueretrieval.phpt
@@ -39,7 +39,7 @@ bool(false)
 Warning: snmp_set_valueretrieval() expects exactly 1 parameter, 0 given in %s on line %d
 bool(false)
 
-Warning: snmp_set_valueretrieval() expects parameter 1 to be integer, %s given in %s on line %d
+Warning: snmp_set_valueretrieval() expects parameter 1 to be int, %s given in %s on line %d
 bool(false)
 
 Warning: snmp_set_valueretrieval(): Unknown SNMP value retrieval method '67' in %s on line %d

diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt
index e3827ab1c7d8fc27fe268c9bdfd026874cf0eb99..8ded5297fd1307dc54dc9d3e3389372b3f32157b 100644 (file)
--- a/ext/snmp/tests/snmprealwalk.phpt
+++ b/ext/snmp/tests/snmprealwalk.phpt
@@ -52,10 +52,10 @@ var_dump($return);
 --EXPECTF--
 Checking error handling
 
-Warning: snmprealwalk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmprealwalk() expects parameter 4 to be int, %s given in %s on line %d
 bool(false)
 
-Warning: snmprealwalk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmprealwalk() expects parameter 5 to be int, %s given in %s on line %d
 bool(false)
 Checking working
 Single OID

diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt
index 12544eebd6efb39ff86e4e70e4399028e969e979..5038e09712415f21bb916adc7aa568c6447984ac 100644 (file)
--- a/ext/snmp/tests/snmpwalk.phpt
+++ b/ext/snmp/tests/snmpwalk.phpt
@@ -60,10 +60,10 @@ var_dump($return);
 --EXPECTF--
 Checking error handling
 
-Warning: snmpwalk() expects parameter 4 to be integer, %s given in %s on line %d
+Warning: snmpwalk() expects parameter 4 to be int, %s given in %s on line %d
 bool(false)
 
-Warning: snmpwalk() expects parameter 5 to be integer, %s given in %s on line %d
+Warning: snmpwalk() expects parameter 5 to be int, %s given in %s on line %d
 bool(false)
 Checking working
 Single OID

diff --git a/ext/sockets/tests/socket_connect_error.phpt b/ext/sockets/tests/socket_connect_error.phpt
index 483763aed3fb90609f03b385c0e171fd5248b5f6..5987f502be8816de96aa938a0b99d312ba2de893 100644 (file)
--- a/ext/sockets/tests/socket_connect_error.phpt
+++ b/ext/sockets/tests/socket_connect_error.phpt
@@ -29,5 +29,5 @@ Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d
 
 Warning: socket_create() expects exactly 3 parameters, 2 given in %s on line %d
 
-Warning: socket_create() expects parameter 1 to be integer, array given in %s on line %d
+Warning: socket_create() expects parameter 1 to be int, array given in %s on line %d
 

diff --git a/ext/sockets/tests/socket_create_listen-wrongparams.phpt b/ext/sockets/tests/socket_create_listen-wrongparams.phpt
index 608678aaca2d3bb1a28e69f23e82c84cb2423414..4fc8ea701220c6a56ff56d7da50b930dabd21901 100644 (file)
--- a/ext/sockets/tests/socket_create_listen-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_listen-wrongparams.phpt
@@ -10,9 +10,9 @@ if (!extension_loaded('sockets')) {
 $sock1 = socket_create_listen(array());
 $sock2 = socket_create_listen(31337, array());
 --EXPECTF--
-Warning: socket_create_listen() expects parameter 1 to be integer, array given in %s on line %d
+Warning: socket_create_listen() expects parameter 1 to be int, array given in %s on line %d
 
-Warning: socket_create_listen() expects parameter 2 to be integer, array given in %s on line %d
+Warning: socket_create_listen() expects parameter 2 to be int, array given in %s on line %d
 --CREDITS--
 Till Klampaeckel, till@php.net
 PHP Testfest Berlin 2009-05-09

diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
index 70d314181b7347dc07f18a2e8673a570822a528c..554819ac991ec2d05e9e831007c70f483ba9d300 100644 (file)
--- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -24,7 +24,7 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
 Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
 NULL
 
-Warning: socket_create_pair() expects parameter 1 to be integer, string given in %s on line %d
+Warning: socket_create_pair() expects parameter 1 to be int, string given in %s on line %d
 NULL
 bool(true)
 

diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 37e3338be397cb59919fcc83dac53c54b9613bae..856d2cdc52024bf84181dd43c5ed8490b3260001 100644 (file)
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -24,7 +24,7 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
 Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
 NULL
 
-Warning: socket_create_pair() expects parameter 1 to be integer, string given in %s on line %d
+Warning: socket_create_pair() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d

diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt
index 98528420faf71f6f579aa3004a3b5e13e8723aad..c33fba3cc2289b66b4bf01b002e50dcc8c4923a8 100644 (file)
--- a/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: socket_export_stream() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: socket_export_stream() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: socket_export_stream() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Warning: socket_export_stream() expects parameter 1 to be resource, object given in %s on line %d

diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
index 4f06bbd7198305944e08b57d2f7d1972e8d57495..fd4c9e8e2dd41c74c812662bd2c63b4115049fb8 100644 (file)
--- a/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: socket_import_stream() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: socket_import_stream() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: socket_import_stream() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Warning: socket_import_stream() expects parameter 1 to be resource, object given in %s on line %d

diff --git a/ext/sodium/tests/sodium_error_001.phpt b/ext/sodium/tests/sodium_error_001.phpt
index 094500c4958692172109aa1b6c6af518db7ca74d..a9801e21ce12832fd40b1d29ab88109f36ff9658 100644 (file)
--- a/ext/sodium/tests/sodium_error_001.phpt
+++ b/ext/sodium/tests/sodium_error_001.phpt
@@ -15,7 +15,7 @@ $key = random_bytes(SODIUM_CRYPTO_SHORTHASH_KEYBYTES);
 $hash = do_crypto_shorthash($m, $key);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: sodium_crypto_shorthash() expects parameter 1 to be string, integer given in %s:%d
+Fatal error: Uncaught TypeError: sodium_crypto_shorthash() expects parameter 1 to be string, int given in %s:%d
 Stack trace:
 #0 %s(%d): sodium_crypto_shorthash()
 #1 %s(%d): do_crypto_shorthash()

diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
index f370159e3bce4659d2ec2cabc6231b2a1fbb1bd7..2446db22571cb1511d01552932e635b545195e17 100644 (file)
--- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
@@ -8,4 +8,4 @@ $dll = new SplDoublyLinkedList(2);
 $dll->setIteratorMode(new SplDoublyLinkedList(2));
 ?>
 --EXPECTF--
-Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be integer, object given in %s on line %d
\ No newline at end of file
+Warning: SplDoublyLinkedList::setIteratorMode() expects parameter 1 to be int, object given in %s on line %d
\ No newline at end of file

diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
index b15579edcab2bea192fc785266827da0824ca68e..57832e7c30fdae9e949f3d8f0ab551448565d635 100644 (file)
--- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, array given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, array given

diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
index 744a9cf7759aed3b79524025aba9685f2996ae0a..c10edbddc25361e908ffff606a0586b22350644a 100644 (file)
--- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given

diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
index 4739d8c55d439d58fbf001e9543e3a1cea10512b..d8daca9a33d9a0cb3088c8d4c21bdf93aceb3faf 100644 (file)
--- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
+++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
@@ -12,4 +12,4 @@ try {
 
 ?>
 --EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, object given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, object given

diff --git a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt
index 36ecf46453e97e0d5b301d3dc6dff90277017b12..3cecb8b79c4a0144af80732594a345bafa380597 100644 (file)
--- a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt
+++ b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_001.phpt
@@ -7,4 +7,4 @@ PHPNW Testfest 2009 - Lorna Mitchell
 echo SplFixedArray::fromArray(17954);
 ?>
 --EXPECTF--
-Warning: SplFixedArray::fromArray() expects parameter 1 to be array, integer given in %s on line %d
+Warning: SplFixedArray::fromArray() expects parameter 1 to be array, int given in %s on line %d

diff --git a/ext/spl/tests/SplFixedArray_setSize_param_array.phpt b/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
index ee155bb6dad26651872e50066aa3b91b6f93ce88..a9e763ab83393d63dc1bccba416b23a918a05840 100644 (file)
--- a/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray_setSize_param_array.phpt
@@ -9,7 +9,7 @@ $fixed_array->setSize(array());
 var_dump($fixed_array);
 ?>
 --EXPECTF--
-Warning: SplFixedArray::setSize() expects parameter 1 to be integer, array given in %s on line %d
+Warning: SplFixedArray::setSize() expects parameter 1 to be int, array given in %s on line %d
 object(SplFixedArray)#1 (2) {
   [0]=>
   NULL

diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
index 25d472c30fed29f9c09a3c2c0fd251c9800173a9..991031b416287e5aaae99fe15d5872fdb73c9768 100644 (file)
--- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
+Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, int given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, float given in %s on line %d

diff --git a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
index 9942ff3fd1f5dae41e6cb185b4c1f9e31d407dba..c4e4b41b9caf77799a4a6da5a5af4f04feee2719 100644 (file)
--- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::contains() expects parameter 1 to be object, integer given in %s on line %d
+Warning: SplObjectStorage::contains() expects parameter 1 to be object, int given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, float given in %s on line %d

diff --git a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
index fa75a07368c473c1a6670bd076951b31887f8699..7ea5da0f685f74d8f690f7b9e67e3945a3cc395a 100644 (file)
--- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::detach() expects parameter 1 to be object, integer given in %s on line %d
+Warning: SplObjectStorage::detach() expects parameter 1 to be object, int given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, float given in %s on line %d

diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
index 374d3d11fd8bef0d974a62ca838087137a14a956..56daa00b585ef51b660d2c23bfb0de2069144415 100644 (file)
--- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
@@ -34,7 +34,7 @@ NULL
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, integer given in %s on line %d
+Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, int given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, float given in %s on line %d

diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
index 69d35a1a224a25a0c4c27ffe4d5c8668cce47e92..28e1fe8fa06df01913040bc909b1ffe0ec4ad6b6 100644 (file)
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
@@ -33,7 +33,7 @@ NULL
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, int given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, float given in %s on line %d

diff --git a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
index 2a66f1eae863f5b3656bd54f52abdb6494e4dafa..50150f0d513a36a237ee4d25d84708760ec8f4bb 100644 (file)
--- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
@@ -32,7 +32,7 @@ NULL
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
+Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, int given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, float given in %s on line %d

diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
index fe473669879de301dedeed9b4037b117043258d6..338aa4b0b04027f237d4a0c5ca232a5cbfa98ca7 100644 (file)
--- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECTF--
-SplTempFileObject::__construct() expects parameter 1 to be integer, string given
+SplTempFileObject::__construct() expects parameter 1 to be int, string given

diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt
index 6a523aec664ef68b7403880450eeeaa0101c4693..6a2014e72b7d9407dc7b3863883f03dcf996cdfa 100644 (file)
--- a/ext/spl/tests/arrayObject_asort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic1.phpt
@@ -36,7 +36,7 @@ object(ArrayObject)#%d (1) {
   }
 }
 
-Warning: asort() expects parameter 2 to be integer, string given in %sarrayObject_asort_basic1.php on line %d
+Warning: asort() expects parameter 2 to be int, string given in %sarrayObject_asort_basic1.php on line %d
 bool(false)
 object(ArrayObject)#%d (1) {
   ["storage":"ArrayObject":private]=>

diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt
index 1e7aa01fe89cf3b9239e41827ec01b6eaea98347..85e90031cf304263a8027c6af46414ebf6a773da 100644 (file)
--- a/ext/spl/tests/arrayObject_ksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt
@@ -35,7 +35,7 @@ object(ArrayObject)#%d (1) {
   }
 }
 
-Warning: ksort() expects parameter 2 to be integer, string given in %sarrayObject_ksort_basic1.php on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %sarrayObject_ksort_basic1.php on line %d
 bool(false)
 object(ArrayObject)#2 (1) {
   ["storage":"ArrayObject":private]=>

diff --git a/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt b/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
index 06451a367729ca759ab7af24d0d2fbb4d14f8c3d..14387998fb4cba6bea1bd02628c130a40ef61043 100644 (file)
--- a/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
+++ b/ext/spl/tests/fileobject_setmaxlinelen_error003.phpt
@@ -9,4 +9,4 @@ $s->setMaxLineLen('string');
 
 ?>
 --EXPECTF--
-Warning: SplFileObject::setMaxLineLen() expects parameter 1 to be integer, string given in %s on line %d
+Warning: SplFileObject::setMaxLineLen() expects parameter 1 to be int, string given in %s on line %d

diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt
index cc64fd01b01737a5e2e2a851c68e7ff0acbddb9f..7240c0abc6d2f339d301db500970ac8d964a579d 100644 (file)
--- a/ext/spl/tests/fixedarray_005.phpt
+++ b/ext/spl/tests/fixedarray_005.phpt
@@ -24,7 +24,7 @@ try {
 ?>
 ===DONE===
 --EXPECT--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, object given
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, object given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
 ===DONE===

diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt
index fe388836211887d99b2148b7947c3e621aff86a3..4d2624528b2f5a0344c91f8cfbf147aed944078d 100644 (file)
--- a/ext/spl/tests/fixedarray_009.phpt
+++ b/ext/spl/tests/fixedarray_009.phpt
@@ -10,4 +10,4 @@ try {
 }
 ?>
 --EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given

diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index b6f119ab1f742ffeb22d8ca9593ba2623c3e8df4..9468d9626c3610ad3d5254a4c03ef15c00e4e88c 100644 (file)
--- a/ext/spl/tests/fixedarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -12,5 +12,5 @@ try {
 echo "Done\n";
 ?>
 --EXPECTF--    
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
+Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given
 Done

diff --git a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
index bbd283f96cfab823a360ac8b134dda7e33b4e1d0..7076ad98961c965af50a33a0ada9010bb212580b 100644 (file)
--- a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
@@ -26,7 +26,7 @@ $it->setPrefixPart(1, $a); // Should throw a warning as setPrefixPart expects ar
 --EXPECTF--
 Warning: RecursiveTreeIterator::setPrefixPart() expects exactly 2 parameters, 1 given in %s on line %d
 
-Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be integer, object given in %s on line %d
+Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be int, object given in %s on line %d
 
 Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 2 to be string, object given in %s on line %d
 ===DONE===

diff --git a/ext/spl/tests/regexIterator_setMode_error.phpt b/ext/spl/tests/regexIterator_setMode_error.phpt
index 7062959eb1d17847950abe9bf336470eaa0fc5f7..77732b058c4166334c5e7cc0bf1161676e9183da 100644 (file)
--- a/ext/spl/tests/regexIterator_setMode_error.phpt
+++ b/ext/spl/tests/regexIterator_setMode_error.phpt
@@ -25,4 +25,4 @@ int(0)
 string(14) "Illegal mode 7"
 int(0)
 
-Warning: RegexIterator::setMode() expects parameter 1 to be integer, string given in %s on line %d
+Warning: RegexIterator::setMode() expects parameter 1 to be int, string given in %s on line %d

diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index be0cb804c623370c971f08f2343a1e60bd9696c7..60de68b82a948bcd821255f8d837e8f9ca6a322f 100644 (file)
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -78,7 +78,7 @@ int(5)
 int(6)
 int(4)
 ===ERRORS===
-Error: Argument 3 passed to iterator_apply() must be of the type array or null, integer given
+Error: Argument 3 passed to iterator_apply() must be of the type array or null, int given
 Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_function' not found or invalid function name
 NULL
 Error: iterator_apply() expects at most 3 parameters, 4 given

diff --git a/ext/spl/tests/spl_005.phpt b/ext/spl/tests/spl_005.phpt
index 219c791bbb9eead5cf86021ea0441d11fe030a2d..cb36df18cffe01025d3762353cd9a4a9b622327b 100644 (file)
--- a/ext/spl/tests/spl_005.phpt
+++ b/ext/spl/tests/spl_005.phpt
@@ -13,7 +13,7 @@ var_dump(spl_object_hash());
 --EXPECTF--
 string(32) "%s"
 
-Warning: spl_object_hash() expects parameter 1 to be object, integer given in %sspl_005.php on line %d
+Warning: spl_object_hash() expects parameter 1 to be object, int given in %sspl_005.php on line %d
 NULL
 
 Warning: spl_object_hash() expects exactly 1 parameter, 0 given in %sspl_005.php on line %d

diff --git a/ext/spl/tests/spl_object_id.phpt b/ext/spl/tests/spl_object_id.phpt
index fc7b74f8d9dc270ed95df19b2c7fa96ce0a6efe9..ca13b03feee413ca8f1b1ee7f4d655cfc3b08e3d 100644 (file)
--- a/ext/spl/tests/spl_object_id.phpt
+++ b/ext/spl/tests/spl_object_id.phpt
@@ -13,7 +13,7 @@ var_dump(spl_object_id(new stdClass) === spl_object_id($a));
 --EXPECTF--
 int(%d)
 
-Warning: spl_object_id() expects parameter 1 to be object, integer given in %sspl_object_id.php on line %d
+Warning: spl_object_id() expects parameter 1 to be object, int given in %sspl_object_id.php on line %d
 NULL
 
 Warning: spl_object_id() expects exactly 1 parameter, 0 given in %sspl_object_id.php on line %d

diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt
index f72493215f16ba29c3cc91d51fefed4b2b087b7d..667c9548955cffcc83b812e59a8cf8d43ac83b64 100644 (file)
--- a/ext/standard/tests/array/005.phpt
+++ b/ext/standard/tests/array/005.phpt
@@ -87,7 +87,7 @@ echo"Done";
 Warning: array_shift() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d

diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt
index e0618ad70eed367ae360f21113f03fcc72a98ba7..f275085de5e246eab913d061da8f6b838d2e3e51 100644 (file)
--- a/ext/standard/tests/array/009.phpt
+++ b/ext/standard/tests/array/009.phpt
@@ -501,7 +501,7 @@ NULL
 Warning: next() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: key() expects parameter 1 to be array, float given in %s on line %d
@@ -510,7 +510,7 @@ NULL
 Warning: key() expects parameter 1 to be array, string given in %s on line %d
 NULL
 
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: current() expects parameter 1 to be array, float given in %s on line %d
@@ -519,7 +519,7 @@ NULL
 Warning: current() expects parameter 1 to be array, string given in %s on line %d
 NULL
 
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: next() expects parameter 1 to be array, float given in %s on line %d
@@ -528,7 +528,7 @@ NULL
 Warning: next() expects parameter 1 to be array, string given in %s on line %d
 NULL
 
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: reset() expects parameter 1 to be array, float given in %s on line %d

diff --git a/ext/standard/tests/array/array_change_key_case_errors.phpt b/ext/standard/tests/array/array_change_key_case_errors.phpt
index ec506f767d460cdf91d09105729aabb9b986dd32..5577b620fd91fb0eccfafa57653c13755e42e2ca 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_errors.phpt
+++ b/ext/standard/tests/array/array_change_key_case_errors.phpt
@@ -14,10 +14,10 @@ var_dump( array_change_key_case($item, $item["one"], "CASE_UPPER") ); // more th
 echo "end\n";
 ?>
 --EXPECTF--
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_change_key_case() expects at least 1 parameter, 0 given in %s on line %d

diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt
index 2a6148e251b7017d0668fd320ab432306b48552a..5c2d524f9b03f887e5f036119883cc8b300def74 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation.phpt
@@ -21,7 +21,7 @@ var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 )
 echo "end\n";
 ?>
 --EXPECTF--
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
 NULL
 array(4) {
   ["ONE"]=>
@@ -38,7 +38,7 @@ array(1) {
   int(4)
 }
 
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
 NULL
 array(1) {
   ["ONE"]=>

diff --git a/ext/standard/tests/array/array_change_key_case_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt
index cf7369396537b93631cd20147a2cb6b7e0aa633c..9da0b2cb6087394a03449c31bf7a58e4dab3bb32 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation1.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_change_key_case_variation2.phpt b/ext/standard/tests/array/array_change_key_case_variation2.phpt
index 6b2f4ef1ab2b44eadaf760ed6275fc1bf74d3cb0..818c20e2ee2cf29f7dfa8b8203fc01cded19f775 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation2.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation2.phpt
@@ -240,32 +240,32 @@ array(3) {
 
 -- Iteration 16 --
 
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: array_change_key_case() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --

diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt
index 0535c126ba7df615220ac44411147c65375fd5da..2182b0b9579a09de5845b16ea2dd3321e20cef4e 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation1.phpt
+++ b/ext/standard/tests/array/array_chunk_variation1.phpt
@@ -83,46 +83,46 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt
index 2a3ef6ed85e76527a0c4c007f9ece3719371f569..b36c194a874c680c341b5abccae52e2be4b15be6 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation2.phpt
+++ b/ext/standard/tests/array/array_chunk_variation2.phpt
@@ -177,57 +177,57 @@ NULL
 
 -- Iteration 6 --
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 7 --
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 8 --
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 9 --
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 10 --
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 11 --
@@ -352,78 +352,78 @@ NULL
 
 -- Iteration 17 --
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_column_error.phpt b/ext/standard/tests/array/array_column_error.phpt
index bdcbec00627ea92234d10edd94674ea2ca51a053..26a09aff2488198a2cdb37d60207c65002b5426a 100644 (file)
--- a/ext/standard/tests/array/array_column_error.phpt
+++ b/ext/standard/tests/array/array_column_error.phpt
@@ -57,7 +57,7 @@ NULL
 
 -- Testing array_column() function with int as first parameter --
 
-Warning: array_column() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_column() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Testing array_column() column key parameter should be a string or an integer (testing bool) --

diff --git a/ext/standard/tests/array/array_combine_variation1.phpt b/ext/standard/tests/array/array_combine_variation1.phpt
index f369171c7ba1841dc1c238ba72823bf1ea3edad5..76877ef70d495c6f973e7e2e854728f4ff9cd0ba 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation1.phpt
+++ b/ext/standard/tests/array/array_combine_variation1.phpt
@@ -101,19 +101,19 @@ echo "Done";
 *** Testing array_combine() : Passing non-array values to $keys argument ***
 -- Iteration 1 --
 
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/array_combine_variation2.phpt b/ext/standard/tests/array/array_combine_variation2.phpt
index ed637bb4380ee3eb9ddc96249c914e5b9d180fc9..3422bd81d14f8caec29b1b5ab33cb609e4018b77 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation2.phpt
+++ b/ext/standard/tests/array/array_combine_variation2.phpt
@@ -101,19 +101,19 @@ echo "Done";
 *** Testing array_combine() : Passing non-array values to $values argument ***
 -- Iteration 1 --
 
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt
index 843e34ee5942bb7a62d7388f25319dce947fac2e..e544c8117c865ab7bc4f2ed8335ff463130e3cf5 100644 (file)
--- a/ext/standard/tests/array/array_count_values_error.phpt
+++ b/ext/standard/tests/array/array_count_values_error.phpt
@@ -45,6 +45,6 @@ NULL
 
 -- Testing array_count_values() function integer arguments --
 
-Warning: array_count_values() expects parameter 1 to be array, integer given in %sarray_count_values_error.php on line 26
+Warning: array_count_values() expects parameter 1 to be array, int given in %sarray_count_values_error.php on line 26
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt
index 684949fe959058862c1cfb076221baf77af7cae4..5701f79b48abad1ed4a22219211773c1aad3ec0d 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation1.phpt
+++ b/ext/standard/tests/array/array_fill_variation1.phpt
@@ -125,7 +125,7 @@ array(2) {
 }
 -- Iteration 3 --
 
-Warning: array_fill() expects parameter 1 to be integer, float given in %s%eext%estandard%etests%earray%earray_fill_variation1.php on line 92
+Warning: array_fill() expects parameter 1 to be int, float given in %s%eext%estandard%etests%earray%earray_fill_variation1.php on line 92
 NULL
 -- Iteration 4 --
 array(2) {
@@ -143,23 +143,23 @@ array(2) {
 }
 -- Iteration 6 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 11 --
 array(2) {
@@ -205,23 +205,23 @@ array(2) {
 }
 -- Iteration 17 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 18 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_fill() expects parameter 1 to be integer, object given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, object given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 22 --
 array(2) {
@@ -239,6 +239,6 @@ array(2) {
 }
 -- Iteration 24 --
 
-Warning: array_fill() expects parameter 1 to be integer, resource given in %sarray_fill_variation1.php on line %d
+Warning: array_fill() expects parameter 1 to be int, resource given in %sarray_fill_variation1.php on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
index 6cbec86f60843ed51c7a1dd14304cf6e5c9b9b73..699e98b1b3ca5e9b968cda543959bdf38edd577d 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation1_64bit.phpt
+++ b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
@@ -146,23 +146,23 @@ array(2) {
 }
 -- Iteration 6 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 array(2) {
@@ -208,23 +208,23 @@ array(2) {
 }
 -- Iteration 17 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_fill() expects parameter 1 to be integer, object given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, object given in %s on line %d
 NULL
 -- Iteration 22 --
 array(2) {
@@ -242,6 +242,6 @@ array(2) {
 }
 -- Iteration 24 --
 
-Warning: array_fill() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: array_fill() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt
index 953615edf5f9f8121547db625da5ef3339c56d18..d3955fdaaa99ddce7f4bc62cb6e2ebcf9d90f4c1 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation2.phpt
+++ b/ext/standard/tests/array/array_fill_variation2.phpt
@@ -129,23 +129,23 @@ array(0) {
 }
 -- Iteration 6 --
 
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 array(0) {
@@ -171,23 +171,23 @@ array(0) {
 }
 -- Iteration 17 --
 
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_fill() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_fill() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 22 --
 array(0) {

diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt
index c96e876e5d4c8c8e7c3f30814692e556236d755e..41bf5e4df2ef410a4028e7198442ce22fbae51cd 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation1.phpt
+++ b/ext/standard/tests/array/array_filter_variation1.phpt
@@ -102,19 +102,19 @@ echo "Done"
 *** Testing array_filter() : usage variations - unexpected values for 'input'***
 -- Iteration 1 --
 
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt
index f03c37742215d5b9708e879d353fd4182671ccbc..ec7937fdb201d05055e54e0ecb2227adb328cf3f 100644 (file)
--- a/ext/standard/tests/array/array_flip_variation1.phpt
+++ b/ext/standard/tests/array/array_flip_variation1.phpt
@@ -86,19 +86,19 @@ echo "Done"
 *** Testing array_flip() : usage variations - unexpected values for 'input' ***
 -- Iteration 1 --
 
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index ef40f846ad571ceb4e972b14dd5931f743021ca7..c61d0afab9e166dd1f451ac378f44beab0740462 100644 (file)
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -258,7 +258,7 @@ bool(false)
 Warning: array_key_exists() expects parameter 2 to be array, string given in %s on line %d
 NULL
 
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
 NULL
 
 Warning: array_key_exists() expects parameter 2 to be array, null given in %s on line %d

diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt
index b58ca445c93249c61f3b611a8175779b0173ec5e..67630fd3631f912ba154a107ee4fee9727a4f044 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation2.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation2.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_keys_error.phpt b/ext/standard/tests/array/array_keys_error.phpt
index 685547f0ec85ad2e3d545dc023f3e9254cc28dd4..46a989b839c6711388b83d9f2aa8e72437fa79a8 100644 (file)
--- a/ext/standard/tests/array/array_keys_error.phpt
+++ b/ext/standard/tests/array/array_keys_error.phpt
@@ -15,7 +15,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 *** Testing error conditions ***
-Warning: array_keys() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_keys() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_keys() expects parameter 1 to be array, string given in %s on line %d

diff --git a/ext/standard/tests/array/array_pad_variation1.phpt b/ext/standard/tests/array/array_pad_variation1.phpt
index 80385791866223d4fb17ca33d0c6af42edeee7f5..2735734eec4fba5dd03fea62f28d4473c84a3be8 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation1.phpt
+++ b/ext/standard/tests/array/array_pad_variation1.phpt
@@ -101,31 +101,31 @@ echo "Done";
 *** Testing array_pad() : passing non array values to $input argument ***
 
 -- Iteration 1 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_pad_variation2.phpt b/ext/standard/tests/array/array_pad_variation2.phpt
index 130255caa9aaad2ad726485264a9d9164af03485..69de77ee97688d413a5f1540f31cc13362aa90fe 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation2.phpt
+++ b/ext/standard/tests/array/array_pad_variation2.phpt
@@ -161,23 +161,23 @@ array(2) {
 }
 -- Iteration 7 --
 
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 12 --
 array(2) {
@@ -223,23 +223,23 @@ array(2) {
 }
 -- Iteration 18 --
 
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: array_pad() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_pad() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 23 --
 array(2) {

diff --git a/ext/standard/tests/array/array_pop_errors.phpt b/ext/standard/tests/array/array_pop_errors.phpt
index d6c86c3794aef4c00752163da483582437f554a5..fd6147731cf54126ab763b4a1252857852dc7dc0 100644 (file)
--- a/ext/standard/tests/array/array_pop_errors.phpt
+++ b/ext/standard/tests/array/array_pop_errors.phpt
@@ -51,7 +51,7 @@ echo"\nDone";
 Warning: array_pop() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: array_pop() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_pop() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_pop() expects parameter 1 to be array, string given in %s on line %d

diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt
index 5031000192a65a79e39cb14862d3fe4045c30e6a..f68e020d5d9b5497ee2bf0f27e3708a87e3f242c 100644 (file)
--- a/ext/standard/tests/array/array_product_variation5.phpt
+++ b/ext/standard/tests/array/array_product_variation5.phpt
@@ -98,22 +98,22 @@ foreach($inputs as $key =>$value) {
 
 --int 0--
 
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
 NULL
 
 --int 1--
 
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
 NULL
 
 --int 12345--
 
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
 NULL
 
 --int -12345--
 
-Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d
+Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d
 NULL
 
 --float 10.5--

diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt
index cea77f4c3cbd969d9916d82fefc2fdde905cd89d..4d8a55e3294998bf3050ee13c7f13400618f7c0e 100644 (file)
--- a/ext/standard/tests/array/array_push.phpt
+++ b/ext/standard/tests/array/array_push.phpt
@@ -75,7 +75,7 @@ echo"\nDone";
 Warning: array_push() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_push() expects parameter 1 to be array, string given in %s on line %d

diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt
index 94b9ec8811f60ba1de0bea0143f7eeef869fd2d0..5e41a82bd7fdb07ee704f460be47c59e4400687a 100644 (file)
--- a/ext/standard/tests/array/array_push_variation1.phpt
+++ b/ext/standard/tests/array/array_push_variation1.phpt
@@ -102,22 +102,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_push() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt
index c158b0f74b2e7e937255cd5922e3a464625697d5..678892b6e00d0c675b88c191c9224f81f92982e2 100644 (file)
--- a/ext/standard/tests/array/array_rand.phpt
+++ b/ext/standard/tests/array/array_rand.phpt
@@ -25,7 +25,7 @@ NULL
 Warning: array_rand(): Array is empty in %s on line %d
 NULL
 
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d

diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt
index 636c489402cb33ee8af9eea809818b03af29c5c7..590be63d9143a528c3a6630a272eac6afc138253 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation1.phpt
+++ b/ext/standard/tests/array/array_rand_variation1.phpt
@@ -101,22 +101,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt
index 96abce5b51a9570fd8f668f9e742d3c4f0a1b6c6..44967ffd8c5a627face02dd0c178289913c0e21e 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation2.phpt
+++ b/ext/standard/tests/array/array_rand_variation2.phpt
@@ -181,27 +181,27 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: array_rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: array_rand() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 21 --

diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt
index c528387603cdc01fd6ea019a8b36140a49ed65a3..2765c641905fb61a253b75f039c0eea83bebf580 100644 (file)
--- a/ext/standard/tests/array/array_reverse_variation1.phpt
+++ b/ext/standard/tests/array/array_reverse_variation1.phpt
@@ -99,43 +99,43 @@ echo "Done";
 *** Testing array_reverse() : usage variations - unexpected values for 'array' argument ***
 
 -- Iteration 1 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt
index 26377d218f8fc66f23579bd8fd274ee0be0942e2..81dd55db62d15abd3108d1d467cb07c1a9925e62 100644 (file)
--- a/ext/standard/tests/array/array_search1.phpt
+++ b/ext/standard/tests/array/array_search1.phpt
@@ -22,7 +22,7 @@ echo "Done\n";
 Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_search() expects parameter 2 to be array, int given in %s on line %d
 NULL
 int(1)
 bool(false)

diff --git a/ext/standard/tests/array/array_search_errors.phpt b/ext/standard/tests/array/array_search_errors.phpt
index 0127f62cbcb9d13c9563877dc65a1001cf80a9da..90502b2f533e0330bbb8a024ae7684495157615a 100644 (file)
--- a/ext/standard/tests/array/array_search_errors.phpt
+++ b/ext/standard/tests/array/array_search_errors.phpt
@@ -39,6 +39,6 @@ NULL
 Warning: array_search() expects parameter 2 to be array, string given in %s on line %d
 NULL
 
-Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d
+Warning: array_search() expects parameter 2 to be array, int given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt
index 4c60a45fdf4fa43c3610129851023479344a942d..ddf1e122dc97362918d3f8ddf8198635b2c96a76 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation1.phpt
+++ b/ext/standard/tests/array/array_shift_variation1.phpt
@@ -98,22 +98,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_slice.phpt b/ext/standard/tests/array/array_slice.phpt
index b17fbce66f022e548926623c95da23c609ed9f7f..59d804350b5d9f4262c776b7f6e68133e2388575 100644 (file)
--- a/ext/standard/tests/array/array_slice.phpt
+++ b/ext/standard/tests/array/array_slice.phpt
@@ -103,7 +103,7 @@ Warning: array_slice() expects at most 4 parameters, 5 given in %s on line %d
 
 *** Output for scalar Argument ***
 
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
 
 *** Output for string Argument ***
 

diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt
index de6ebe1d451115b922bb30c29a19bd06b80f2e0d..db47feb9ff54821dac2c4cd37b40290059371bab 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation11.phpt
+++ b/ext/standard/tests/array/array_slice_variation11.phpt
@@ -103,22 +103,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt
index 792a1d732cbd7c856e9e680982be325072f52b46..1d3be8127dfbfb215382a0db0b31f02c596f3b66 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation2.phpt
+++ b/ext/standard/tests/array/array_slice_variation2.phpt
@@ -153,7 +153,7 @@ array(4) {
 
 -- Iteration 7 --
 
-Warning: array_slice() expects parameter 2 to be integer, float given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 8 --
@@ -250,32 +250,32 @@ array(4) {
 
 -- Iteration 16 --
 
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: array_slice() expects parameter 2 to be integer, array given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d
+Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --

diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt
index 0d4e8da421a5173c674720f422fcf3b2d0074d79..bdcd9913cfbe1e3efdeaaa55999e81f5d231ac3e 100644 (file)
--- a/ext/standard/tests/array/array_splice_errors.phpt
+++ b/ext/standard/tests/array/array_splice_errors.phpt
@@ -33,7 +33,7 @@ NULL
 Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: array_splice() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_splice() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_splice() expects parameter 1 to be array, object given in %s on line %d

diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt
index afe24a92e92f910bb7904390313b900b8fdb529e..fa0c244511c2bbfadb481684d17e7930d1b4d128 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation1.phpt
+++ b/ext/standard/tests/array/array_sum_variation1.phpt
@@ -86,19 +86,19 @@ echo "Done"
 *** Testing array_sum() : unexpected values for 'input' ***
 -- Iteration 1 --
 
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/array_unique_variation1.phpt b/ext/standard/tests/array/array_unique_variation1.phpt
index bac29276cce574b8729ee6f76150e17e989c4183..721905141372307beba4ce49faf0bc05e975cb49 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation1.phpt
+++ b/ext/standard/tests/array/array_unique_variation1.phpt
@@ -98,19 +98,19 @@ echo "Done";
 *** Testing array_unique() : Passing non array values to $input argument ***
 -- Iteration 1 --
 
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/array_unshift_variation1.phpt b/ext/standard/tests/array/array_unshift_variation1.phpt
index 67e572df603973fd7b762e3011e426c0f61debd8..440fa82648e645b6469ce7fd00b6ecec391bf9d7 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation1.phpt
+++ b/ext/standard/tests/array/array_unshift_variation1.phpt
@@ -119,38 +119,38 @@ echo "Done";
 *** Testing array_unshift() : unexpected values for $array argument ***
 
 -- Iteration 1 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(0)
 
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(0)
 
 -- Iteration 2 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(1)
 
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(1)
 
 -- Iteration 3 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(12345)
 
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(12345)
 
 -- Iteration 4 --
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(-2345)
 
-Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d
 NULL
 int(-2345)
 

diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt
index c8133dde35f220ede1f32b3a9634837c782fdf7d..82e5e04956af211fde1d0fd03c165b85a17122fc 100644 (file)
--- a/ext/standard/tests/array/array_values_errors.phpt
+++ b/ext/standard/tests/array/array_values_errors.phpt
@@ -28,7 +28,7 @@ NULL
 Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
 NULL
 
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_values() expects parameter 1 to be array, object given in %s on line %d

diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt
index 516beec6f6238250fb2a46e642343dfa51c82846..3ccdb5105af9f592f601b44d91dc8c2011bbd34c 100644 (file)
--- a/ext/standard/tests/array/array_values_variation1.phpt
+++ b/ext/standard/tests/array/array_values_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_values() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt
index 35ef02e15e4ee36e30f0b548e3ab4b9cc7bbc588..d3ef3750b036ba1ea4e3a508af045004bdfec9f2 100644 (file)
--- a/ext/standard/tests/array/array_walk.phpt
+++ b/ext/standard/tests/array/array_walk.phpt
@@ -34,7 +34,7 @@ echo "Done\n";
 Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d

diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt
index 65939d5eec3029a43f319b17f6ce11ed91243226..07f09c5263dc4e3d89e6ff0f5f3f318059bdda5f 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive1.phpt
@@ -34,7 +34,7 @@ echo "Done\n";
 Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d

diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
index 9ed67925985f2a8f752f1e6556db8c9a4177f950..25f60312ebf63a10ac76e6f5f0a089d372559982 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
@@ -95,31 +95,31 @@ echo "Done"
 *** Testing array_walk_recursive() : unexpected values for 'input' argument ***
 -- Iteration 1 --
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt
index a45ce4da03d39dfaa4a9aedf4fcc6cda351767a8..ad4ea26b24d9bfa40171b7dc303edc1c0f88c704 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_variation1.phpt
@@ -95,31 +95,31 @@ echo "Done"
 *** Testing array_walk() : unexpected values for 'input' argument ***
 -- Iteration 1 --
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
+Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index acf39e75e6be0d43fa49195a2b7877649c76b7db..f5b3b7d10e2e18491392a0134f3b2f4dcadbdab1 100644 (file)
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -99,55 +99,55 @@ echo "Done";
 -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 -- Iteration 2 --
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 -- Iteration 3 --
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 -- Iteration 4 --
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
 bool(false)
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt
index 1db1efe25d6cedc44f3a6d53fcc21c7d33433148..b716b65793d72a45eec1996f9d3d47dd43cadb0b 100644 (file)
--- a/ext/standard/tests/array/arsort_variation2.phpt
+++ b/ext/standard/tests/array/arsort_variation2.phpt
@@ -211,7 +211,7 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -223,7 +223,7 @@ array(3) {
 }
 -- Iteration 14 --
 
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -235,7 +235,7 @@ array(3) {
 }
 -- Iteration 15 --
 
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -247,7 +247,7 @@ array(3) {
 }
 -- Iteration 16 --
 
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -259,7 +259,7 @@ array(3) {
 }
 -- Iteration 17 --
 
-Warning: arsort() expects parameter 2 to be integer, object given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, object given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -271,7 +271,7 @@ array(3) {
 }
 -- Iteration 18 --
 
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -283,7 +283,7 @@ array(3) {
 }
 -- Iteration 19 --
 
-Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -295,7 +295,7 @@ array(3) {
 }
 -- Iteration 20 --
 
-Warning: arsort() expects parameter 2 to be integer, resource given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, resource given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
   [1]=>

diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 1713f12919bcf917b04885d9a7285f9680a16045..149d6c9181afc271691d864e92d18047f390f84a 100644 (file)
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -99,55 +99,55 @@ echo "Done";
 -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 2 --
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: asort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt
index ce2247f8943423136229df0c69d1e548fbe52585..f58663cdaacdd47b287979a176807b031704a7a1 100644 (file)
--- a/ext/standard/tests/array/asort_variation2.phpt
+++ b/ext/standard/tests/array/asort_variation2.phpt
@@ -211,7 +211,7 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -223,7 +223,7 @@ array(3) {
 }
 -- Iteration 14 --
 
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -235,7 +235,7 @@ array(3) {
 }
 -- Iteration 15 --
 
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -247,7 +247,7 @@ array(3) {
 }
 -- Iteration 16 --
 
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -259,7 +259,7 @@ array(3) {
 }
 -- Iteration 17 --
 
-Warning: asort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: asort() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -271,7 +271,7 @@ array(3) {
 }
 -- Iteration 18 --
 
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -283,7 +283,7 @@ array(3) {
 }
 -- Iteration 19 --
 
-Warning: asort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: asort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -295,7 +295,7 @@ array(3) {
 }
 -- Iteration 20 --
 
-Warning: asort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: asort() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 array(3) {
   [1]=>

diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index dcef3bd47b2b268d0135356b36a1e2f6f9f16ec2..edec9fbe3f7eba441321c887f1a0b573a470a1e7 100644 (file)
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -239,13 +239,13 @@ NULL
 
 Warning: Use of undefined constant ABCD - assumed 'ABCD' (this will throw an Error in a future version of PHP) in %s on line %d
 
-Warning: count() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: count() expects parameter 2 to be int, %s given in %s on line %d
 NULL
 
-Warning: count() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: count() expects parameter 2 to be int, %s given in %s on line %d
 NULL
 
-Warning: count() expects parameter 2 to be integer, %s given in %s on line %d
+Warning: count() expects parameter 2 to be int, %s given in %s on line %d
 NULL
 
 Done

diff --git a/ext/standard/tests/array/count_variation2.phpt b/ext/standard/tests/array/count_variation2.phpt
index b3d583866cad2865bf464ffe6cbe7fcf8e69daf5..86a2b0108fb1cabd3bdca236508f50079bf8636e 100644 (file)
--- a/ext/standard/tests/array/count_variation2.phpt
+++ b/ext/standard/tests/array/count_variation2.phpt
@@ -148,32 +148,32 @@ int(3)
 
 -- Iteration 16 --
 
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: count() expects parameter 2 to be integer, object given in %s on line %d
+Warning: count() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 22 --
@@ -184,6 +184,6 @@ int(3)
 
 -- Iteration 24 --
 
-Warning: count() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: count() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt
index 580f6dddc06260113b113efd7ecb3708d7670d2e..c90861170e040c60dd6072df8454968a28e943ef 100644 (file)
--- a/ext/standard/tests/array/current_variation1.phpt
+++ b/ext/standard/tests/array/current_variation1.phpt
@@ -99,22 +99,22 @@ fclose($fp);
 
 -- Iteration 1 --
 
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
+Warning: current() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt
index a99f90beb8d4401f4cf335f24ce12e85bc92ed2d..3dfe1e821ee2f8e012aa0acb97bda813986fe536 100644 (file)
--- a/ext/standard/tests/array/end.phpt
+++ b/ext/standard/tests/array/end.phpt
@@ -228,7 +228,7 @@ NULL
 Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: end() expects parameter 1 to be array, string given in %s on line %d

diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt
index 23d410ee1b5501d2b0c7efac60f0624386e6a784..fbda85ea012faa11a76bf14b4d19b5d426375914 100644 (file)
--- a/ext/standard/tests/array/end_64bit.phpt
+++ b/ext/standard/tests/array/end_64bit.phpt
@@ -229,7 +229,7 @@ NULL
 Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: end() expects parameter 1 to be array, string given in %s on line %d

diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt
index c5704faaf5414adc0deaea16a2141de3d00f6a1d..5e2179c7bf1662464e283229c4e9db5f49956f7f 100644 (file)
--- a/ext/standard/tests/array/end_variation1.phpt
+++ b/ext/standard/tests/array/end_variation1.phpt
@@ -99,22 +99,22 @@ fclose($fp);
 
 -- Iteration 1 --
 
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
+Warning: end() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt
index 96cad9d26218c31f389f25befba49f798b93aff6..d7e5fd7ac5ec71200a6d4c13d1856b6203052327 100644 (file)
--- a/ext/standard/tests/array/extract_error.phpt
+++ b/ext/standard/tests/array/extract_error.phpt
@@ -45,7 +45,7 @@ NULL
 Warning: extract(): Invalid extract type in %s on line %d
 NULL
 
-Warning: extract() expects parameter 1 to be array, integer given in %s on line %d
+Warning: extract() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 Warning: extract() expects parameter 1 to be array, string given in %s on line %d

diff --git a/ext/standard/tests/array/in_array_errors.phpt b/ext/standard/tests/array/in_array_errors.phpt
index 13a6cdb4ccfc54d135b9d2d9b394e5077872d914..193b976e9428e3252efa4920677b14522c47543f 100644 (file)
--- a/ext/standard/tests/array/in_array_errors.phpt
+++ b/ext/standard/tests/array/in_array_errors.phpt
@@ -40,6 +40,6 @@ NULL
 Warning: in_array() expects parameter 2 to be array, string given in %s on line %d
 NULL
 
-Warning: in_array() expects parameter 2 to be array, integer given in %s on line %d
+Warning: in_array() expects parameter 2 to be array, int given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt
index 42565ba8e40ee205a65b8671cce11dc23e0ed00d..cda0f67353fbe46ba4be7a5ac4a77af84ff9e164 100644 (file)
--- a/ext/standard/tests/array/key_variation1.phpt
+++ b/ext/standard/tests/array/key_variation1.phpt
@@ -99,22 +99,22 @@ fclose($fp);
 
 -- Iteration 1 --
 
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
+Warning: key() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index 7275a22c8b802291c532cd7922570de14642cbfe..81807dc5aedcebf34b42c81e6ed46f9375622f07 100644 (file)
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -97,55 +97,55 @@ echo "Done";
 -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 2 --
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt
index 1f0b331ce83339eacf4b61ed5d9504089069f577..fc113ff30a180b6f4cd6ff5932177a402cb63d4c 100644 (file)
--- a/ext/standard/tests/array/krsort_variation2.phpt
+++ b/ext/standard/tests/array/krsort_variation2.phpt
@@ -210,7 +210,7 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -222,7 +222,7 @@ array(3) {
 }
 -- Iteration 14 --
 
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -234,7 +234,7 @@ array(3) {
 }
 -- Iteration 15 --
 
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -246,7 +246,7 @@ array(3) {
 }
 -- Iteration 16 --
 
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -258,7 +258,7 @@ array(3) {
 }
 -- Iteration 17 --
 
-Warning: krsort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -270,7 +270,7 @@ array(3) {
 }
 -- Iteration 18 --
 
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -282,7 +282,7 @@ array(3) {
 }
 -- Iteration 19 --
 
-Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -294,7 +294,7 @@ array(3) {
 }
 -- Iteration 20 --
 
-Warning: krsort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: krsort() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 array(3) {
   [10]=>

diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index a22954db7829f6ac03a38f72f15ef133a3f9517d..ab70d8e346596e84ef781fd75c1d8f7cdd033148 100644 (file)
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -97,55 +97,55 @@ echo "Done";
 -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 2 --
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt
index 830181d9932a4461768d64f5fe10ce2b4dedb028..fb1371a9850615535ee3e1769883c47e8911ae66 100644 (file)
--- a/ext/standard/tests/array/ksort_variation2.phpt
+++ b/ext/standard/tests/array/ksort_variation2.phpt
@@ -210,7 +210,7 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -222,7 +222,7 @@ array(3) {
 }
 -- Iteration 14 --
 
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -234,7 +234,7 @@ array(3) {
 }
 -- Iteration 15 --
 
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -246,7 +246,7 @@ array(3) {
 }
 -- Iteration 16 --
 
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -258,7 +258,7 @@ array(3) {
 }
 -- Iteration 17 --
 
-Warning: ksort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -270,7 +270,7 @@ array(3) {
 }
 -- Iteration 18 --
 
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -282,7 +282,7 @@ array(3) {
 }
 -- Iteration 19 --
 
-Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [10]=>
@@ -294,7 +294,7 @@ array(3) {
 }
 -- Iteration 20 --
 
-Warning: ksort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: ksort() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 array(3) {
   [10]=>

diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt
index cd4938b6954b17a4b96217c557865dd0603d527f..df84857dc11d645cc0fdae2c8077b951e998d044 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation1.phpt
+++ b/ext/standard/tests/array/natcasesort_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt
index e8a2530e42ae3b4e8b33815120bc536a0a22a026..d4ca4d71ce45eb6f0c498727dc89cbd588b37013 100644 (file)
--- a/ext/standard/tests/array/next_variation1.phpt
+++ b/ext/standard/tests/array/next_variation1.phpt
@@ -98,22 +98,22 @@ fclose($fp);
 
 -- Iteration 1 --
 
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
+Warning: next() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/prev_variation1.phpt b/ext/standard/tests/array/prev_variation1.phpt
index aacb57d9c6d7b3a3f6fcf34f86d5375230d970f4..b5b1bfe8759cac3e89265300f9d33b9fd017a6ff 100644 (file)
--- a/ext/standard/tests/array/prev_variation1.phpt
+++ b/ext/standard/tests/array/prev_variation1.phpt
@@ -98,22 +98,22 @@ fclose($fp);
 
 -- Iteration 1 --
 
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: prev() expects parameter 1 to be array, integer given in %s on line %d
+Warning: prev() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt
index d4b3212ef2833a2d8428877166217cf1360e4275..73ab993424d1567dac01252135fc8d871d4f2046 100644 (file)
--- a/ext/standard/tests/array/reset_variation1.phpt
+++ b/ext/standard/tests/array/reset_variation1.phpt
@@ -98,22 +98,22 @@ fclose($fp);
 
 -- Iteration 1 --
 
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
+Warning: reset() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt
index 86d14818602aa297f0d06070a745cb3345924527..c70f85786afc6510a407f5773f82e9ce7989ca50 100644 (file)
--- a/ext/standard/tests/array/rsort_variation1.phpt
+++ b/ext/standard/tests/array/rsort_variation1.phpt
@@ -106,70 +106,70 @@ echo "Done";
 -- Iteration 1 --
 Flag = default:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_REGULAR:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_NUMERIC:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_STRING:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 2 --
 Flag = default:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_REGULAR:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_NUMERIC:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_STRING:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 Flag = default:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_REGULAR:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_NUMERIC:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_STRING:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 4 --
 Flag = default:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_REGULAR:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_NUMERIC:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 Flag = SORT_STRING:
 
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: rsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 5 --
 Flag = default:

diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt
index d91b09c1ca2cc7f481ff7bbc50434f8b1f2b2a31..8b4a5074e4c60dd032d59eb61f5a5ae006aaffec 100644 (file)
--- a/ext/standard/tests/array/rsort_variation2.phpt
+++ b/ext/standard/tests/array/rsort_variation2.phpt
@@ -337,7 +337,7 @@ array(5) {
 
 -- Iteration 16 --
 
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(5) {
   [0]=>
@@ -354,7 +354,7 @@ array(5) {
 
 -- Iteration 17 --
 
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(5) {
   [0]=>
@@ -371,7 +371,7 @@ array(5) {
 
 -- Iteration 18 --
 
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(5) {
   [0]=>
@@ -388,7 +388,7 @@ array(5) {
 
 -- Iteration 19 --
 
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(5) {
   [0]=>
@@ -405,7 +405,7 @@ array(5) {
 
 -- Iteration 20 --
 
-Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(5) {
   [0]=>
@@ -422,7 +422,7 @@ array(5) {
 
 -- Iteration 21 --
 
-Warning: rsort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 array(5) {
   [0]=>
@@ -469,7 +469,7 @@ array(5) {
 
 -- Iteration 24 --
 
-Warning: rsort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: rsort() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 array(5) {
   [0]=>

diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt
index 6ecbd387fe0eee7be3828b8ed3a91fc78b6dbbb9..cf316ed7bbe07430f5a0799a886096883da8bbbd 100644 (file)
--- a/ext/standard/tests/array/shuffle_variation1.phpt
+++ b/ext/standard/tests/array/shuffle_variation1.phpt
@@ -98,22 +98,22 @@ echo "Done";
 
 -- Iteration 1 --
 
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 -- Iteration 2 --
 
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 -- Iteration 3 --
 
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
+Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt
index 675017fd1fb59586a575920cd77e70eeb92e7e44..d608dbbe1b15bc0f5524b95892ddf14bbb7005f3 100644 (file)
--- a/ext/standard/tests/array/sizeof_variation5.phpt
+++ b/ext/standard/tests/array/sizeof_variation5.phpt
@@ -105,28 +105,28 @@ int(6)
 int(6)
 -- Iteration 16 --
 
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 int(6)
 -- Iteration 21 --
 
-Warning: sizeof() expects parameter 2 to be integer, object given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: sizeof() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: sizeof() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index c9d0958da3d18648b2d2cadace706f7e863f91f5..f3ec8781a186a14f008be3f81f4b040433e4d6d3 100644 (file)
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -98,55 +98,55 @@ echo "Done";
 -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 2 --
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: sort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt
index 48ffa1975ac31cf3a72fe8e920b9dc3fd58566cc..3ee1784edc16cbaa2536a9e644242ef2b09989be 100644 (file)
--- a/ext/standard/tests/array/sort_variation2.phpt
+++ b/ext/standard/tests/array/sort_variation2.phpt
@@ -214,7 +214,7 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -226,7 +226,7 @@ array(3) {
 }
 -- Iteration 14 --
 
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -238,7 +238,7 @@ array(3) {
 }
 -- Iteration 15 --
 
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -250,7 +250,7 @@ array(3) {
 }
 -- Iteration 16 --
 
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -262,7 +262,7 @@ array(3) {
 }
 -- Iteration 17 --
 
-Warning: sort() expects parameter 2 to be integer, object given in %s on line %d
+Warning: sort() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -274,7 +274,7 @@ array(3) {
 }
 -- Iteration 18 --
 
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -286,7 +286,7 @@ array(3) {
 }
 -- Iteration 19 --
 
-Warning: sort() expects parameter 2 to be integer, string given in %s on line %d
+Warning: sort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [0]=>
@@ -298,7 +298,7 @@ array(3) {
 }
 -- Iteration 20 --
 
-Warning: sort() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: sort() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 array(3) {
   [0]=>

diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt
index ce20666c96436192ed5297f29656dee5a059a44b..ee7e67629e66c186efaa0c9dbb0aa9f800350c6a 100644 (file)
--- a/ext/standard/tests/array/uasort_variation1.phpt
+++ b/ext/standard/tests/array/uasort_variation1.phpt
@@ -99,19 +99,19 @@ echo "Done"
 *** Testing uasort() : unexpected values for 'array_arg' ***
 -- Iteration 1 --
 
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: uasort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 -- Iteration 5 --
 

diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt
index fdb85c2efb06224a7e5d3e5876c4df5460aed59b..1708bf096f08a5304c658d018b5be95ae0378c40 100644 (file)
--- a/ext/standard/tests/array/uksort_variation1.phpt
+++ b/ext/standard/tests/array/uksort_variation1.phpt
@@ -99,22 +99,22 @@ foreach($inputs as $key =>$value) {
 
 --int 0--
 
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
 NULL
 
 --int 1--
 
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
 NULL
 
 --int 12345--
 
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
 NULL
 
 --int -12345--
 
-Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d
+Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d
 NULL
 
 --float 10.5--

diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt
index d793089410a6eb8926e001b537177c5a94460cd6..52d7abcf523d3e2633cd20a5705f422c591ceb65 100644 (file)
--- a/ext/standard/tests/array/usort_variation1.phpt
+++ b/ext/standard/tests/array/usort_variation1.phpt
@@ -113,22 +113,22 @@ fclose($fp);
 
 -- Iteration 1 --
 
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: usort() expects parameter 1 to be array, integer given in %s on line %d
+Warning: usort() expects parameter 1 to be array, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
index 9364a3e0a55eedb29fa76572689cc9d04198b3f7..a057ee4380a8810164cb9835011e5870737e5f0a 100644 (file)
--- a/ext/standard/tests/assert/assert04.phpt
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -40,7 +40,7 @@ Warning: assert() expects at most 2 parameters, 3 given in %s on line %d
 
 Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d
 
-Warning: assert_options() expects parameter 1 to be integer, string given in %s on line %d
+Warning: assert_options() expects parameter 1 to be int, string given in %s on line %d
 
 Warning: assert(): assert(0) failed in %s on line %d
 

diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt
index 6d7248c8ec3b90803a7326d2e951db8a30ed3906..ae59afb40b844630f7ea59b64c4c8df851885e1f 100644 (file)
--- a/ext/standard/tests/assert/assert_error1.phpt
+++ b/ext/standard/tests/assert/assert_error1.phpt
@@ -37,7 +37,7 @@ var_dump($rc = assert('aa=sd+as+safsafasfaçsafçsafç'));
 Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: assert_options() expects parameter 1 to be integer, string given in %s on line %d
+Warning: assert_options() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Warning: assert() expects at most 2 parameters, 3 given in %s on line %d

diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt
index 3987968e90452d15e953ae11ddccb1df424c9e1d..ea12df562c7417e443006e7953d09d4cb825190f 100644 (file)
--- a/ext/standard/tests/class_object/get_class_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_variation_001.phpt
@@ -3,9 +3,9 @@ Test get_class() function : usage variations  - passing unexpected types.
 --FILE--
 <?php
 /* Prototype  : proto string get_class([object object])
- * Description: Retrieves the class name 
+ * Description: Retrieves the class name
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_class() : usage variations ***\n";
@@ -82,22 +82,22 @@ Notice: Undefined variable: unset_var in %sget_class_variation_001.php on line 6
 
 Arg value: 0 (type: integer)
 
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
 bool(false)
 
 Arg value: 1 (type: integer)
 
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
 bool(false)
 
 Arg value: 12345 (type: integer)
 
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
 bool(false)
 
 Arg value: -2345 (type: integer)
 
-Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d
+Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d
 bool(false)
 
 Arg value: 10.5 (type: double)

diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
index 6121d0d9796af6ded87d3ce9ca05c03125c68005..98b5deca1a70c0a1de2d46a90cfb3adf8c2a688a 100644 (file)
--- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
@@ -80,22 +80,22 @@ Notice: Undefined variable: unset_var in %s on line 59
 
 Arg value 0 
 
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt
index bf8dbbff9c7a21356ebcb6a169f0c0e5197c2483..7885a01f543b73f2301a62ca55941e78a748bdf9 100644 (file)
--- a/ext/standard/tests/dir/closedir_variation1.phpt
+++ b/ext/standard/tests/dir/closedir_variation1.phpt
@@ -92,22 +92,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
index a2d482f43ea285e7f0beb36dcf3014cd24cd5da9..7b6dbde9d82c0d5d4aa861dc827f47a84d61224e 100644 (file)
--- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
@@ -116,19 +116,19 @@ rmdir($directory);
 *** Testing dir() : unexpected values for $context argument ***
 
 -- Iteration 1 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt
index 24f429f1875dade3a2990f5133a7786575c0b6e2..609f0691cf54d57f4f62a404f8ccf2bc70360f78 100644 (file)
--- a/ext/standard/tests/dir/dir_variation2.phpt
+++ b/ext/standard/tests/dir/dir_variation2.phpt
@@ -110,19 +110,19 @@ rmdir($directory);
 *** Testing dir() : unexpected values for $context argument ***
 
 -- Iteration 1 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
-Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: dir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
index 3d54638e0dfaa3b7ed653c36a27623bdbd36c1cf..5e5201782a1469849d25a1ba07c4b22ac3f34e92 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
@@ -120,22 +120,22 @@ rmdir($path);
 
 -- Iteration 1 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt
index 7728aa37579d04adbd26d1f2cd07fa310dd4450b..80b90d5ecba3bc2460d6fda62c656e9ae3530f1f 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation2.phpt
+++ b/ext/standard/tests/dir/opendir_variation2.phpt
@@ -114,22 +114,22 @@ rmdir($path);
 
 -- Iteration 1 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d
+Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt
index 2815e8d26ff3c34891f44a37419d3b3381817a34..d2f138649e54e0e90c38bb44d53f1635f75adf6f 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation1.phpt
+++ b/ext/standard/tests/dir/readdir_variation1.phpt
@@ -90,22 +90,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt
index b4f52bbab1c714d027a7387024893aa500d80923..e7e3d7d7b11eb20f1fc9e5e61966db7e57b60f0d 100644 (file)
--- a/ext/standard/tests/dir/rewinddir_variation1.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation1.phpt
@@ -91,22 +91,22 @@ foreach($inputs as $input) {
 
 -- Iteration 1 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/scandir_variation2-mb.phpt b/ext/standard/tests/dir/scandir_variation2-mb.phpt
index 9e9df9780241a0e0a38619a109030e7b1982e667..7ee58ad4503872617b9f417ffc0fc6f1a59d1f33 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation2-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt
@@ -229,37 +229,37 @@ array(2) {
 
 -- Iteration 16 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 23 --
@@ -280,6 +280,6 @@ array(2) {
 
 -- Iteration 25 --
 
-Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt
index bed9512e777ffbbe91828c16c69e8634c9feb82e..a3ee88a3be70cb203e0ecf5b77ecea9a2bf0c8fa 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation2.phpt
+++ b/ext/standard/tests/dir/scandir_variation2.phpt
@@ -229,37 +229,37 @@ array(2) {
 
 -- Iteration 16 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 23 --
@@ -280,6 +280,6 @@ array(2) {
 
 -- Iteration 25 --
 
-Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
index c2b2ed5a179eecd93f471a8a940e70f1dab4cd4a..4ad753c6b2a251bf35a1d7cd206c1378a3b0097d 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
@@ -114,22 +114,22 @@ rmdir($dir);
 
 -- Iteration 1 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt
index 5be4466bfcf3d9b2f284f8ef02cd1a73d65b23ad..74f84cd90c545a7ab2e2f5cff071f2da7abff762 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation3.phpt
+++ b/ext/standard/tests/dir/scandir_variation3.phpt
@@ -108,22 +108,22 @@ rmdir($dir);
 
 -- Iteration 1 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 2 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 3 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 4 --
 
-Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d
+Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d
 NULL
 
 -- Iteration 5 --

diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt
index 7c5d2c838b16f26ed94c4b95e2a45ce4517688f3..f40932645b3169e764c227f9d8b763138b5868e6 100644 (file)
--- a/ext/standard/tests/file/006_variation2.phpt
+++ b/ext/standard/tests/file/006_variation2.phpt
@@ -149,38 +149,38 @@ bool(true)
 43567
 -- Iteration 12 --
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 43567
 -- Iteration 13 --
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 43567
 -- Iteration 14 --
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 43567
 -- Iteration 15 --
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 103567
 
-Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d
+Warning: chmod() expects parameter 2 to be int, string given in %s on line %d
 NULL
 43567
 *** Done ***

diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index 80cc657d5d8f6c8869bf4526b566df6cada1ff60..b8b8fd5cbf6e84ed97479ef50455108d5a8ea645 100644 (file)
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -118,10 +118,10 @@ bool(false)
 Warning: fopen(10): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
-Warning: fclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fclose() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
-Warning: feof() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: feof() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt
index 1fa5ad53ff8f43fa8dc93aeb0d53e3f60fa266dc..d5a691fa37a5a0140ed51d916cdd439164e3eca1 100644 (file)
--- a/ext/standard/tests/file/chmod_variation4.phpt
+++ b/ext/standard/tests/file/chmod_variation4.phpt
@@ -129,19 +129,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -163,35 +163,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - chmod() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt
index a334d8fea1442c5081966ad37cc4f560f9afc21f..dadbdccf5a703c471a7b2367768948c3470fe3a8 100644 (file)
--- a/ext/standard/tests/file/fflush_error.phpt
+++ b/ext/standard/tests/file/fflush_error.phpt
@@ -67,7 +67,7 @@ Warning: fflush() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: fflush() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fflush() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fgetc_error.phpt b/ext/standard/tests/file/fgetc_error.phpt
index 6b2f49e38c5943ee022699f5f52dcf40dbdba868..19615269ccfc2f7a615e3affb973ca42993f100b 100644 (file)
--- a/ext/standard/tests/file/fgetc_error.phpt
+++ b/ext/standard/tests/file/fgetc_error.phpt
@@ -52,7 +52,7 @@ Warning: fgetc() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: fgetc() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetc() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fgetcsv_error.phpt b/ext/standard/tests/file/fgetcsv_error.phpt
index daaa733c9dc31569023447b74b9d47ee6c25e39f..ad04c72c3e0576178d41e3cae2673461cf48d3a9 100644 (file)
--- a/ext/standard/tests/file/fgetcsv_error.phpt
+++ b/ext/standard/tests/file/fgetcsv_error.phpt
@@ -60,10 +60,10 @@ Warning: fgetcsv() expects parameter 1 to be resource, string given in %s on lin
 NULL
 -- Iteration 2 --
 
-Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
-Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt
index 5a62252b782b9f291ac7113b3e490db8573a1978..c5f0aabc28d556725eaa6569ecf17ce046f17229 100644 (file)
--- a/ext/standard/tests/file/fgets_error.phpt
+++ b/ext/standard/tests/file/fgets_error.phpt
@@ -80,7 +80,7 @@ Warning: fgets() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: fgets() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgets() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt
index 2640d27900725bc6491749683598d98cd627a958..cf0afb2e0977dc00c09d3998636acbe5fd27565a 100644 (file)
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -79,7 +79,7 @@ Warning: fgetss() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: fgetss() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fgetss() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt
index 31189672d30029da2cfdd550024ea1993cd97f41..1e7d51237a867df4412347a7bbbd5a6e5cb17e22 100644 (file)
--- a/ext/standard/tests/file/file_error.phpt
+++ b/ext/standard/tests/file/file_error.phpt
@@ -36,7 +36,7 @@ NULL
 Warning: file() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
-Warning: file() expects parameter 2 to be integer, string given in %s on line %d
+Warning: file() expects parameter 2 to be int, string given in %s on line %d
 NULL
 array(0) {
 }

diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt
index ecceb28093caa5f394f8eadff5835101331695df..6a6f5317dcb743de4ae9050941c0a89249976df1 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation4.phpt
@@ -131,19 +131,19 @@ fclose($fileRes);
 *** Testing file_get_contents() : usage variation ***
 
 --int 0--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --int 1--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --int 12345--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --int -12345--
-Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --float 10.5--

diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
index 26ba22a47e96b6b4ec03233ef866430d759d9f09..e4d610c035941272bd77268708a1a5517736feac 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
@@ -152,30 +152,30 @@ Error: 2 - file_get_contents(): Failed to seek to position -22 in the stream, %s
 bool(false)
 
 --float 12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d)
 NULL
 
 --float -12.3456789000e10--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d)
 NULL
 
 --float .5--
 string(%d) "contents read"
 
 --empty array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -197,35 +197,35 @@ string(12) "ontents read"
 string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
index 66f51895a9f3756591b583161dfffbe18faa338b..8e23c6579113dcb0af773f251644404a852c2d14 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
@@ -162,19 +162,19 @@ bool(false)
 string(%d) "contents read"
 
 --empty array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -196,35 +196,35 @@ string(12) "ontents read"
 string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt
index 25a122e1bca00f3d147038ab6439445d52c996d1..f253957709463f7271905df5ad8b14a1d9c23baa 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation6.phpt
@@ -142,19 +142,19 @@ bool(false)
 string(%d) ""
 
 --empty array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -176,35 +176,35 @@ string(%d) "c"
 string(%d) ""
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 5 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt
index bf454ca08cb339b69bc3bc2a22efc0b3dee7098e..fc7a021c50172734df25b6cf6ec858f1ba5dca70 100644 (file)
--- a/ext/standard/tests/file/file_put_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation3.phpt
@@ -130,19 +130,19 @@ fclose($fileRes);
 *** Testing file_put_contents() : usage variation ***
 
 --int 0--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
 NULL
 
 --int 1--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
 NULL
 
 --int 12345--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
 NULL
 
 --int -12345--
-Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d)
 NULL
 
 --float 10.5--

diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt
index f61c3c257ed3713c41de93893d8d202fb6d7032e..250621ef73fcba466b55a76cfe487f07c90e0968 100644 (file)
--- a/ext/standard/tests/file/file_variation3.phpt
+++ b/ext/standard/tests/file/file_variation3.phpt
@@ -151,19 +151,19 @@ array(3) {
 }
 
 --empty array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -239,35 +239,35 @@ array(3) {
 }
 
 --empty string DQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - file() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt
index 04ddc91600bac657efdd9a5fcd4bfa2947369228..cc9ac156d590212ed2f3f39a6e8dbbbc9c2c6acb 100644 (file)
--- a/ext/standard/tests/file/file_variation4.phpt
+++ b/ext/standard/tests/file/file_variation4.phpt
@@ -129,19 +129,19 @@ unlink($filename);
 *** Testing file() : usage variation ***
 
 --int 0--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --int 1--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --int 12345--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --int -12345--
-Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d)
 NULL
 
 --float 10.5--

diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index 81e42f3fe65b605895184406952847638d741b1e..216e70c246aba9a84b2041c0748ebd7fa4240d8a 100644 (file)
--- a/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@ -75,23 +75,23 @@ Warning: flock(): Illegal operation argument in %s on line %d
 bool(false)
 
 --- Iteration 4 ---
-Warning: flock() expects parameter 2 to be integer, array given in %s on line %d
+Warning: flock() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 --- Iteration 5 ---
-Warning: flock() expects parameter 2 to be integer, array given in %s on line %d
+Warning: flock() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 --- Iteration 6 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --- Iteration 7 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 --- Iteration 8 ---
-Warning: flock() expects parameter 2 to be integer, string given in %s on line %d
+Warning: flock() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Warning: flock(): supplied resource is not a valid stream resource in %s on line %d

diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt
index 4bd5b2a446e32be0bf92615896de29998798dea5..34a2be381167ab8a1544c6b0a6c5d184e162f5b7 100644 (file)
--- a/ext/standard/tests/file/fopen_variation4.phpt
+++ b/ext/standard/tests/file/fopen_variation4.phpt
@@ -130,19 +130,19 @@ fclose($fileresource);
 *** Testing fopen() : usage variation ***
 
 --int 0--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
 bool(false)
 
 --int 1--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d)
 bool(false)
 
 --float 10.5--

diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt
index f952cdbc8c5394d4a5cb4d452ee739be6d8e63a9..c1a5a37b2771593c27fa5c8c496878620cb2e743 100644 (file)
--- a/ext/standard/tests/file/fpassthru_variation1.phpt
+++ b/ext/standard/tests/file/fpassthru_variation1.phpt
@@ -88,22 +88,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
 Arg value 1 
 
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
 Arg value 12345 
 
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
 Arg value -2345 
 
-Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
 Arg value 10.5 

diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt
index 1e6ba94edd4701d299a67151070bd1c47ac7a117..c0445ec1e23bfdc662cd6792891063b084c92937 100644 (file)
--- a/ext/standard/tests/file/fputcsv_error.phpt
+++ b/ext/standard/tests/file/fputcsv_error.phpt
@@ -63,7 +63,7 @@ NULL
 Warning: fputcsv() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: fputcsv() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fputcsv() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 4917d2ef47f12e6bf4be1b65f325987c74433841..0a694f385992fb367ecc34ea027240a90704018b 100644 (file)
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -81,7 +81,7 @@ Warning: fread() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: fread() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fread() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index 9a3a2d515427754f2b3ea64c974d10cc97c97524..fcecb64dcaf853b0062a19a2dfb8348f60412217 100644 (file)
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -72,7 +72,7 @@ Warning: fseek() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: fseek() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fseek() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
index e83c398f4b0249149ddce2f067b8f391e138fc4d..6838e1b07464c2ab1e710fa8227acb165da4533a 100644 (file)
--- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
@@ -68,7 +68,7 @@ Warning: ftell() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: ftell() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ftell() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
index 6f2511d49c15d149296350e9a9c4fc8d2d5d4793..ef9e349391619ceb86192d5beda9ed8375bf9dae 100644 (file)
--- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
@@ -68,7 +68,7 @@ Warning: rewind() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: rewind() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: rewind() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt
index 914c6d0e42a4a38a1773fb980481638bb1d5f9b7..dda12bc704bb2736eed0fba66ce97028f03947bf 100644 (file)
--- a/ext/standard/tests/file/fseek_variation1.phpt
+++ b/ext/standard/tests/file/fseek_variation1.phpt
@@ -105,31 +105,31 @@ int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 int(0)
 
 Arg value Array 
 
-Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 int(0)
 
@@ -159,31 +159,31 @@ int(0)
 
 Arg value  
 
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value  
 
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value string 
 
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value string 
 
-Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 int(0)
 
 Arg value testClass 
 
-Warning: fseek() expects parameter 2 to be integer, object given in %s on line %d
+Warning: fseek() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 int(0)
 

diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt
index cb88c03525bed2d5cb9600e6d629db45af715801..48fe1802a8fd748710fcfc24edc9f757ad450cf7 100644 (file)
--- a/ext/standard/tests/file/fseek_variation2.phpt
+++ b/ext/standard/tests/file/fseek_variation2.phpt
@@ -128,25 +128,25 @@ int(3)
 
 Arg value  
 
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 int(3)
 
 Arg value  
 
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 int(3)
 
 Arg value string 
 
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 int(3)
 
 Arg value string 
 
-Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d
+Warning: fseek() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 int(3)
 

diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt
index 6f98da81e749c9dd1d67ac27792386719a420829..6478b393776b3e0b275d3e5a6db3a4e35fa7d60a 100644 (file)
--- a/ext/standard/tests/file/fstat_variation5.phpt
+++ b/ext/standard/tests/file/fstat_variation5.phpt
@@ -17,15 +17,15 @@ foreach ( $variation_array as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
-Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 ===DONE===
\ No newline at end of file

diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt
index 3ccd32a2d40324cf3a6e4e2e5fd6251066e93ae7..a44d269addb470dbc7b541d9d616c37c5a330aea 100644 (file)
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -94,7 +94,7 @@ Warning: ftruncate() expects parameter 1 to be resource, string given in %s on l
 bool(false)
 -- Iteration 2 --
 
-Warning: ftruncate() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: ftruncate() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt
index 119302a13a8aa913cf3f81f26b2a91f0ac8728b5..9d330d4c1229c2ffc3188f1ef3990dcc0d8f724e 100644 (file)
--- a/ext/standard/tests/file/fwrite_error.phpt
+++ b/ext/standard/tests/file/fwrite_error.phpt
@@ -92,7 +92,7 @@ Warning: fwrite() expects parameter 1 to be resource, string given in %s on line
 bool(false)
 -- Iteration 2 --
 
-Warning: fwrite() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: fwrite() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 

diff --git a/ext/standard/tests/file/glob_error.phpt b/ext/standard/tests/file/glob_error.phpt
index b65c5fe5282951b0c3fe25e192e5b00aed61bd9c..527b70e0691ef53867312e6673cc51d5cfb6611a 100644 (file)
--- a/ext/standard/tests/file/glob_error.phpt
+++ b/ext/standard/tests/file/glob_error.phpt
@@ -45,9 +45,9 @@ NULL
 
 -- Testing glob() with invalid arguments --
 
-Warning: glob() expects parameter 2 to be integer, string given in %s on line %d
+Warning: glob() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: glob() expects parameter 2 to be integer, string given in %s on line %d
+Warning: glob() expects parameter 2 to be int, string given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt
index 67316f2c1482ce78ded33e96baad5d88918beae7..0b461d2635797d231acf335f5578d75667deb176 100644 (file)
--- a/ext/standard/tests/file/mkdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_variation2.phpt
@@ -130,16 +130,16 @@ Directory created
 Directory created
 
 --empty array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
 
 --int indexed array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
 
 --associative array--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
 
 --nested arrays--
-Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d)
 
 --uppercase NULL--
 Directory created
@@ -160,28 +160,28 @@ Directory created
 Directory created
 
 --empty string DQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
 
 --empty string SQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
 
 --string DQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
 
 --string SQ--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
 
 --mixed case string--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
 
 --heredoc--
-Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d)
 
 --instance of classWithToString--
-Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, object given, %s(%d)
 
 --instance of classWithoutToString--
-Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - mkdir() expects parameter 2 to be int, object given, %s(%d)
 
 --undefined var--
 Directory created

diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt
index a866f8d16f691b6201bcedbb716d9649dad028de..0975c8d986fdbb01ca5d92d12263eed643ac2375 100644 (file)
--- a/ext/standard/tests/file/mkdir_variation4.phpt
+++ b/ext/standard/tests/file/mkdir_variation4.phpt
@@ -128,16 +128,16 @@ fclose($fileRes);
 *** Testing mkdir() : usage variation ***
 
 --int 0--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
 
 --int 1--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
 
 --int 12345--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
 
 --int -12345--
-Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d)
+Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d)
 
 --float 10.5--
 Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d)

diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt
index ea7c2d77a8b1acba19c5c0a1ed1b232aebebbdb0..84c82433693c1e57f0aa255e82329d1c3a2746fc 100644 (file)
--- a/ext/standard/tests/file/pathinfo_variation2.phpt
+++ b/ext/standard/tests/file/pathinfo_variation2.phpt
@@ -126,19 +126,19 @@ string(%d) %s
 string(%d) %s
 
 --empty array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ string(17) "/usr/include/arpa"
 string(0) ""
 
 --empty string DQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - pathinfo() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt
index a6ffd0630f160934b4850cb1591247e0dc1689aa..b6397474634be6fe19b8043f993bf5734ff30ea3 100644 (file)
--- a/ext/standard/tests/file/pclose_variation1.phpt
+++ b/ext/standard/tests/file/pclose_variation1.phpt
@@ -114,19 +114,19 @@ foreach($inputs as $key =>$value) {
 *** Testing pclose() : usage variation ***
 
 --int 0--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
 bool(false)
 
 --int 1--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d)
+Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d)
 bool(false)
 
 --float 10.5--

diff --git a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
index e41d6b113e703d3bf309350a9d6adde1e632338b..3c4439e5cb338dbffff4c337a7ebda91c21c6a4a 100644 (file)
--- a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
+++ b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
@@ -56,7 +56,7 @@ bool(false)
 Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
 
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
 --- Done ---'abc.txt' is not recognized as an internal or external command,

diff --git a/ext/standard/tests/file/popen_pclose_error-win32.phpt b/ext/standard/tests/file/popen_pclose_error-win32.phpt
index 9f9593c64bf56b5a6e2c2205e71cc9b8b5ca14d1..1d059828d0c9384d4f876743a28faaac7ba240c0 100644 (file)
--- a/ext/standard/tests/file/popen_pclose_error-win32.phpt
+++ b/ext/standard/tests/file/popen_pclose_error-win32.phpt
@@ -51,7 +51,7 @@ bool(false)
 Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
 
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
 

diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt
index 72ce73411c06e38e022344fa4c31c5b9c0c5e8d8..8b851f13bbd72e0989df27e8d33155e9c225ce12 100644 (file)
--- a/ext/standard/tests/file/popen_pclose_error.phpt
+++ b/ext/standard/tests/file/popen_pclose_error.phpt
@@ -50,7 +50,7 @@ bool(false)
 Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
 
-Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d
 bool(false)
 
 --- Done ---

diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt
index 9ee5a2f3c791ab301d5f515e77ba5f806ca2f99b..1a7b5830c039df772a9b89b5cde7dd4f37af46b4 100644 (file)
--- a/ext/standard/tests/file/readfile_variation4.phpt
+++ b/ext/standard/tests/file/readfile_variation4.phpt
@@ -134,19 +134,19 @@ fclose($fileRes);
 *** Testing readfile() : usage variation ***
 
 --int 0--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
 file not read
 
 --int 1--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
 file not read
 
 --int 12345--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
 file not read
 
 --int -12345--
-Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d)
 file not read
 
 --float 10.5--

diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt
index 5c81757ed80cf84e0172087af06267aa3572e778..17fa5192bc92a25c9c8667d6cb5dd87eadaacba7 100644 (file)
--- a/ext/standard/tests/file/rename_variation10.phpt
+++ b/ext/standard/tests/file/rename_variation10.phpt
@@ -132,19 +132,19 @@ fclose($fileRes);
 *** Testing rename() : usage variation ***
 
 --int 0--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
 bool(false)
 
 --int 1--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d)
+Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d)
 bool(false)
 
 --float 10.5--

diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt
index 6053018f42d74b97f57b953fbfbec5125be11215..7d1a5e2f24599bf032be78d3e67aeb2620aa053e 100644 (file)
--- a/ext/standard/tests/file/rmdir_variation2.phpt
+++ b/ext/standard/tests/file/rmdir_variation2.phpt
@@ -123,19 +123,19 @@ fclose($fileres);
 *** Testing rmdir() : usage variation ***
 
 --int 0--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --int 1--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --float 10.5--

diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
index 445ef3fb1cac1111d4e6b976e5954007a9bd81b6..b3f8817656d41c37405abdde8e976d588f16e173 100644 (file)
--- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt
index d6760f92b72f133c099c4f1b6f3ca92819a4ab13..8c7db0905b40b1693a1f47d7862804617c78b513 100644 (file)
--- a/ext/standard/tests/file/touch_variation3-win32.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt
index 1ba1fc44cba5d01bc5ac04eaf2ffb6e8d807c798..00203c8f3687356aa25162afc9662e27c533b633 100644 (file)
--- a/ext/standard/tests/file/touch_variation3.phpt
+++ b/ext/standard/tests/file/touch_variation3.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt
index 0b12173cc1866b68b5e3dc792d9fdc5dc76d8ed5..2f1eda71c6ef94584b54feb52161ccfe57d42fdf 100644 (file)
--- a/ext/standard/tests/file/touch_variation4-win32.phpt
+++ b/ext/standard/tests/file/touch_variation4-win32.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt
index 0bbb4a7a3be12ba873922c29e7eeb35d5b260e9d..6467f5dcdf5477b1612787c3806126435895df3a 100644 (file)
--- a/ext/standard/tests/file/touch_variation4.phpt
+++ b/ext/standard/tests/file/touch_variation4.phpt
@@ -126,19 +126,19 @@ bool(true)
 bool(true)
 
 --empty array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ bool(true)
 bool(true)
 
 --empty string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/umask_variation3.phpt b/ext/standard/tests/file/umask_variation3.phpt
index 4ce074f81dbbe17c674711905979b08458726965..843dbe0dc4c8f861171abcd48369323c13e22880 100644 (file)
--- a/ext/standard/tests/file/umask_variation3.phpt
+++ b/ext/standard/tests/file/umask_variation3.phpt
@@ -144,22 +144,22 @@ int(0)
 int(0)
 
 --empty array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
 bool(false)
 int(63)
 
 --int indexed array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
 bool(false)
 int(63)
 
 --associative array--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
 bool(false)
 int(63)
 
 --nested arrays--
-Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d)
 bool(false)
 int(63)
 
@@ -188,42 +188,42 @@ int(0)
 int(0)
 
 --empty string DQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
 bool(false)
 int(63)
 
 --empty string SQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
 bool(false)
 int(63)
 
 --string DQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
 bool(false)
 int(63)
 
 --string SQ--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
 bool(false)
 int(63)
 
 --mixed case string--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
 bool(false)
 int(63)
 
 --heredoc--
-Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d)
 bool(false)
 int(63)
 
 --instance of classWithToString--
-Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, object given, %s(%d)
 bool(false)
 int(63)
 
 --instance of classWithoutToString--
-Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - umask() expects parameter 1 to be int, object given, %s(%d)
 bool(false)
 int(63)
 

diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt
index f165e4e9c2d665708e38746502d92d77c0816276..d68db852fd2db16d047805be9abe73a85b701aac 100644 (file)
--- a/ext/standard/tests/file/unlink_variation7.phpt
+++ b/ext/standard/tests/file/unlink_variation7.phpt
@@ -125,19 +125,19 @@ fclose($fileRes);
 *** Testing unlink() : usage variation different types for context ***
 
 --int 0--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --int 1--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --int 12345--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --int -12345--
-Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d)
+Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d)
 bool(false)
 
 --float 10.5--

diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
index 5ab5e461bf8790a1b6d548a7f68eb4edbb6a49e4..df95186ec90597ef7b86fa847263655f0ee922ac 100644 (file)
--- a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
+++ b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
@@ -109,19 +109,19 @@ foreach($inputs as $key =>$value) {
 *** Testing call_user_func_array() : usage variation ***
 
 --int 0--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
 NULL
 
 --int 1--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
 NULL
 
 --int 12345--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
 NULL
 
 --int -12345--
-Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d)
+Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d)
 NULL
 
 --float 10.5--

diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
index 635bd898164f0773cc4ce0126fddb79e2ac48046..b0a6a80199f7aaa281db9000c5354691eaf0d363 100644 (file)
--- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
@@ -44,7 +44,7 @@ NULL
 
 -- int 10 --
 
-Warning: get_resource_type() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: get_resource_type() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- float 10.5 --

diff --git a/ext/standard/tests/general_functions/getrusage.phpt b/ext/standard/tests/general_functions/getrusage.phpt
index e89f9e68a7a4bf59a605497f560500916f7f47d4..e9fc8c6f6e641cb731c3a7843a2b287c9c9c4477 100644 (file)
--- a/ext/standard/tests/general_functions/getrusage.phpt
+++ b/ext/standard/tests/general_functions/getrusage.phpt
@@ -18,6 +18,6 @@ string(5) "array"
 string(5) "array"
 string(5) "array"
 
-Warning: getrusage() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, array given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt
index 7ac99655b8e2c472334ff4d45332f289ad44ac37..a40a43449a6cfbc1a55a4d1208f460271e09ecc3 100644 (file)
--- a/ext/standard/tests/general_functions/getrusage_error.phpt
+++ b/ext/standard/tests/general_functions/getrusage_error.phpt
@@ -54,17 +54,17 @@ Warning: getrusage() expects at most 1 parameter, 2 given in %s on line %d
 
 -- Testing getrusage() function with invalid argument - non-numeric STRING--
 
-Warning: getrusage() expects parameter 1 to be integer, string given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, string given in %s on line %d
 
 -- Testing getrusage() function with invalid argument - ARRAY--
 
-Warning: getrusage() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, array given in %s on line %d
 
 -- Testing getrusage() function with invalid argument - OBJECT --
 
-Warning: getrusage() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, object given in %s on line %d
 
 -- Testing getrusage() function with invalid argument - RESOURCE --
 
-Warning: getrusage() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: getrusage() expects parameter 1 to be int, resource given in %s on line %d
 ===DONE===

diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
index add7b52debc5358d6f9b75d43a8c3eb8d7f027df..3073f664305587f3a2bbe6628b76a6d632ff89c7 100644 (file)
--- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
@@ -25,16 +25,16 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
-Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
-Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d
 NULL
 bool(false)
 string(%d) "%s"
 
-Warning: getservbyport() expects parameter 1 to be integer, object given in %s on line %d
+Warning: getservbyport() expects parameter 1 to be int, object given in %s on line %d
 NULL

diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
index b082fbf5f5b5add23535bb2da8cfb87d55455d90..59252b5e2c9e0172498f3ce9f8b283e808d52e52 100644 (file)
--- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
@@ -8,11 +8,11 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test the basic functionalities of settype() & gettype() functions.
-   Use the gettype() to get the type of regular data and use settype() 
+   Use the gettype() to get the type of regular data and use settype()
    to change its type to other types */
 
 /* function to handle catchable errors */
@@ -22,8 +22,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 echo "**** Testing gettype() and settype() functions ****\n";
 
@@ -89,24 +89,24 @@ foreach ($values as $value) {
 
 echo "\n*** Testing settype(): basic operations ***\n";
 foreach ($types as $type) {
-  echo "\n-- Setting type of data to $type --\n"; 
+  echo "\n-- Setting type of data to $type --\n";
   $loop_count = 1;
   foreach ($values as $var) {
      echo "-- Iteration $loop_count --\n"; $loop_count ++;
      // set to new type
      var_dump( settype($var, $type) );
-    
-     // dump the var 
+
+     // dump the var
      var_dump( $var );
-  
-     // check the new type 
-     var_dump( gettype($var) );  
+
+     // check the new type
+     var_dump( gettype($var) );
   }
 }
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 **** Testing gettype() and settype() functions ****
 
 *** Testing gettype(): basic operations ***

diff --git a/ext/standard/tests/general_functions/intval_variation2.phpt b/ext/standard/tests/general_functions/intval_variation2.phpt
index f601c4b8954bb82ce07cbdbde1bd30f8176f3f32..b27ace406329ec117859a258b529d7c11e953a75 100644 (file)
--- a/ext/standard/tests/general_functions/intval_variation2.phpt
+++ b/ext/standard/tests/general_functions/intval_variation2.phpt
@@ -115,30 +115,30 @@ int(1)
 int(1)
 
 --float 12.3456789000e10--
-Error: 2 - intval() expects parameter 2 to be integer, float given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, float given, %s(%d)
 NULL
 
 --float -12.3456789000e10--
-Error: 2 - intval() expects parameter 2 to be integer, float given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, float given, %s(%d)
 NULL
 
 --float .5--
 int(1)
 
 --empty array--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ int(1)
 int(1)
 
 --empty string DQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - intval() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - intval() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - intval() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/general_functions/phpcredits.phpt b/ext/standard/tests/general_functions/phpcredits.phpt
index 01dd160033bc291a70e7d18d3b1caebc0107b1ea..044232570e9947a90674080eb5cc7cb2d5d3c82e 100644 (file)
--- a/ext/standard/tests/general_functions/phpcredits.phpt
+++ b/ext/standard/tests/general_functions/phpcredits.phpt
@@ -41,7 +41,7 @@ PHP Quality Assurance Team
 %a
 bool(true)
 
-Warning: phpcredits() expects parameter 1 to be integer, array given in %sphpcredits.php on line 4
+Warning: phpcredits() expects parameter 1 to be int, array given in %sphpcredits.php on line 4
 NULL
 --
 PHP Credits

diff --git a/ext/standard/tests/general_functions/phpcredits2.phpt b/ext/standard/tests/general_functions/phpcredits2.phpt
index d32784b4e9f6889b1822f5c22c1787bf06c14bff..9966f23a96f661b496d67edde87d2babdb8ad199 100644 (file)
--- a/ext/standard/tests/general_functions/phpcredits2.phpt
+++ b/ext/standard/tests/general_functions/phpcredits2.phpt
@@ -19,7 +19,7 @@ var_dump(phpcredits(CREDITS_GROUP));
 <!DOCTYPE %a>%s</html>
 bool(true)
 
-Warning: phpcredits() expects parameter 1 to be integer, array given in %sphpcredits2.php on line 4
+Warning: phpcredits() expects parameter 1 to be int, array given in %sphpcredits2.php on line 4
 NULL
 --
 <h1>PHP Credits</h1>

diff --git a/ext/standard/tests/general_functions/phpinfo.phpt b/ext/standard/tests/general_functions/phpinfo.phpt
index aeb7ee4bd109ea3bd1cf27ce511bacd98f4a9a33..a805876aab4c9576be1e551e719e5f2911db02ab 100644 (file)
--- a/ext/standard/tests/general_functions/phpinfo.phpt
+++ b/ext/standard/tests/general_functions/phpinfo.phpt
@@ -63,7 +63,7 @@ PHP License
 bool(true)
 --
 
-Warning: phpinfo() expects parameter 1 to be integer, array given in %sphpinfo.php on line 5
+Warning: phpinfo() expects parameter 1 to be int, array given in %sphpinfo.php on line 5
 NULL
 --
 phpinfo()

diff --git a/ext/standard/tests/general_functions/phpinfo2.phpt b/ext/standard/tests/general_functions/phpinfo2.phpt
index 50353d5e8083224372acb2233cb6c92f27e58259..f422f923d9b3a4930534650c74e7cb1f3e6a0862 100644 (file)
--- a/ext/standard/tests/general_functions/phpinfo2.phpt
+++ b/ext/standard/tests/general_functions/phpinfo2.phpt
@@ -21,7 +21,7 @@ var_dump(phpinfo(INFO_LICENSE));
 %a</html>bool(true)
 --
 
-Warning: phpinfo() expects parameter 1 to be integer, array given in %sphpinfo2.php on line 5
+Warning: phpinfo() expects parameter 1 to be int, array given in %sphpinfo2.php on line 5
 NULL
 --
 <!DOCTYPE %s>

diff --git a/ext/standard/tests/general_functions/proc_nice_variation1.phpt b/ext/standard/tests/general_functions/proc_nice_variation1.phpt
index 5ab2e893395e5b749f3d92e2ae68b6e306991e71..4aa4b47801750446add04f8aa8ecb18680dfc8dc 100644 (file)
--- a/ext/standard/tests/general_functions/proc_nice_variation1.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation1.phpt
@@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) {
 --EXPECTF--
 *** Test substituting argument 1 with array values ***
 
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
 bool(false)
 
-Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/general_functions/proc_nice_variation3.phpt b/ext/standard/tests/general_functions/proc_nice_variation3.phpt
index 5ac7e366df7543fdbf147cde2459720016a81f6c..c5626dd50ff8d7e79acfc8ae6e48b58362696de9 100644 (file)
--- a/ext/standard/tests/general_functions/proc_nice_variation3.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation3.phpt
@@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) {
 bool(true)
 bool(true)
 
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 bool(true)
 bool(true)

diff --git a/ext/standard/tests/general_functions/proc_nice_variation6.phpt b/ext/standard/tests/general_functions/proc_nice_variation6.phpt
index 593cf10b4d77de0d1fc04febe2d70dd3ca072438..a3aff167ed77250e3a232f1817d5fc655906d8e1 100644 (file)
--- a/ext/standard/tests/general_functions/proc_nice_variation6.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation6.phpt
@@ -50,7 +50,7 @@ foreach ( $variation_array as $var ) {
 ?>
 --EXPECTF--
 *** Test substituting argument 1 with object values ***
-Error: 2 - proc_nice() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - proc_nice() expects parameter 1 to be int, object given, %s(%d)
 bool(false)
-Error: 2 - proc_nice() expects parameter 1 to be integer, object given, %s(%d)
+Error: 2 - proc_nice() expects parameter 1 to be int, object given, %s(%d)
 bool(false)

diff --git a/ext/standard/tests/general_functions/proc_nice_variation7.phpt b/ext/standard/tests/general_functions/proc_nice_variation7.phpt
index b6c70965196eff55814cdf770f04aeb0c196072c..368d2b10794f18955b1962e4604fa73c49ba6d4f 100644 (file)
--- a/ext/standard/tests/general_functions/proc_nice_variation7.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation7.phpt
@@ -36,14 +36,14 @@ foreach ( $variation_array as $var ) {
 --EXPECTF--
 *** Test substituting argument 1 with string values ***
 
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
 bool(false)
 
-Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d
+Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/general_functions/rand.phpt b/ext/standard/tests/general_functions/rand.phpt
index f314200e6543fb7a8f4269e2a68f22baaaa7a53e..93faf3ac16eca6fac921e41ae7f820ac4e8aab43 100644 (file)
--- a/ext/standard/tests/general_functions/rand.phpt
+++ b/ext/standard/tests/general_functions/rand.phpt
@@ -45,12 +45,12 @@ int(%d)
 NULL
 NULL
 
-Warning: srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: srand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 NULL
 NULL
 
-Warning: mt_srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 int(%d)
 

diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt
index 91666af42ddbaeedfadad6528110b0f895fce904..356d4e9a1e4294f0f1633a65e73a91b72f87043f 100644 (file)
--- a/ext/standard/tests/image/image_type_to_extension.phpt
+++ b/ext/standard/tests/image/image_type_to_extension.phpt
@@ -94,7 +94,7 @@ Constant: IMAGETYPE_WEBP
 Warning: image_type_to_extension() expects parameter 2 to be boolean, array given in %s on line %d
 bool(false)
 
-Warning: image_type_to_extension() expects parameter 1 to be integer, object given in %s on line %d
+Warning: image_type_to_extension() expects parameter 1 to be int, object given in %s on line %d
 bool(false)
 bool(false)
 

diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
index ccff8645e6017f639ee479103758789a344ab944..2c67338e41292611275b39cd303b2774d46378d8 100644 (file)
--- a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
@@ -95,12 +95,12 @@ string(24) "application/octet-stream"
 
 -- Iteration 6 --
 
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, array given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 7 --
 
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, array given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 8 --
@@ -123,27 +123,27 @@ string(24) "application/octet-stream"
 
 -- Iteration 14 --
 
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 15 --
 
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 16 --
 
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 17 --
 
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: image_type_to_mime_type() expects parameter 1 to be integer, object given in %s on line %d
+Warning: image_type_to_mime_type() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 19 --

diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt
index 96bc596747192f00883eea84880cdde4b01e7cd9..14593ffe76d94b886468500e26cdbdcefb364a05 100644 (file)
--- a/ext/standard/tests/math/base_convert_variation2.phpt
+++ b/ext/standard/tests/math/base_convert_variation2.phpt
@@ -153,32 +153,32 @@ bool(false)
 
 -- Iteration 17 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: base_convert() expects parameter 2 to be integer, array given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --

diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt
index c5cf390f19b12730d4d9351bb63d34dbe646c468..bd4f052ca6f58692c7e4c38834bbb9ca973fce8f 100644 (file)
--- a/ext/standard/tests/math/base_convert_variation3.phpt
+++ b/ext/standard/tests/math/base_convert_variation3.phpt
@@ -153,32 +153,32 @@ bool(false)
 
 -- Iteration 17 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: base_convert() expects parameter 3 to be integer, array given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d
+Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --

diff --git a/ext/standard/tests/math/mt_rand_error.phpt b/ext/standard/tests/math/mt_rand_error.phpt
index 888e7d2bc501ec5ebf58c78b31005422156f9ea3..87f5c3641df386f928f631cfe9e785a443559c56 100644 (file)
--- a/ext/standard/tests/math/mt_rand_error.phpt
+++ b/ext/standard/tests/math/mt_rand_error.phpt
@@ -14,6 +14,6 @@ Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line 2
 
 Warning: mt_rand() expects exactly 2 parameters, 3 given in %s on line 3
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line 4
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line 4
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line 5
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line 5

diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt
index f2adb6d39de65bffb9ded6febb30ffd1073ad7b7..38df739bafaa87878567858dd223721fbb767810 100644 (file)
--- a/ext/standard/tests/math/mt_rand_variation1.phpt
+++ b/ext/standard/tests/math/mt_rand_variation1.phpt
@@ -138,37 +138,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mt_rand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mt_rand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -179,6 +179,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: mt_rand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: mt_rand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt
index 3c4be806d697a76f1c74cf1051d0f1ae509bd7c0..f49d1293f7ad42e76dd85190c97c09b72abd369b 100644 (file)
--- a/ext/standard/tests/math/mt_rand_variation2.phpt
+++ b/ext/standard/tests/math/mt_rand_variation2.phpt
@@ -113,7 +113,7 @@ int(%i)
 
 -- Iteration 8 --
 
-Warning: mt_rand() expects parameter 2 to be integer, float given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mt_rand() expects parameter 2 to be integer, array given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mt_rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: mt_rand() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: mt_rand() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/standard/tests/math/mt_srand_error.phpt b/ext/standard/tests/math/mt_srand_error.phpt
index aa2fc75b749a0b22e7965e557f673b9b636aa78d..0858a99e83b331e5e87eda8e6015349788227fba 100644 (file)
--- a/ext/standard/tests/math/mt_srand_error.phpt
+++ b/ext/standard/tests/math/mt_srand_error.phpt
@@ -10,7 +10,7 @@ var_dump(mt_srand("500ABC"));
 Warning: mt_srand() expects at most 2 parameters, 3 given in %s on line 2
 NULL
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line 3
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line 3
 NULL
 
 Notice: A non well formed numeric value encountered in %s on line 4

diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt
index 7409767f91073fcdd79748d65548094073463ad8..891152b8a8be17a1b942bc3008e145e1f5b9706b 100644 (file)
--- a/ext/standard/tests/math/mt_srand_variation1.phpt
+++ b/ext/standard/tests/math/mt_srand_variation1.phpt
@@ -113,7 +113,7 @@ NULL
 
 -- Iteration 8 --
 
-Warning: mt_srand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ NULL
 
 -- Iteration 17 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: mt_srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: mt_srand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ NULL
 
 -- Iteration 26 --
 
-Warning: mt_srand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: mt_srand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/standard/tests/math/rand_error.phpt b/ext/standard/tests/math/rand_error.phpt
index f4a868959a1a5389b663ffc93ab54279b5f16129..876f79b029b07ed7f1a659d86a7dbcd450f0a79f 100644 (file)
--- a/ext/standard/tests/math/rand_error.phpt
+++ b/ext/standard/tests/math/rand_error.phpt
@@ -13,6 +13,6 @@ Warning: rand() expects exactly 2 parameters, 1 given in %s on line 2
 
 Warning: rand() expects exactly 2 parameters, 3 given in %s on line 3
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line 4
+Warning: rand() expects parameter 1 to be int, string given in %s on line 4
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line 5
+Warning: rand() expects parameter 2 to be int, string given in %s on line 5

diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt
index f14ada87f58bab566e35daa1f3923d8c9d80b7e5..d688524b6e2643cfa1a453bbc89ae317eaf4e721 100644 (file)
--- a/ext/standard/tests/math/rand_variation1.phpt
+++ b/ext/standard/tests/math/rand_variation1.phpt
@@ -113,7 +113,7 @@ int(%i)
 
 -- Iteration 8 --
 
-Warning: rand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: rand() expects parameter 1 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: rand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: rand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: rand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: rand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: rand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: rand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: rand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt
index 824b47b0cb56b60c3608519a0151ff25bdb72ca4..ed9c9a61c35e237ac070cebfeb1b30030655d731 100644 (file)
--- a/ext/standard/tests/math/rand_variation2.phpt
+++ b/ext/standard/tests/math/rand_variation2.phpt
@@ -113,7 +113,7 @@ int(%i)
 
 -- Iteration 8 --
 
-Warning: rand() expects parameter 2 to be integer, float given in %s on line %d
+Warning: rand() expects parameter 2 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ int(%i)
 
 -- Iteration 17 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: rand() expects parameter 2 to be integer, array given in %s on line %d
+Warning: rand() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: rand() expects parameter 2 to be integer, string given in %s on line %d
+Warning: rand() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: rand() expects parameter 2 to be integer, object given in %s on line %d
+Warning: rand() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ int(%i)
 
 -- Iteration 26 --
 
-Warning: rand() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: rand() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt
index f199ff7eb613506c5cba96e1d938d1aaf32f9bd9..aec4c7f27b086b2ec44b172d891a2b99582135b8 100644 (file)
--- a/ext/standard/tests/math/round_variation2.phpt
+++ b/ext/standard/tests/math/round_variation2.phpt
@@ -141,37 +141,37 @@ float(123)
 
 -- Iteration 17 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: round() expects parameter 2 to be integer, array given in %s on line %d
+Warning: round() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: round() expects parameter 2 to be integer, string given in %s on line %d
+Warning: round() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: round() expects parameter 2 to be integer, object given in %s on line %d
+Warning: round() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -182,6 +182,6 @@ float(123)
 
 -- Iteration 26 --
 
-Warning: round() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: round() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 ===Done===
\ No newline at end of file

diff --git a/ext/standard/tests/math/srand_error.phpt b/ext/standard/tests/math/srand_error.phpt
index ca9e4b939cd1614b644883f9f246e5837a5c5187..92140af82a576549b6fcd1a91991f25037191602 100644 (file)
--- a/ext/standard/tests/math/srand_error.phpt
+++ b/ext/standard/tests/math/srand_error.phpt
@@ -24,7 +24,7 @@ var_dump(srand("500ABC"));
 Warning: srand() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Notice: A non well formed numeric value encountered in %s on line %d

diff --git a/ext/standard/tests/math/srand_variation1.phpt b/ext/standard/tests/math/srand_variation1.phpt
index 522a8f5536e54ab2ca11952d34418ab7ff45de98..3a681e647a9220ae6570747e8bb53000fa24a016 100644 (file)
--- a/ext/standard/tests/math/srand_variation1.phpt
+++ b/ext/standard/tests/math/srand_variation1.phpt
@@ -113,7 +113,7 @@ NULL
 
 -- Iteration 8 --
 
-Warning: srand() expects parameter 1 to be integer, float given in %s on line %d
+Warning: srand() expects parameter 1 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 9 --
@@ -142,37 +142,37 @@ NULL
 
 -- Iteration 17 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: srand() expects parameter 1 to be integer, array given in %s on line %d
+Warning: srand() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: srand() expects parameter 1 to be integer, string given in %s on line %d
+Warning: srand() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: srand() expects parameter 1 to be integer, object given in %s on line %d
+Warning: srand() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 -- Iteration 24 --
@@ -183,6 +183,6 @@ NULL
 
 -- Iteration 26 --
 
-Warning: srand() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: srand() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/standard/tests/misc/syslog_parameters.phpt b/ext/standard/tests/misc/syslog_parameters.phpt
index b925df18910ec9d342717bf5f945964ccb40cee2..f3551c044e8d7b9583a2bc294994d6e300d6128a 100644 (file)
--- a/ext/standard/tests/misc/syslog_parameters.phpt
+++ b/ext/standard/tests/misc/syslog_parameters.phpt
@@ -13,10 +13,10 @@ closelog('Doesnt take any parameters');
 --EXPECTF--
 Warning: openlog() expects exactly 3 parameters, 0 given in %s on line %d
 
-Warning: openlog() expects parameter 2 to be integer, string given in %s on line %d
+Warning: openlog() expects parameter 2 to be int, string given in %s on line %d
 
 Warning: syslog() expects exactly 2 parameters, 0 given in %s on line %d
 
-Warning: syslog() expects parameter 1 to be integer, string given in %s on line %d
+Warning: syslog() expects parameter 1 to be int, string given in %s on line %d
 
 Warning: closelog() expects exactly 0 parameters, 1 given in %s on line %d

diff --git a/ext/standard/tests/misc/time_nanosleep_error1.phpt b/ext/standard/tests/misc/time_nanosleep_error1.phpt
index 3bbd330e2cfe6398fe79c5943826bf7b941b3301..58a71e9e4c94156ecc91200836a174658bdcbbf4 100644 (file)
--- a/ext/standard/tests/misc/time_nanosleep_error1.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error1.phpt
@@ -11,4 +11,4 @@ $nano = time_nanosleep('A', 100000);
 
 ?>
 --EXPECTF--
-Warning: time_nanosleep() expects parameter 1 to be integer, string given in %s.php on line %d
+Warning: time_nanosleep() expects parameter 1 to be int, string given in %s.php on line %d

diff --git a/ext/standard/tests/misc/time_nanosleep_error2.phpt b/ext/standard/tests/misc/time_nanosleep_error2.phpt
index 72d84c42b62828196aec7a1424586cb100746a3e..db1e13f6412751de9b80f4b07c0ca92d183b8448 100644 (file)
--- a/ext/standard/tests/misc/time_nanosleep_error2.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error2.phpt
@@ -11,4 +11,4 @@ $nano = time_nanosleep(2, 'B');
 
 ?>
 --EXPECTF--
-Warning: time_nanosleep() expects parameter 2 to be integer, string given in %s.php on line %d
+Warning: time_nanosleep() expects parameter 2 to be int, string given in %s.php on line %d

diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt
index abe50e719287a1048412839386bcdae1faf9c4b1..6c00824410f3bfc9a82fcab9cd007542b16bde70 100644 (file)
--- a/ext/standard/tests/network/ip.phpt
+++ b/ext/standard/tests/network/ip.phpt
@@ -61,9 +61,9 @@ Warning: long2ip() expects exactly 1 parameter, 0 given in %sip.php on line %d
 NULL
 string(13) "255.254.82.80"
 
-Warning: long2ip() expects parameter 1 to be integer, string given in %sip.php on line %d
+Warning: long2ip() expects parameter 1 to be int, string given in %sip.php on line %d
 NULL
 
-Warning: long2ip() expects parameter 1 to be integer, array given in %sip.php on line %d
+Warning: long2ip() expects parameter 1 to be int, array given in %sip.php on line %d
 NULL
 Done

diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt
index 45a48ca9dfcf1eacca82a856ea6657ebe46b755f..7dc726e8c2abeb53cd6cb07dfc76432f371ca8c0 100644 (file)
--- a/ext/standard/tests/network/ip_x86_64.phpt
+++ b/ext/standard/tests/network/ip_x86_64.phpt
@@ -61,9 +61,9 @@ Warning: long2ip() expects exactly 1 parameter, 0 given in %sip_x86_64.php on li
 NULL
 string(13) "255.254.82.80"
 
-Warning: long2ip() expects parameter 1 to be integer, string given in %sip_x86_64.php on line %d
+Warning: long2ip() expects parameter 1 to be int, string given in %sip_x86_64.php on line %d
 NULL
 
-Warning: long2ip() expects parameter 1 to be integer, array given in %sip_x86_64.php on line %d
+Warning: long2ip() expects parameter 1 to be int, array given in %sip_x86_64.php on line %d
 NULL
 Done

diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt
index e7336712beb166364913fec7b2e8fa53b113048e..6fc4f57ee47327eb055a14a87ef4d13a854d5731 100644 (file)
--- a/ext/standard/tests/network/long2ip_variation1.phpt
+++ b/ext/standard/tests/network/long2ip_variation1.phpt
@@ -126,19 +126,19 @@ string(15) "255.255.255.246"
 string(7) "0.0.0.0"
 
 --empty array--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
 NULL
 
 --int indexed array--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
 NULL
 
 --associative array--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
 NULL
 
 --nested arrays--
-Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d)
 NULL
 
 --uppercase NULL--
@@ -160,35 +160,35 @@ string(7) "0.0.0.1"
 string(7) "0.0.0.0"
 
 --empty string DQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
 NULL
 
 --string DQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
 NULL
 
 --string SQ--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
 NULL
 
 --mixed case string--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
 NULL
 
 --heredoc--
-Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - long2ip() expects parameter 1 to be integer, object given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, object given, %slong2ip_variation1.php(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - long2ip() expects parameter 1 to be integer, object given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, object given, %slong2ip_variation1.php(%d)
 NULL
 
 --undefined var--
@@ -198,6 +198,6 @@ string(7) "0.0.0.0"
 string(7) "0.0.0.0"
 
 --resource--
-Error: 2 - long2ip() expects parameter 1 to be integer, resource given, %slong2ip_variation1.php(%d)
+Error: 2 - long2ip() expects parameter 1 to be int, resource given, %slong2ip_variation1.php(%d)
 NULL
 ===DONE===

diff --git a/ext/standard/tests/password/password_hash_error.phpt b/ext/standard/tests/password/password_hash_error.phpt
index 8dc954649dba297a0455c448ad81ee1f89a54fb0..5f576c31221068a8ad01deac39588a369d93f922 100644 (file)
--- a/ext/standard/tests/password/password_hash_error.phpt
+++ b/ext/standard/tests/password/password_hash_error.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: password_hash() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: password_hash() expects parameter 2 to be integer, array given in %s on line %d
+Warning: password_hash() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Warning: password_hash(): Unknown password hashing algorithm: 19 in %s on line %d

diff --git a/ext/standard/tests/password/password_needs_rehash_error.phpt b/ext/standard/tests/password/password_needs_rehash_error.phpt
index b5d8691775513db3acae87a3334e2ba8251577e8..65766cb3fe982224b74939b5a3ab7765e51d67ba 100644 (file)
--- a/ext/standard/tests/password/password_needs_rehash_error.phpt
+++ b/ext/standard/tests/password/password_needs_rehash_error.phpt
@@ -22,7 +22,7 @@ NULL
 Warning: password_needs_rehash() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: password_needs_rehash() expects parameter 2 to be integer, string given in %s on line %d
+Warning: password_needs_rehash() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Warning: password_needs_rehash() expects parameter 1 to be string, array given in %s on line %d

diff --git a/ext/standard/tests/streams/stream_set_chunk_size.phpt b/ext/standard/tests/streams/stream_set_chunk_size.phpt
index ce272519c4c96fd33e53f46baa7e536ebd224cdb..cd0ad072344f4d5be32bb6613d1c4fa71e87c0ba 100644 (file)
--- a/ext/standard/tests/streams/stream_set_chunk_size.phpt
+++ b/ext/standard/tests/streams/stream_set_chunk_size.phpt
@@ -89,5 +89,5 @@ bool(false)
 Warning: stream_set_chunk_size(): The chunk size must be a positive integer, given -1 in %s on line %d
 bool(false)
 
-Warning: stream_set_chunk_size() expects parameter 2 to be integer, array given in %s on line %d
+Warning: stream_set_chunk_size() expects parameter 2 to be int, array given in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt
index d62e44a56e50f4c70c81413ceb404eb78f80be08..63c9a8df426d222cd48a4a31bb49921596c9692d 100644 (file)
--- a/ext/standard/tests/streams/stream_set_timeout_error.phpt
+++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt
@@ -72,7 +72,7 @@ bool(false)
 
 -- Testing stream_set_timeout() function with an invalid stream --
 
-Warning: stream_set_timeout() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: stream_set_timeout() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 -- Testing stream_set_timeout() function with a stream that does not support timeouts --

diff --git a/ext/standard/tests/strings/bug54322.phpt b/ext/standard/tests/strings/bug54322.phpt
index 4623a9a2ad543b4c4e37e65aa83a868e7f29f31a..6b8d10daa71e927a1f49b73115f5a3eca09c375b 100644 (file)
--- a/ext/standard/tests/strings/bug54322.phpt
+++ b/ext/standard/tests/strings/bug54322.phpt
@@ -6,5 +6,5 @@ var_dump(
 get_html_translation_table(NAN, 0, "UTF-8") > 0
 );
 --EXPECTF--
-Warning: get_html_translation_table() expects parameter 1 to be integer, float given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, float given in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt
index 9240ed3ea0611b0c53c13bdb649259fc745d41b7..195e2d2605c7816986f32bd116cffdc63a912fcb 100644 (file)
--- a/ext/standard/tests/strings/chunk_split_variation2.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation2.phpt
@@ -100,7 +100,7 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
 bool(false)
 -- Iteration 3 --
 
-Warning: chunk_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: chunk_split() expects parameter 2 to be int, float given in %s on line %d
 NULL
 -- Iteration 4 --
 
@@ -112,23 +112,23 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
 bool(false)
 -- Iteration 6 --
 
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 7 --
 
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 8 --
 
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 9 --
 
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 10 --
 
-Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 11 --
 
@@ -152,23 +152,23 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
 bool(false)
 -- Iteration 17 --
 
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 18 --
 
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 19 --
 
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 20 --
 
-Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 21 --
 
-Warning: chunk_split() expects parameter 2 to be integer, object given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, object given in %schunk_split_variation2.php on line %d
 NULL
 -- Iteration 22 --
 
@@ -180,6 +180,6 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
 bool(false)
 -- Iteration 24 --
 
-Warning: chunk_split() expects parameter 2 to be integer, resource given in %schunk_split_variation2.php on line %d
+Warning: chunk_split() expects parameter 2 to be int, resource given in %schunk_split_variation2.php on line %d
 NULL
 ===DONE===

diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt
index e53b1e3240955a200ce2d555941895c52dd55d0b..332aecdb967c8d238a7fbf5c599c87bfe599dc81 100644 (file)
Binary files a/ext/standard/tests/strings/chunk_split_variation5.phpt and b/ext/standard/tests/strings/chunk_split_variation5.phpt differ

diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt
index 3dfa33a2eb7e4c9b871e21c6246d201ee7b184fe..e97b1e903637a2bb5ee9fd5b2b0179fa68ad0d37 100644 (file)
--- a/ext/standard/tests/strings/chunk_split_variation8.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation8.phpt
@@ -83,7 +83,7 @@ It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test
 chunk_split():::"
 -- Iteration 7 --
 
-Warning: chunk_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: chunk_split() expects parameter 2 to be int, float given in %s on line %d
 NULL
 -- Iteration 8 --
 

diff --git a/ext/standard/tests/strings/count_chars_variation2.phpt b/ext/standard/tests/strings/count_chars_variation2.phpt
index 7896ff1d73b0e51218fccb13033909c293c39dce..fb3305bbbdc5567299a73753c8103d4e81571480 100644 (file)
--- a/ext/standard/tests/strings/count_chars_variation2.phpt
+++ b/ext/standard/tests/strings/count_chars_variation2.phpt
@@ -117,11 +117,11 @@ Warning: count_chars(): Unknown mode in %s on line %d
 bool(false)
 -- Iteration 11 --
 
-Warning: count_chars() expects parameter 2 to be integer, array given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 12 --
 
-Warning: count_chars() expects parameter 2 to be integer, array given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 13 --
 bool(true)
@@ -137,11 +137,11 @@ bool(true)
 bool(true)
 -- Iteration 19 --
 
-Warning: count_chars() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 20 --
 
-Warning: count_chars() expects parameter 2 to be integer, string given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 21 --
 
@@ -155,7 +155,7 @@ Warning: count_chars(): Unknown mode in %s on line %d
 bool(false)
 -- Iteration 23 --
 
-Warning: count_chars() expects parameter 2 to be integer, object given in %s on line %d
+Warning: count_chars() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 -- Iteration 24 --
 bool(true)

diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt
index 37574e11a4bfd33644217bf08c0cc2b7ab2e3910..b13905884449ac23d973b937d0acea2572d5c064 100644 (file)
--- a/ext/standard/tests/strings/explode_variation3.phpt
+++ b/ext/standard/tests/strings/explode_variation3.phpt
@@ -177,15 +177,15 @@ array(6) {
 }
 -- Iteration 10 --
 
-Warning: explode() expects parameter 3 to be integer, array given in %s on line %d
+Warning: explode() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: explode() expects parameter 3 to be integer, array given in %s on line %d
+Warning: explode() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: explode() expects parameter 3 to be integer, array given in %s on line %d
+Warning: explode() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 13 --
 array(1) {
@@ -219,11 +219,11 @@ array(1) {
 }
 -- Iteration 19 --
 
-Warning: explode() expects parameter 3 to be integer, object given in %s on line %d
+Warning: explode() expects parameter 3 to be int, object given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: explode() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: explode() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 -- Iteration 21 --
 array(1) {

diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
index add962a3ad708d8ed81ebb42aa71cc640d355c18..a20d10c6542b6dc7c51a0a80d28640735d832951 100644 (file)
--- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
@@ -106,38 +106,38 @@ echo "Done\n";
 --- Testing get_html_translation_table() by supplying different values for 'table' argument ---
 -- Iteration 1 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 6 --
 int(252)
@@ -189,38 +189,38 @@ array(4) {
 }
 -- Iteration 10 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, object given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, object given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, object given in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d
 NULL
 -- Iteration 15 --
 array(4) {
@@ -266,10 +266,10 @@ array(4) {
 }
 -- Iteration 17 --
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: get_html_translation_table() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 -- Iteration 18 --
 array(4) {

diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
index f3aee5fc0fea0cea22dcd198393a770b670cccbd..907eda35aea655e0a91243d279d2f164bf84680a 100644 (file)
--- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
@@ -88,23 +88,23 @@ echo "Done\n";
 --- Testing get_html_translation_table() by supplying different values for 'quote_style' argument ---
 -- Iteration 1 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 6 --
 array(4) {
@@ -148,23 +148,23 @@ array(3) {
 }
 -- Iteration 10 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, object given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 15 --
 array(3) {
@@ -186,7 +186,7 @@ array(3) {
 }
 -- Iteration 17 --
 
-Warning: get_html_translation_table() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: get_html_translation_table() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 -- Iteration 18 --
 array(3) {

diff --git a/ext/standard/tests/strings/hebrev_variation2.phpt b/ext/standard/tests/strings/hebrev_variation2.phpt
index 5698cde793c6431017da30b755ce6cc6493c4926..a577d1ee89b909f743837b9ec4695f2463d21f37 100644 (file)
--- a/ext/standard/tests/strings/hebrev_variation2.phpt
+++ b/ext/standard/tests/strings/hebrev_variation2.phpt
@@ -180,15 +180,15 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text
 "
 -- Iteration 10 --
 
-Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 13 --
 string(109) "xttel uaisv
@@ -230,11 +230,11 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text
 "
 -- Iteration 19 --
 
-Warning: hebrev() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: hebrev() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 
@@ -266,11 +266,11 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text
 "
 -- Iteration 24 --
 
-Warning: hebrev() expects parameter 2 to be integer, object given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: hebrev() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: hebrev() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 -- Iteration 26 --
 string(109) ".The hebrev function converts logical Hebrew text to visual text

diff --git a/ext/standard/tests/strings/hebrevc_variation2.phpt b/ext/standard/tests/strings/hebrevc_variation2.phpt
index e6a6013931f97bd4d3af69024eb6d9092e649942..75ebc30cd82d3a89da46e010bd17ad751a8e450e 100644 (file)
--- a/ext/standard/tests/strings/hebrevc_variation2.phpt
+++ b/ext/standard/tests/strings/hebrevc_variation2.phpt
@@ -254,15 +254,15 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text<
 "
 -- Iteration 10 --
 
-Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 13 --
 string(331) "xttel uaisv<br />
@@ -338,11 +338,11 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text<
 "
 -- Iteration 19 --
 
-Warning: hebrevc() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: hebrevc() expects parameter 2 to be integer, string given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 
@@ -391,11 +391,11 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text<
 "
 -- Iteration 24 --
 
-Warning: hebrevc() expects parameter 2 to be integer, object given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: hebrevc() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: hebrevc() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 -- Iteration 26 --
 string(241) ".The hebrevcc function converts logical Hebrew text to visual text<br />

diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
index 837583c224ad5da1d7a059672e8800e6bea3b6a7..0046236259a0b622bd46e2876292dc5d08b85a78 100644 (file)
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
@@ -103,7 +103,7 @@ string(104) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
 
 -- Iteration 3 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, float given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, float given in %s on line %d
 NULL
 
 -- Iteration 4 --
@@ -114,27 +114,27 @@ string(114) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
 
 -- Iteration 6 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 7 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 8 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 9 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 10 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 11 --
@@ -157,27 +157,27 @@ string(114) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
 
 -- Iteration 17 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 18 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 19 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 20 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 21 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, object given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, object given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 
 -- Iteration 22 --
@@ -188,6 +188,6 @@ string(114) "<html>Roy&#039;s height > Sam&#039;s height. 13 < 15. 1111 & 0000 =
 
 -- Iteration 24 --
 
-Warning: htmlspecialchars_decode() expects parameter 2 to be integer, resource given in %shtmlspecialchars_decode_variation2.php on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be int, resource given in %shtmlspecialchars_decode_variation2.php on line %d
 NULL
 Done

diff --git a/ext/standard/tests/strings/nl_langinfo_variation1.phpt b/ext/standard/tests/strings/nl_langinfo_variation1.phpt
index 2d65d0ef07d54baad7a9c0a36af423c1e32545ae..c8c92855fc63d1d273fc628ebba48dcb70a8bae3 100644 (file)
--- a/ext/standard/tests/strings/nl_langinfo_variation1.phpt
+++ b/ext/standard/tests/strings/nl_langinfo_variation1.phpt
@@ -83,22 +83,22 @@ Warning: nl_langinfo(): Item '-20' is not valid in %s on line %d
 bool(false)
 -- Iteration 4 --
 
-Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: nl_langinfo() expects parameter 1 to be integer, object given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, object given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: nl_langinfo() expects parameter 1 to be integer, resource given in %s on line %d
+Warning: nl_langinfo() expects parameter 1 to be int, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt
index 73094640d40e76154451fff9f2a2e987a4c7b36f..2f082ea7a5e671ad5951991a585b879ef0cfad75 100644 (file)
--- a/ext/standard/tests/strings/str_pad_variation2.phpt
+++ b/ext/standard/tests/strings/str_pad_variation2.phpt
@@ -102,15 +102,15 @@ string(11) "Test string"
 string(1012) "Test string                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         "
 -- Iteration 8 --
 
-Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 string(11) "Test string"
@@ -126,11 +126,11 @@ string(11) "Test string"
 string(11) "Test string"
 -- Iteration 17 --
 
-Warning: str_pad() expects parameter 2 to be integer, object given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: str_pad() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: str_pad() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 -- Iteration 19 --
 string(11) "Test string"

diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt
index 6bf94084bb4867e4a58928d8cada38ae1d425e57..e5084b7e9b37d702f1f83f4eba4f57e4f91ece11 100644 (file)
--- a/ext/standard/tests/strings/str_pad_variation4.phpt
+++ b/ext/standard/tests/strings/str_pad_variation4.phpt
@@ -123,11 +123,11 @@ Warning: str_pad(): Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_P
 NULL
 -- Iteration 10 --
 
-Warning: str_pad() expects parameter 4 to be integer, string given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, string given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: str_pad() expects parameter 4 to be integer, string given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, string given in %s on line %d
 NULL
 -- Iteration 12 --
 string(20) "****Test string*****"
@@ -139,15 +139,15 @@ string(20) "*********Test string"
 string(20) "****Test string*****"
 -- Iteration 15 --
 
-Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d
 NULL
 -- Iteration 18 --
 string(20) "Test string*********"
@@ -163,7 +163,7 @@ string(20) "*********Test string"
 string(20) "*********Test string"
 -- Iteration 24 --
 
-Warning: str_pad() expects parameter 4 to be integer, object given in %s on line %d
+Warning: str_pad() expects parameter 4 to be int, object given in %s on line %d
 NULL
 -- Iteration 25 --
 string(20) "*********Test string"

diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt
index bbcc489990a198fdb7e7e8229c72ddb14fab75c1..beb5e805f831590a20dc44997d82a13210483709 100644 (file)
Binary files a/ext/standard/tests/strings/str_repeat.phpt and b/ext/standard/tests/strings/str_repeat.phpt differ

diff --git a/ext/standard/tests/strings/str_split_variation2.phpt b/ext/standard/tests/strings/str_split_variation2.phpt
index 42a5d5ab389db28363a4a6e210d8cd0268a6e035..ef2ea94a9edc3fb84249511ae57ee14f91c789e9 100644 (file)
--- a/ext/standard/tests/strings/str_split_variation2.phpt
+++ b/ext/standard/tests/strings/str_split_variation2.phpt
@@ -111,7 +111,7 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
 bool(false)
 --Iteration 3 --
 
-Warning: str_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, float given in %s on line %d
 NULL
 --Iteration 4 --
 
@@ -123,23 +123,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
 bool(false)
 --Iteration 6 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 7 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 8 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 9 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 10 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 11 --
 
@@ -257,23 +257,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
 bool(false)
 --Iteration 17 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 18 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 19 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 20 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 21 --
 
-Warning: str_split() expects parameter 2 to be integer, object given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, object given in %sstr_split_variation2.php on line %d
 NULL
 --Iteration 22 --
 
@@ -285,6 +285,6 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
 bool(false)
 --Iteration 24 --
 
-Warning: str_split() expects parameter 2 to be integer, resource given in %sstr_split_variation2.php on line %d
+Warning: str_split() expects parameter 2 to be int, resource given in %sstr_split_variation2.php on line %d
 NULL
 Done

diff --git a/ext/standard/tests/strings/str_split_variation2_64bit.phpt b/ext/standard/tests/strings/str_split_variation2_64bit.phpt
index b80a3b42cc6cfe09324dfcf32bd2b4dabb82051a..d465e355d66892c1ef7250af2534e0fa3cfd3f5c 100644 (file)
--- a/ext/standard/tests/strings/str_split_variation2_64bit.phpt
+++ b/ext/standard/tests/strings/str_split_variation2_64bit.phpt
@@ -124,23 +124,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
 bool(false)
 --Iteration 6 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
 NULL
 --Iteration 7 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
 NULL
 --Iteration 8 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
 NULL
 --Iteration 9 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
 NULL
 --Iteration 10 --
 
-Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, array given in %s on line %d
 NULL
 --Iteration 11 --
 
@@ -258,23 +258,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
 bool(false)
 --Iteration 17 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
 NULL
 --Iteration 18 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
 NULL
 --Iteration 19 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
 NULL
 --Iteration 20 --
 
-Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, string given in %s on line %d
 NULL
 --Iteration 21 --
 
-Warning: str_split() expects parameter 2 to be integer, object given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, object given in %s on line %d
 NULL
 --Iteration 22 --
 
@@ -286,6 +286,6 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
 bool(false)
 --Iteration 24 --
 
-Warning: str_split() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt
index 53385a76dec90ca407e21e5fd1303f1e3d35903f..95afb24e59ee601c4b49a4c64c9174f229422b3a 100644 (file)
--- a/ext/standard/tests/strings/str_split_variation6.phpt
+++ b/ext/standard/tests/strings/str_split_variation6.phpt
@@ -157,7 +157,7 @@ array(1) {
 }
 -- Iteration 7 --
 
-Warning: str_split() expects parameter 2 to be integer, float given in %s line %d
+Warning: str_split() expects parameter 2 to be int, float given in %s line %d
 NULL
 -- Iteration 8 --
 

diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt
index 963e2aa14c12addf79c657bc496e7e01e5d124ab..0d343172452e808650c10f09b36940a064f5b34a 100644 (file)
--- a/ext/standard/tests/strings/str_split_variation7.phpt
+++ b/ext/standard/tests/strings/str_split_variation7.phpt
@@ -135,7 +135,7 @@ array(1) {
 }
 -- Iteration 7 --
 
-Warning: str_split() expects parameter 2 to be integer, float given in %s on line %d
+Warning: str_split() expects parameter 2 to be int, float given in %s on line %d
 NULL
 -- Iteration 8 --
 

diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt
index 00e71f781fb4bbb0637831bc39f071965b020c62..a0496cc2cfb63db85cd3d81e306b37dc39556136 100644 (file)
--- a/ext/standard/tests/strings/str_word_count.phpt
+++ b/ext/standard/tests/strings/str_word_count.phpt
@@ -87,10 +87,10 @@ bool(false)
 Warning: str_word_count(): Invalid format value 999999999 in %s on line %d
 bool(false)
 
-Warning: str_word_count() expects parameter 2 to be integer, array given in %s on line %d
+Warning: str_word_count() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: str_word_count() expects parameter 2 to be integer, string given in %s on line %d
+Warning: str_word_count() expects parameter 2 to be int, string given in %s on line %d
 NULL
 string(55) "Hello friend, you're  
     looking          good today!"

diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt
index 4940b8cfc952cefa802bf75f6da6c69f9db6a640..ad09fdbbec7bf109bf871deb2479de27f4caccbd 100644 (file)
--- a/ext/standard/tests/strings/strcspn_variation3.phpt
+++ b/ext/standard/tests/strings/strcspn_variation3.phpt
@@ -123,42 +123,42 @@ int(0)
 
 -- Iteration with start value as "Array" --
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "" --
@@ -187,42 +187,42 @@ int(0)
 
 -- Iteration with start value as "" --
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "" --
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "string" --
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "string" --
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "object" --
 
-Warning: strcspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
 -- Iteration with start value as "" --
@@ -235,9 +235,9 @@ int(0)
 
 -- Iteration with start value as "Resource id #%d" --
 
-Warning: strcspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 
-Warning: strcspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strcspn() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/strings/strcspn_variation4.phpt b/ext/standard/tests/strings/strcspn_variation4.phpt
index d7132a64ce82e517c897ecde0a813d695901e6b1..d7c6750233afc270b2a1857aa27f2ef116106314 100644 (file)
--- a/ext/standard/tests/strings/strcspn_variation4.phpt
+++ b/ext/standard/tests/strings/strcspn_variation4.phpt
@@ -119,27 +119,27 @@ int(0)
 
 -- Iteration with len value as "Array" --
 
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "" --
@@ -162,27 +162,27 @@ int(0)
 
 -- Iteration with len value as "" --
 
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "" --
 
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "string" --
 
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "string" --
 
-Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "object" --
 
-Warning: strcspn() expects parameter 4 to be integer, object given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, object given in %s on line %d
 NULL
 
 -- Iteration with len value as "" --
@@ -193,6 +193,6 @@ int(0)
 
 -- Iteration with len value as "Resource id #%d" --
 
-Warning: strcspn() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: strcspn() expects parameter 4 to be int, resource given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/strings/stripos_variation14.phpt b/ext/standard/tests/strings/stripos_variation14.phpt
index 89f70ddef07bda41451b057bfb367c630d514d67..ecf9d4750267d90195de8fef5dfdb4ba9fbca0c1 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation14.phpt
+++ b/ext/standard/tests/strings/stripos_variation14.phpt
@@ -100,23 +100,23 @@ int(6)
 int(6)
 -- Iteration 6 --
 
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 int(6)
@@ -128,15 +128,15 @@ int(6)
 int(6)
 -- Iteration 15 --
 
-Warning: stripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, object given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 -- Iteration 18 --
 int(6)
@@ -144,7 +144,7 @@ int(6)
 int(6)
 -- Iteration 20 --
 
-Warning: stripos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 -- Iteration 21 --
 int(6)

diff --git a/ext/standard/tests/strings/stripos_variation15.phpt b/ext/standard/tests/strings/stripos_variation15.phpt
index ba10999fac6d4ba1a184174a45caf353894eccd5..51583edeb4a53691997e9aa4ea3481e9abcd3ec4 100644 (file)
--- a/ext/standard/tests/strings/stripos_variation15.phpt
+++ b/ext/standard/tests/strings/stripos_variation15.phpt
@@ -148,15 +148,15 @@ bool(false)
 bool(false)
 -- Iteration 19 --
 
-Warning: stripos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, object given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: stripos() expects parameter 3 to be int, string given in %s on line %d
 NULL
 -- Iteration 22 --
 bool(false)

diff --git a/ext/standard/tests/strings/strncasecmp_variation5.phpt b/ext/standard/tests/strings/strncasecmp_variation5.phpt
index e88be79a9c4c918c759a6032fcb4e193df3cd9ad..44a58f78e13c73c369c1de4e70759b53312cc408 100644 (file)
--- a/ext/standard/tests/strings/strncasecmp_variation5.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation5.phpt
@@ -112,23 +112,23 @@ int(0)
 int(0)
 -- Iteration 8 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d
 NULL
 -- Iteration 13 --
 int(0)
@@ -144,11 +144,11 @@ int(0)
 int(0)
 -- Iteration 19 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, string given in %s on line %d
 NULL
 -- Iteration 21 --
 int(0)
@@ -156,10 +156,10 @@ int(0)
 int(0)
 -- Iteration 23 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: strncasecmp() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strncasecmp() expects parameter 3 to be int, object given in %s on line %d
 NULL
 *** Done ***

diff --git a/ext/standard/tests/strings/strncmp_variation5.phpt b/ext/standard/tests/strings/strncmp_variation5.phpt
index 22aaa439e80a1beb64ae45f853f1fefb37be63b4..85e50f592970482f9135f61d995671b2c9a5ef69 100644 (file)
--- a/ext/standard/tests/strings/strncmp_variation5.phpt
+++ b/ext/standard/tests/strings/strncmp_variation5.phpt
@@ -126,23 +126,23 @@ int(0)
 int(0)
 -- Iteration 11 --
 
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d
 NULL
 -- Iteration 16 --
 int(0)
@@ -158,11 +158,11 @@ int(0)
 int(0)
 -- Iteration 22 --
 
-Warning: strncmp() expects parameter 3 to be integer, string given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, string given in%s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: strncmp() expects parameter 3 to be integer, string given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, string given in%s on line %d
 NULL
 -- Iteration 24 --
 int(0)
@@ -170,10 +170,10 @@ int(0)
 int(0)
 -- Iteration 26 --
 
-Warning: strncmp() expects parameter 3 to be integer, resource given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, resource given in%s on line %d
 NULL
 -- Iteration 27 --
 
-Warning: strncmp() expects parameter 3 to be integer, object given in%s on line %d
+Warning: strncmp() expects parameter 3 to be int, object given in%s on line %d
 NULL
 *** Done ***

diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt
index a2237fe005abc99d09e7a7a77db1dea477dc6c28..0dd901a19da3278e481a74bf9650b8c691ef5fbb 100644 (file)
Binary files a/ext/standard/tests/strings/strpos.phpt and b/ext/standard/tests/strings/strpos.phpt differ

diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt
index 47a672cc7e50e16df50181856736e12a1ce58fb1..6a3395632628ec79634b9269c913cc817e061e54 100644 (file)
--- a/ext/standard/tests/strings/strripos_offset.phpt
+++ b/ext/standard/tests/strings/strripos_offset.phpt
@@ -18,16 +18,16 @@ var_dump(strripos(1024, "te", -PHP_INT_MAX-1));
 echo "Done\n";
 ?>
 --EXPECTF--    
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
-Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strripos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
 Warning: strripos() expects parameter 1 to be string, array given in %s on line %d

diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt
index 4f20895b1544914919020b3e28e5324867390325..239fdb31f41827718736957bf3e81b5a385d5a3f 100644 (file)
--- a/ext/standard/tests/strings/strrpos_offset.phpt
+++ b/ext/standard/tests/strings/strrpos_offset.phpt
@@ -17,16 +17,16 @@ var_dump(strrpos(1024, "te", -PHP_INT_MAX-1));
 echo "Done\n";
 ?>
 --EXPECTF--    
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 
 Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d

diff --git a/ext/standard/tests/strings/strrpos_variation14.phpt b/ext/standard/tests/strings/strrpos_variation14.phpt
index 0ce98242a307cb1ed70adafa04da389c5e0d2bfa..a0586db20f004cfac846c71bf512f94143a1a901 100644 (file)
--- a/ext/standard/tests/strings/strrpos_variation14.phpt
+++ b/ext/standard/tests/strings/strrpos_variation14.phpt
@@ -94,7 +94,7 @@ int(6)
 int(6)
 -- Iteration 3 --
 
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 -- Iteration 4 --
 int(6)
@@ -102,23 +102,23 @@ int(6)
 int(6)
 -- Iteration 6 --
 
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 7 --
 
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 8 --
 
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 9 --
 
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 10 --
 
-Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d
 bool(false)
 -- Iteration 11 --
 int(6)
@@ -130,15 +130,15 @@ int(6)
 int(6)
 -- Iteration 15 --
 
-Warning: strrpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 -- Iteration 16 --
 
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 17 --
 
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 18 --
 int(6)
@@ -146,7 +146,7 @@ int(6)
 int(6)
 -- Iteration 20 --
 
-Warning: strrpos() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, resource given in %s on line %d
 bool(false)
 -- Iteration 21 --
 int(6)

diff --git a/ext/standard/tests/strings/strrpos_variation15.phpt b/ext/standard/tests/strings/strrpos_variation15.phpt
index 3f96d4a9156339b5a5f8df72a9339590bae6cf2f..d9a40e02b05a532390c4270dd1a8da8a02aa5fb5 100644 (file)
--- a/ext/standard/tests/strings/strrpos_variation15.phpt
+++ b/ext/standard/tests/strings/strrpos_variation15.phpt
@@ -112,7 +112,7 @@ Warning: strrpos(): Offset is greater than the length of haystack string in %s o
 bool(false)
 -- Iteration 7 --
 
-Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d
 bool(false)
 -- Iteration 8 --
 bool(false)
@@ -148,15 +148,15 @@ bool(false)
 bool(false)
 -- Iteration 19 --
 
-Warning: strrpos() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, object given in %s on line %d
 bool(false)
 -- Iteration 20 --
 
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 21 --
 
-Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d
 bool(false)
 -- Iteration 22 --
 bool(false)

diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt
index 13eb327f729d16e223250fbf821c490ccca8e2f1..db1a51abf4c52ff06a2820256603f8341b6b1fb6 100644 (file)
--- a/ext/standard/tests/strings/strspn_variation3.phpt
+++ b/ext/standard/tests/strings/strspn_variation3.phpt
@@ -123,42 +123,42 @@ int(2)
 
 -- Iteration with start value as "Array" --
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "Array" --
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with start value as "" --
@@ -187,42 +187,42 @@ int(2)
 
 -- Iteration with start value as "" --
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "" --
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "string" --
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "string" --
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with start value as "object" --
 
-Warning: strspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, object given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
 -- Iteration with start value as "" --
@@ -235,9 +235,9 @@ int(2)
 
 -- Iteration with start value as "Resource id #%d" --
 
-Warning: strspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 
-Warning: strspn() expects parameter 3 to be integer, resource given in %s on line %d
+Warning: strspn() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt
index c723328482bd5f44c372839024ea8960076043a5..74c7db421b21fb81ccd4c18e629a384f48111411 100644 (file)
--- a/ext/standard/tests/strings/strspn_variation4.phpt
+++ b/ext/standard/tests/strings/strspn_variation4.phpt
@@ -117,27 +117,27 @@ int(0)
 
 -- Iteration with len value as "Array" --
 
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "Array" --
 
-Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, array given in %s on line %d
 NULL
 
 -- Iteration with len value as "" --
@@ -160,27 +160,27 @@ int(0)
 
 -- Iteration with len value as "" --
 
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "" --
 
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "string" --
 
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "string" --
 
-Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, string given in %s on line %d
 NULL
 
 -- Iteration with len value as "object" --
 
-Warning: strspn() expects parameter 4 to be integer, object given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, object given in %s on line %d
 NULL
 
 -- Iteration with len value as "" --
@@ -191,6 +191,6 @@ int(0)
 
 -- Iteration with len value as "Resource id #%d" --
 
-Warning: strspn() expects parameter 4 to be integer, resource given in %s on line %d
+Warning: strspn() expects parameter 4 to be int, resource given in %s on line %d
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
index 4f69ee57c5bee57d1867550e8ef5c14be544a08a..830678f1994ad71ad7cb9b1615dc6a7511bf76f1 100644 (file)
--- a/ext/standard/tests/strings/substr_compare.phpt
+++ b/ext/standard/tests/strings/substr_compare.phpt
@@ -41,6 +41,6 @@ Warning: substr_compare(): The length must be greater than or equal to zero in %
 bool(false)
 bool(true)
 
-Warning: substr_compare() expects parameter 4 to be integer, string given in %s on line %d
+Warning: substr_compare() expects parameter 4 to be int, string given in %s on line %d
 bool(false)
 Done

diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt
index 881da391e658265df2d9f4b6fe722301b6011c4a..c086582caabe5f928e8c6531662b50c4fa4c0e6d 100644 (file)
--- a/ext/standard/tests/strings/substr_count_error.phpt
+++ b/ext/standard/tests/strings/substr_count_error.phpt
@@ -49,7 +49,7 @@ bool(false)
 Warning: substr_count(): Invalid length value in %s on line %d
 bool(false)
 
-Warning: substr_count() expects parameter 3 to be integer, string given in %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given in %s on line %d
 NULL
 
 Warning: substr_count(): Invalid length value in %s on line %d

diff --git a/ext/standard/tests/strings/substr_count_variation_001.phpt b/ext/standard/tests/strings/substr_count_variation_001.phpt
index a9d538d17a61b6ccd0caffd3d890a471ef354727..c2644ce89b38bed1825f640bc33b9593faf98997 100644 (file)
--- a/ext/standard/tests/strings/substr_count_variation_001.phpt
+++ b/ext/standard/tests/strings/substr_count_variation_001.phpt
@@ -68,13 +68,13 @@ int(2)
 
 -- 3rd or 4th arg as NULL --
 
-Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given %s on line %d
 NULL
 
-Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given %s on line %d
 NULL
 
-Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d
+Warning: substr_count() expects parameter 3 to be int, string given %s on line %d
 NULL
 int(0)
 int(2)

diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt
index 5f51da81f83cfdf54ae94d257c96133cd760f6a1..61d2bbfc8bf53f22b354ee8f7f0d32f92466c82b 100644 (file)
--- a/ext/standard/tests/strings/wordwrap_variation2.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation2.phpt
@@ -128,68 +128,68 @@ string(39) "testing<br />\nwordwrap<br />\nfunction"
 string(223) "<br />\nt<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br />\ng<br />\n<br />\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br />\np<br />\n<br />\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br />\nn"
 -- Iteration 4 --
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d
 NULL
 -- Iteration 9 --
 string(25) "testing
@@ -225,42 +225,42 @@ Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
 bool(false)
 -- Iteration 13 --
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d
 NULL
 -- Iteration 16 --
 string(25) "testing
@@ -282,42 +282,42 @@ Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
 bool(false)
 -- Iteration 18 --
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 
-Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 -- Iteration 21 --
 string(25) "testing

diff --git a/ext/standard/tests/url/get_headers_error_002.phpt b/ext/standard/tests/url/get_headers_error_002.phpt
index 4a335c8a7573d0c3c5920b231758b1d63e8139f1..a1bcdba99b438ccec882739086286478b97cc3f4 100644 (file)
--- a/ext/standard/tests/url/get_headers_error_002.phpt
+++ b/ext/standard/tests/url/get_headers_error_002.phpt
@@ -39,17 +39,17 @@ echo "Done"
 
 -- Testing get_headers() function with format argument as type string --
 
-Warning: get_headers() expects parameter 2 to be integer, string given in %s on line 13
+Warning: get_headers() expects parameter 2 to be int, string given in %s on line 13
 NULL
 
 -- Testing get_headers() function with format argument as type array --
 
-Warning: get_headers() expects parameter 2 to be integer, array given in %s on line 17
+Warning: get_headers() expects parameter 2 to be int, array given in %s on line 17
 NULL
 
 -- Testing get_headers() function with format argument as type object --
 
-Warning: get_headers() expects parameter 2 to be integer, object given in %s on line 26
+Warning: get_headers() expects parameter 2 to be int, object given in %s on line 26
 NULL
 Done
 

diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
index b03393ea8ed25aabe430cac6daba9aa5a1db9f57..fe4ca7bd0938325bc0d21eee10040733c004c8f3 100644 (file)
--- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
+++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
@@ -108,7 +108,7 @@ array(8) {
 }
 
 Arg value 101234567000 
-Error: 2 - parse_url() expects parameter 2 to be integer, float given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, float given, %s(%d)
 NULL
 
 Arg value 1.07654321E-9 
@@ -119,27 +119,27 @@ string(4) "http"
 Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
 NULL
 Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
 NULL
 Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
 NULL
 Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
 NULL
 Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d)
 NULL
 
 Arg value  
@@ -161,24 +161,24 @@ Arg value
 string(4) "http"
 
 Arg value  
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 Arg value  
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 Arg value string 
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
 NULL
 
 Arg value string 
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d)
 NULL
 Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 2 - parse_url() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - parse_url() expects parameter 2 to be int, object given, %s(%d)
 NULL
 
 Arg value  

diff --git a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
index 1c24e1f727916c6252c36b7f14ffd611bfd7afcf..adf9c030589e2ccd3195c428cfd5d5cbbe6223de 100644 (file)
--- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
+++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
@@ -119,27 +119,27 @@ string(4) "http"
 Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
 NULL
 Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
 NULL
 Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
 NULL
 Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
 NULL
 Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d)
 
 Arg value Array 
-Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71)
 NULL
 
 Arg value  
@@ -161,24 +161,24 @@ Arg value
 string(4) "http"
 
 Arg value  
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
 NULL
 
 Arg value  
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
 NULL
 
 Arg value string 
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
 NULL
 
 Arg value string 
-Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71)
 NULL
 Error: 4096 - Object of class stdClass could not be converted to string, %s(70)
 
 Arg value  
-Error: 2 - parse_url() expects parameter 2 to be integer, object given, %s(71)
+Error: 2 - parse_url() expects parameter 2 to be int, object given, %s(71)
 NULL
 
 Arg value  

diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index cf83b8228b6d1ce12dec322ae44576a7a646dcff..c27782a07fa15ac6434c8224c6b2fd7c47ceb55e 100644 (file)
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -62,7 +62,7 @@ bool(false)
 Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d
 resource(%d) of type (sysvshm)
 
-Warning: shm_remove() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: shm_remove() expects parameter 1 to be resource, int given in %s on line %d
 resource(%d) of type (sysvshm)
 resource(%d) of type (sysvshm)
 resource(%d) of type (sysvshm)

diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt
index 9b5ed4ddba04551fda08f1151a720bad45342c5c..565c7c454ea3aa8aaef44f5f847c3fe2c940af95 100644 (file)
--- a/ext/sysvshm/tests/003.phpt
+++ b/ext/sysvshm/tests/003.phpt
@@ -46,12 +46,12 @@ bool(false)
 
 Warning: shm_remove(): supplied resource is not a valid sysvshm resource in %s003.php on line %d
 
-Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d
+Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
 NULL
 
-Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d
+Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
 NULL
 
-Warning: shm_detach() expects parameter 1 to be resource, integer given in %s003.php on line %d
+Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
 NULL
 Done

diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt
index 877f9f4a6d48377a54de9ad91af9958ce9b93b8d..ea931cbca2df3cd8f6dc9a3713cb934c18259925 100644 (file)
--- a/ext/sysvshm/tests/004.phpt
+++ b/ext/sysvshm/tests/004.phpt
@@ -29,10 +29,10 @@ echo "Done\n";
 Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s004.php on line %d
 NULL
 
-Warning: shm_put_var() expects parameter 1 to be resource, integer given in %s004.php on line %d
+Warning: shm_put_var() expects parameter 1 to be resource, int given in %s004.php on line %d
 NULL
 
-Warning: shm_put_var() expects parameter 1 to be resource, integer given in %s004.php on line %d
+Warning: shm_put_var() expects parameter 1 to be resource, int given in %s004.php on line %d
 NULL
 bool(true)
 bool(true)

diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt
index 15200c6dd8dc5e819fb31bfdc231ef058561918d..6608aba2c7393a32e63c0aba0f7b47eca3682303 100644 (file)
--- a/ext/sysvshm/tests/005.phpt
+++ b/ext/sysvshm/tests/005.phpt
@@ -45,7 +45,7 @@ echo "Done\n";
 Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d
 NULL
 
-Warning: shm_get_var() expects parameter 1 to be resource, integer given in %s005.php on line %d
+Warning: shm_get_var() expects parameter 1 to be resource, int given in %s005.php on line %d
 NULL
 
 Warning: shm_get_var(): variable key 1000 doesn't exist in %s005.php on line %d
@@ -54,7 +54,7 @@ bool(false)
 Warning: shm_get_var(): variable key -10000 doesn't exist in %s005.php on line %d
 bool(false)
 
-Warning: shm_get_var() expects parameter 2 to be integer, array given in %s005.php on line %d
+Warning: shm_get_var() expects parameter 2 to be int, array given in %s005.php on line %d
 NULL
 string(11) "test string"
 object(stdClass)#%d (0) {

diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
index 1e4ec1c357a3ae196be3d01ab3eca64971e2af76..a8f5064b4b5c0547eb58d978ab0605ca6ebec8fd 100644 (file)
--- a/ext/sysvshm/tests/006.phpt
+++ b/ext/sysvshm/tests/006.phpt
@@ -33,7 +33,7 @@ echo "Done\n";
 Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d
 NULL
 
-Warning: shm_remove_var() expects parameter 1 to be resource, integer given in %s006.php on line %d
+Warning: shm_remove_var() expects parameter 1 to be resource, int given in %s006.php on line %d
 NULL
 
 Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line %d

diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index 584f13ac7a6fed6bbd664b2a8c81d1a1ed194e92..89e32e6c4f838ddfa6947f264c3ae4f890adcc7e 100644 (file)
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -28,10 +28,10 @@ echo "Done\n";
 Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d
 NULL
 
-Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d
+Warning: shm_remove() expects parameter 1 to be resource, int given in %s007.php on line %d
 NULL
 
-Warning: shm_remove() expects parameter 1 to be resource, integer given in %s007.php on line %d
+Warning: shm_remove() expects parameter 1 to be resource, int given in %s007.php on line %d
 NULL
 
 Warning: shm_remove() expects parameter 1 to be resource, string given in %s007.php on line %d

diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt
index 2f0fb6fc2dcfe35ef28f33aede4b2e4538918add..a09e5ef19cc0bc2cf4311b625bd532f2096a9b82 100644 (file)
--- a/ext/tokenizer/tests/001.phpt
+++ b/ext/tokenizer/tests/001.phpt
@@ -252,9 +252,9 @@ T_HALT_COMPILER
 UNKNOWN
 UNKNOWN
 
-Warning: token_name() expects parameter 1 to be integer, string given in %s on line %d
+Warning: token_name() expects parameter 1 to be int, string given in %s on line %d
 
 
-Warning: token_name() expects parameter 1 to be integer, array given in %s on line %d
+Warning: token_name() expects parameter 1 to be int, array given in %s on line %d
 
 Done

diff --git a/ext/xml/tests/xml_error_string_variation1.phpt b/ext/xml/tests/xml_error_string_variation1.phpt
index c97d995cf5c6064399093f4749834782565c03d4..ff152f823878fac0996a93ba5381cfbc3fd8abf8 100644 (file)
--- a/ext/xml/tests/xml_error_string_variation1.phpt
+++ b/ext/xml/tests/xml_error_string_variation1.phpt
@@ -103,27 +103,27 @@ string(8) "No error"
 
 Arg value Array 
 
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_error_string() expects parameter 1 to be integer, array given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, array given in %s on line %d
 NULL
 
 Arg value  
@@ -146,27 +146,27 @@ string(8) "No error"
 
 Arg value  
 
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Arg value  
 
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Arg value string 
 
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Arg value string 
 
-Warning: xml_error_string() expects parameter 1 to be integer, string given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, string given in %s on line %d
 NULL
 
 Arg value Some Ascii Data 
 
-Warning: xml_error_string() expects parameter 1 to be integer, object given in %s on line %d
+Warning: xml_error_string() expects parameter 1 to be int, object given in %s on line %d
 NULL
 
 Arg value  

diff --git a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
index 2214c86ffa274048d15074ea6a057e4293e86c98..dbc9066215b3bbe7b4cfca20f84c869df2b061ed 100644 (file)
--- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_get_current_byte_index() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_byte_index() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_get_current_column_number_variation1.phpt b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
index afcac48c4b2427adee4844ac7892fa6e9f01f5a7..37b1ee98d96ee7d3a02e6914781aeb4fe1ca99bd 100644 (file)
--- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_get_current_column_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_column_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_get_current_line_number_variation1.phpt b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
index 1b92c2784df49af4db1c09d9e11b33118b426c05..e7342a6c34caa797f6e786fef113e6bc03e7bf12 100644 (file)
--- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_get_current_line_number() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_current_line_number() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt
index 62e9ac9fb3257c6c5b2e247774a8ca655e5c7d12..7f23030fb19f34110c79397fcd4953a7c47bd485 100644 (file)
--- a/ext/xml/tests/xml_get_error_code_variation1.phpt
+++ b/ext/xml/tests/xml_get_error_code_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_get_error_code() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_get_error_code() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
index 39ce62a5da1b69c64f734f7fb2e5f80b83bb1a22..cbaa0d814cc1ffb721511786f3a3898c1d8c90ff 100644 (file)
--- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_parse_into_struct() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse_into_struct() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt
index 34afcd87b57978be09cc5a08a8d4b66ac8cf2780..182e9f6fd52a57e38cfbc10ec78325ca005916c0 100644 (file)
--- a/ext/xml/tests/xml_parse_variation1.phpt
+++ b/ext/xml/tests/xml_parse_variation1.phpt
@@ -101,22 +101,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_parse() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parse() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt
index 7c6468a8273107daac00090d378c49d22c2bd85e..4f7813bf5d9387edaa75421c7af525b6cd93daae 100644 (file)
--- a/ext/xml/tests/xml_parser_free_variation1.phpt
+++ b/ext/xml/tests/xml_parser_free_variation1.phpt
@@ -99,22 +99,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_parser_free() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_free() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt
index 002bff6cd8a18e1982a188d8b2ea5f49b1fa190c..c94f87f42035a15246d19a94e11add9485bfcc1d 100644 (file)
--- a/ext/xml/tests/xml_parser_get_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_parser_get_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_parser_get_option_variation2.phpt b/ext/xml/tests/xml_parser_get_option_variation2.phpt
index e741b9fa65bf4f25e480e33ffb947df5f65fa548..367128727c63d2130c2a8c831a858d4898b74f04 100644 (file)
--- a/ext/xml/tests/xml_parser_get_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation2.phpt
@@ -134,27 +134,27 @@ bool(false)
 
 Arg value Array 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value  
@@ -185,32 +185,32 @@ bool(false)
 
 Arg value  
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value  
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value string 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value string 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value Some Ascii Data 
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, object given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 Arg value Resource id %s
 
-Warning: xml_parser_get_option() expects parameter 2 to be integer, resource given in %s on line %d
+Warning: xml_parser_get_option() expects parameter 2 to be int, resource given in %s on line %d
 NULL
 
 Arg value  

diff --git a/ext/xml/tests/xml_parser_set_option_variation1.phpt b/ext/xml/tests/xml_parser_set_option_variation1.phpt
index 14452dbe213e395fdab7021c38d9b3f693dafb8b..f606a786705570fec7d88d69f1c844acb116a731 100644 (file)
--- a/ext/xml/tests/xml_parser_set_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_parser_set_option() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_parser_set_option_variation2.phpt b/ext/xml/tests/xml_parser_set_option_variation2.phpt
index a367ede1719ae6f9fc9dc99d6db31819bd257386..3432e11d73e3b61071e19e5ddac357db197d72bb 100644 (file)
--- a/ext/xml/tests/xml_parser_set_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation2.phpt
@@ -129,27 +129,27 @@ bool(false)
 
 Arg value Array 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value Array 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, array given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
 Arg value  
@@ -180,27 +180,27 @@ bool(false)
 
 Arg value  
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value  
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value string 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value string 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, string given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
 Arg value Some Ascii Data 
 
-Warning: xml_parser_set_option() expects parameter 2 to be integer, object given in %s on line %d
+Warning: xml_parser_set_option() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 Arg value  

diff --git a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
index 3e9f79768a64c5e9b2a49f8e7f67968faad25f43..ce060f267f929930d16de3903fc5f27f383df5be 100644 (file)
--- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_character_data_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_character_data_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt
index afd0b6ed98908f4ae419ec864e8d079533e23960..33183aea4eb8af995b86381946c5b4547a73583b 100644 (file)
--- a/ext/xml/tests/xml_set_default_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_default_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_default_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt
index 336237ab84a94781702d8a9cbd2da96bd8487b24..f737b5f302504bb754694b007b56cb4dbd8d9e97 100644 (file)
--- a/ext/xml/tests/xml_set_element_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_element_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_element_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
index eb90d99404a139866077121ee7ea93a729cb030e..eb52a82c0958d7eefd022b0123211425eb5cd3f1 100644 (file)
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_end_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
index 890374ea24802c283e072f0f31e90d081412a2cf..8b9b99ba53b4a102045d038ce13ef0f6d89d7789 100644 (file)
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_external_entity_ref_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
index 97172658f904d61e94172b077003d090e593d6e3..864ccddd36902e9e71210ed2900365baf4ceb9ed 100644 (file)
--- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_notation_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt
index fe06f9a248a97b176a41c5655d0190c4d5b7ca69..6f581ba3438308eff501327faac2635a10db4075 100644 (file)
--- a/ext/xml/tests/xml_set_object_variation1.phpt
+++ b/ext/xml/tests/xml_set_object_variation1.phpt
@@ -100,22 +100,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_object() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt
index bca3472a0788948d318c463e290e8cc530e9710a..cf8b18938105f14ee153ab4352039a609dad4411 100644 (file)
--- a/ext/xml/tests/xml_set_object_variation2.phpt
+++ b/ext/xml/tests/xml_set_object_variation2.phpt
@@ -94,22 +94,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_object() expects parameter 2 to be object, integer given in %s on line %d
+Warning: xml_set_object() expects parameter 2 to be object, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
index 957458275bab4a3f6d60d8c083d7f533b78f8efe..5293c3c3aeec51cf85a5f1ca44acdd642ca68017 100644 (file)
--- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_processing_instruction_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
index 0a80b21a76ed0b5c3b150603ce2ff190a779649b..949e51e90f71cd11690a09e3c1ac279f03c1d1f3 100644 (file)
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_start_namespace_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
index ec1061e59b5e0e274585e3b8bf4e9a17bcada204..5ba3534d2baf0cef4cd1858f04cef720f4e4a2b6 100644 (file)
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
@@ -104,22 +104,22 @@ echo "Done";
 
 Arg value 0 
 
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 1 
 
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 12345 
 
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value -2345 
 
-Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, integer given in %s on line %d
+Warning: xml_set_unparsed_entity_decl_handler() expects parameter 1 to be resource, int given in %s on line %d
 NULL
 
 Arg value 10.5 

diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt
index 740054269f72cf90d70e81adbbc4697b01de8fec..39c47140337384afdafa5bba13405a2d3c885007 100644 (file)
--- a/ext/zlib/tests/gzdeflate_error1.phpt
+++ b/ext/zlib/tests/gzdeflate_error1.phpt
@@ -81,6 +81,6 @@ bool(false)
 Warning: gzdeflate() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzdeflate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gzdeflate() expects parameter 2 to be int, object given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt
index 5a16ffbc5fd11722297a6399634ab2bb30438a5f..967f4c4e05bbad410a8b6fbe09dd6403694937b7 100644 (file)
--- a/ext/zlib/tests/gzencode_error1.phpt
+++ b/ext/zlib/tests/gzencode_error1.phpt
@@ -84,15 +84,15 @@ bool(false)
 Warning: gzencode() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzencode() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gzencode() expects parameter 2 to be int, object given in %s on line %d
 NULL
 
 Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
 
-Warning: gzencode() expects parameter 3 to be integer, object given in %s on line %d
+Warning: gzencode() expects parameter 3 to be int, object given in %s on line %d
 NULL
 
-Warning: gzencode() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzencode() expects parameter 2 to be int, string given in %s on line %d
 NULL
 ===Done===

diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt
index 145e4c53ca2abfb4d4aaf73b654d7128ec02236f..81f844402bb1e08ad1e63759e996b697d73def0c 100644 (file)
--- a/ext/zlib/tests/gzfile_variation10.phpt
+++ b/ext/zlib/tests/gzfile_variation10.phpt
@@ -71,10 +71,10 @@ array(6) {
 "
 }
 
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 array(6) {
   [0]=>

diff --git a/ext/zlib/tests/gzfile_variation13.phpt b/ext/zlib/tests/gzfile_variation13.phpt
index 24f3c84451b44e206649a93f2c4b8a939c8d7265..f090ac38b8b0fd9d10c6591c5aca7ae2c9ee617a 100644 (file)
--- a/ext/zlib/tests/gzfile_variation13.phpt
+++ b/ext/zlib/tests/gzfile_variation13.phpt
@@ -44,8 +44,8 @@ foreach ( $variation as $var ) {
 ?>
 ===DONE===
 --EXPECTF--
-Error: 2 - gzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - gzfile() expects parameter 2 to be int, object given, %s(%d)
 NULL
-Error: 2 - gzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - gzfile() expects parameter 2 to be int, object given, %s(%d)
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/zlib/tests/gzfile_variation14.phpt b/ext/zlib/tests/gzfile_variation14.phpt
index 92547adb7c27c0b04b8fc5523d7aa6cca99eba77..1d7ec54433232081386357fd35960c1158a1af64 100644 (file)
--- a/ext/zlib/tests/gzfile_variation14.phpt
+++ b/ext/zlib/tests/gzfile_variation14.phpt
@@ -30,15 +30,15 @@ foreach ( $variation_array as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt
index 36d1d4c71b172fc7f20ecdeb1ba7f09b2d515e07..ed7ece218c5c32bdc78f180ed3c1650206e7ba07 100644 (file)
--- a/ext/zlib/tests/gzfile_variation2.phpt
+++ b/ext/zlib/tests/gzfile_variation2.phpt
@@ -26,15 +26,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/zlib/tests/gzfile_variation8.phpt b/ext/zlib/tests/gzfile_variation8.phpt
index 070fa30e4011a0bc996b1c5821e60f36419630f5..9c9a29d4853b84fa44b844c7644a97cfaef6afbd 100644 (file)
--- a/ext/zlib/tests/gzfile_variation8.phpt
+++ b/ext/zlib/tests/gzfile_variation8.phpt
@@ -29,15 +29,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: gzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: gzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt
index 822d9b8129292c9fd9b37aee512b13558b3618ac..1921afc859eff7163d8a531cb108899e433d0433 100644 (file)
--- a/ext/zlib/tests/gzinflate_error1.phpt
+++ b/ext/zlib/tests/gzinflate_error1.phpt
@@ -70,6 +70,6 @@ bool(false)
 Warning: gzinflate() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzinflate() expects parameter 2 to be integer, object given in %s on line %d
+Warning: gzinflate() expects parameter 2 to be int, object given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/zlib/tests/gzopen_variation3.phpt b/ext/zlib/tests/gzopen_variation3.phpt
index 4ba607420d094a7325dd9fe35eb31c3b6b0ab9a8..e0e60f8c7ab66992b1c2a6bc489120019059f482 100644 (file)
--- a/ext/zlib/tests/gzopen_variation3.phpt
+++ b/ext/zlib/tests/gzopen_variation3.phpt
@@ -142,19 +142,19 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 
 --empty array--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - gzopen() expects parameter 3 to be integer, array given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -176,35 +176,35 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 
 --empty string DQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --string DQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --string SQ--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --heredoc--
-Error: 2 - gzopen() expects parameter 3 to be integer, string given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, string given, %s(%d)
 NULL
 
 --instance of classWithToString--
-Error: 2 - gzopen() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, object given, %s(%d)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - gzopen() expects parameter 3 to be integer, object given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, object given, %s(%d)
 NULL
 
 --undefined var--
@@ -214,6 +214,6 @@ resource(%d) of type (stream)
 resource(%d) of type (stream)
 
 --resource--
-Error: 2 - gzopen() expects parameter 3 to be integer, resource given, %s(%d)
+Error: 2 - gzopen() expects parameter 3 to be int, resource given, %s(%d)
 NULL
 ===DONE===

diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt
index baf2527c1472428eb3f1ef0d57a7cf780a8437b7..71c60552ec8c7e7fd2e1ad34310c94679d8b67c8 100644 (file)
--- a/ext/zlib/tests/gzuncompress_error1.phpt
+++ b/ext/zlib/tests/gzuncompress_error1.phpt
@@ -75,6 +75,6 @@ bool(false)
 Warning: gzuncompress() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
-Warning: gzuncompress() expects parameter 2 to be integer, string given in %s on line %d
+Warning: gzuncompress() expects parameter 2 to be int, string given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt
index 0f24c5efb275232e0b96bc993ca565649b664a72..323dca16ce346b02d78003171a768422d1ae884d 100644 (file)
--- a/ext/zlib/tests/readgzfile_variation10.phpt
+++ b/ext/zlib/tests/readgzfile_variation10.phpt
@@ -45,10 +45,10 @@ as it turns around
 and I know that it descends down on me
 int(176)
 
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 When you're taught through feelings
 Destiny flying high above

diff --git a/ext/zlib/tests/readgzfile_variation13.phpt b/ext/zlib/tests/readgzfile_variation13.phpt
index d6c1fb4042256b950c86259c1086cd48cf9ac32a..e7fe83ccc2abd5df4d9ab13b9ad5abc88ced3429 100644 (file)
--- a/ext/zlib/tests/readgzfile_variation13.phpt
+++ b/ext/zlib/tests/readgzfile_variation13.phpt
@@ -44,8 +44,8 @@ foreach ( $variation as $var ) {
 ?>
 ===DONE===
 --EXPECTF--
-Error: 2 - readgzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - readgzfile() expects parameter 2 to be int, object given, %s(%d)
 NULL
-Error: 2 - readgzfile() expects parameter 2 to be integer, object given, %s(%d)
+Error: 2 - readgzfile() expects parameter 2 to be int, object given, %s(%d)
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt
index 08f62935bc48293cd1366d9fec8d2587ed97db53..23ba1dcf0cf459b634c84de7498aeecc2a1badf6 100644 (file)
--- a/ext/zlib/tests/readgzfile_variation14.phpt
+++ b/ext/zlib/tests/readgzfile_variation14.phpt
@@ -30,15 +30,15 @@ foreach ( $variation_array as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, string given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt
index 80cb728e930872ca5c1d31db3ec109d0ec9f628d..88a82f0182b479a6ea5de55578ca4d0afab8cf24 100644 (file)
--- a/ext/zlib/tests/readgzfile_variation2.phpt
+++ b/ext/zlib/tests/readgzfile_variation2.phpt
@@ -26,15 +26,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/ext/zlib/tests/readgzfile_variation8.phpt b/ext/zlib/tests/readgzfile_variation8.phpt
index 7242f19b22b7ce8bd5d9a40eb9805fb8bcadf7f1..bd2a58382bb7da74166bdbc5f4dc841e7e539e98 100644 (file)
--- a/ext/zlib/tests/readgzfile_variation8.phpt
+++ b/ext/zlib/tests/readgzfile_variation8.phpt
@@ -29,15 +29,15 @@ foreach ( $variation as $var ) {
 ===DONE===
 --EXPECTF--
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 
-Warning: readgzfile() expects parameter 2 to be integer, array given in %s on line %d
+Warning: readgzfile() expects parameter 2 to be int, array given in %s on line %d
 NULL
 ===DONE===
\ No newline at end of file

diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index fc3032602fb9f6867ec3ce06f7c9229aede4397b..06a7084cc3fc684019198747764c83e9f12a4401 100644 (file)
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -43,24 +43,24 @@ string(%d) "Extension [ <persistent> extension #%d pcre version %s ] {
   }
 
   - Constants [19] {
-    Constant [ integer PREG_PATTERN_ORDER ] { 1 }
-    Constant [ integer PREG_SET_ORDER ] { 2 }
-    Constant [ integer PREG_OFFSET_CAPTURE ] { 256 }
-    Constant [ integer PREG_UNMATCHED_AS_NULL ] { 512 }
-    Constant [ integer PREG_SPLIT_NO_EMPTY ] { 1 }
-    Constant [ integer PREG_SPLIT_DELIM_CAPTURE ] { 2 }
-    Constant [ integer PREG_SPLIT_OFFSET_CAPTURE ] { 4 }
-    Constant [ integer PREG_GREP_INVERT ] { 1 }
-    Constant [ integer PREG_NO_ERROR ] { 0 }
-    Constant [ integer PREG_INTERNAL_ERROR ] { 1 }
-    Constant [ integer PREG_BACKTRACK_LIMIT_ERROR ] { 2 }
-    Constant [ integer PREG_RECURSION_LIMIT_ERROR ] { 3 }
-    Constant [ integer PREG_BAD_UTF8_ERROR ] { 4 }
-    Constant [ integer PREG_BAD_UTF8_OFFSET_ERROR ] { 5 }
-    Constant [ integer PREG_JIT_STACKLIMIT_ERROR ] { 6 }
+    Constant [ int PREG_PATTERN_ORDER ] { 1 }
+    Constant [ int PREG_SET_ORDER ] { 2 }
+    Constant [ int PREG_OFFSET_CAPTURE ] { 256 }
+    Constant [ int PREG_UNMATCHED_AS_NULL ] { 512 }
+    Constant [ int PREG_SPLIT_NO_EMPTY ] { 1 }
+    Constant [ int PREG_SPLIT_DELIM_CAPTURE ] { 2 }
+    Constant [ int PREG_SPLIT_OFFSET_CAPTURE ] { 4 }
+    Constant [ int PREG_GREP_INVERT ] { 1 }
+    Constant [ int PREG_NO_ERROR ] { 0 }
+    Constant [ int PREG_INTERNAL_ERROR ] { 1 }
+    Constant [ int PREG_BACKTRACK_LIMIT_ERROR ] { 2 }
+    Constant [ int PREG_RECURSION_LIMIT_ERROR ] { 3 }
+    Constant [ int PREG_BAD_UTF8_ERROR ] { 4 }
+    Constant [ int PREG_BAD_UTF8_OFFSET_ERROR ] { 5 }
+    Constant [ int PREG_JIT_STACKLIMIT_ERROR ] { 6 }
     Constant [ string PCRE_VERSION ] { %s }
-    Constant [ integer PCRE_VERSION_MAJOR ] { %d }
-    Constant [ integer PCRE_VERSION_MINOR ] { %d }
+    Constant [ int PCRE_VERSION_MAJOR ] { %d }
+    Constant [ int PCRE_VERSION_MINOR ] { %d }
     Constant [ boolean PCRE_JIT_SUPPORT ] { %d }
   }
 

diff --git a/sapi/phpdbg/tests/info_002.phpt b/sapi/phpdbg/tests/info_002.phpt
index faeca0e4302ebec70c710c6dc1e35e6f2268b05e..8b1aa0930c9ae2dad1425bbfe9083f928e6700fa 100644 (file)
--- a/sapi/phpdbg/tests/info_002.phpt
+++ b/sapi/phpdbg/tests/info_002.phpt
@@ -13,11 +13,11 @@ prompt> [Breakpoint #0 at %s:10, hits: 1]
  00011: 
 prompt> [User-defined constants (2)]
 Address            Refs    Type      Constant
-%s 1       integer   A
+%s 1       int       A
 int (10)
-%s 1       integer   B
+%s 1       int       B
 int (100)
-prompt> 
+prompt>
 --FILE--
 <?php
 

diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt
index 50de31e44b6b7492b02e70773d4954583ee03f78..fb788e3d9c633d140739110e7a2554116b54d55e 100644 (file)
--- a/tests/classes/type_hinting_003.phpt
+++ b/tests/classes/type_hinting_003.phpt
@@ -57,7 +57,7 @@ array(1) {
   int(25)
 }
 
-Fatal error: Uncaught TypeError: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to Test::f1() must be of the type array, int given, called in %s on line %d and defined in %s:%d
 Stack trace:
 #0 %s(%d): Test::f1(1)
 #1 {main}

diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt
index 95df6264dda440d17d45ed9fb05596878282540f..174664c02ffe4ab5b3e6d8ec4d9e8f8310fb3f6c 100644 (file)
--- a/tests/classes/type_hinting_004.phpt
+++ b/tests/classes/type_hinting_004.phpt
@@ -7,7 +7,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
       echo "$errno: $errstr - $errfile($errline)\n";
       return true;
   }
-  
+
   echo "---> Type hints with callback function:\n";
   class A  {  }
   function f1(A $a)  {
@@ -46,7 +46,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
   } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
-  
+
   echo "\n\n---> Type hints with callback static method:\n";
   class C {
       static function f1(A $a) {
@@ -95,7 +95,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
   } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
-  
+
   echo "\n\n---> Type hints with callback instance method:\n";
   class D {
       function f1(A $a) {
@@ -145,14 +145,14 @@ Ensure type hints are enforced for functions invoked as callbacks.
   } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
-  
+
 ?>
 --EXPECTF--
 ---> Type hints with callback function:
-0: Argument 1 passed to f1() must be an instance of A, integer given%s(%d)
+0: Argument 1 passed to f1() must be an instance of A, int given%s(%d)
 
 in f1;
-0: Argument 1 passed to f2() must be an instance of A or null, integer given%s(%d)
+0: Argument 1 passed to f2() must be an instance of A or null, int given%s(%d)
 
 in f2;
 in f2;
@@ -160,10 +160,10 @@ in f2;
 
 
 ---> Type hints with callback static method:
-0: Argument 1 passed to C::f1() must be an instance of A, integer given%s(%d)
+0: Argument 1 passed to C::f1() must be an instance of A, int given%s(%d)
 
 in C::f1 (static);
-0: Argument 1 passed to C::f2() must be an instance of A or null, integer given%s(%d)
+0: Argument 1 passed to C::f2() must be an instance of A or null, int given%s(%d)
 
 in C::f2 (static);
 in C::f2 (static);
@@ -171,10 +171,10 @@ in C::f2 (static);
 
 
 ---> Type hints with callback instance method:
-0: Argument 1 passed to D::f1() must be an instance of A, integer given%s(%d)
+0: Argument 1 passed to D::f1() must be an instance of A, int given%s(%d)
 
 in C::f1 (instance);
-0: Argument 1 passed to D::f2() must be an instance of A or null, integer given%s(%d)
+0: Argument 1 passed to D::f2() must be an instance of A or null, int given%s(%d)
 
 in C::f2 (instance);
 in C::f2 (instance);

diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt
index b089569d9118b3e093047d74ae5096121f85c506..a53457d5d9b8bca12a0f5b2573f2f7bd0914a3b8 100644 (file)
--- a/tests/lang/bug24658.phpt
+++ b/tests/lang/bug24658.phpt
@@ -53,7 +53,7 @@ int(2)
 object(foo)#%d (0) {
 }
 
-Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, int given in %s:%d
 Stack trace:
 #0 [internal function]: typehint(1, 1)
 #1 %s(%d): array_walk(Array, 'typehint')

diff --git a/tests/lang/func_get_arg_variation.phpt b/tests/lang/func_get_arg_variation.phpt
index 3dab69f246007952a2c2f1d0bbfedc6931ceb9b4..83b20848fe2f50e05d7519ba0a90a9d9fd9957a7 100644 (file)
--- a/tests/lang/func_get_arg_variation.phpt
+++ b/tests/lang/func_get_arg_variation.phpt
@@ -20,7 +20,7 @@ Warning: func_get_arg() expects exactly 1 parameter, 0 given in %s on line %d
 
 Warning: func_get_arg() expects exactly 1 parameter, 2 given in %s on line %d
 
-Warning: func_get_arg() expects parameter 1 to be integer, string given in %s on line %d
+Warning: func_get_arg() expects parameter 1 to be int, string given in %s on line %d
 
 Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
 

diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt
index 64c911d4476ae0da34b2aa279c3b92327fefa20f..8f2442f8f8d831b41808c0413c10433c25fd1afa 100644 (file)
--- a/tests/output/ob_implicit_flush_variation_001.phpt
+++ b/tests/output/ob_implicit_flush_variation_001.phpt
@@ -122,19 +122,19 @@ NULL
 NULL
 
 --empty array--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
 NULL
 
 --int indexed array--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
 NULL
 
 --associative array--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
 NULL
 
 --nested arrays--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, array given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97)
 NULL
 
 --uppercase NULL--
@@ -156,35 +156,35 @@ NULL
 NULL
 
 --empty string DQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
 NULL
 
 --empty string SQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
 NULL
 
 --string DQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
 NULL
 
 --string SQ--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
 NULL
 
 --mixed case string--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
 NULL
 
 --heredoc--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, string given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97)
 NULL
 
 --instance of classWithToString--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, object given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97)
 NULL
 
 --instance of classWithoutToString--
-Error: 2 - ob_implicit_flush() expects parameter 1 to be integer, object given, %s(97)
+Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97)
 NULL
 
 --undefined var--

diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt
index 34aa13d802c13fa168c9c02046a6e9a1fe82bb52..92372c7747bd3ad468e13f4bfdad27658dc025ee 100644 (file)
--- a/tests/output/ob_start_error_001.phpt
+++ b/tests/output/ob_start_error_001.phpt
@@ -44,10 +44,10 @@ bool(false)
 
 - Arg 2 wrong type
 
-Warning: ob_start() expects parameter 2 to be integer, string given in %s on line 23
+Warning: ob_start() expects parameter 2 to be int, string given in %s on line 23
 NULL
 
 - Arg 3 wrong type
 
-Warning: ob_start() expects parameter 3 to be integer, string given in %s on line 26
+Warning: ob_start() expects parameter 3 to be int, string given in %s on line 26
 NULL