Use the canonical order of types in array|string ZPP error messages

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 264b67764572ef3095f222eba72bae27a3f2539e..336060e5765bde2c1a150fb3becae2c28cbb17cd 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1223,8 +1223,8 @@ static zend_always_inline zval *zend_try_array_init(zval *zv)
        _(Z_EXPECTED_DOUBLE_OR_NULL,    "of type ?float") \
        _(Z_EXPECTED_NUMBER,                    "of type int|float") \
        _(Z_EXPECTED_NUMBER_OR_NULL,    "of type int|float|null") \
-       _(Z_EXPECTED_STRING_OR_ARRAY,   "of type string|array") \
-       _(Z_EXPECTED_STRING_OR_ARRAY_OR_NULL, "of type string|array|null") \
+       _(Z_EXPECTED_STRING_OR_ARRAY,   "of type array|string") \
+       _(Z_EXPECTED_STRING_OR_ARRAY_OR_NULL, "of type array|string|null") \
        _(Z_EXPECTED_STRING_OR_LONG,    "of type string|int") \
        _(Z_EXPECTED_STRING_OR_LONG_OR_NULL, "of type string|int|null") \
        _(Z_EXPECTED_CLASS_NAME_OR_OBJECT,      "a valid class name or object") \

diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt
index 58cd049691a97f74e4cf69061be17a6c85c83068..e654240f37f8411bbf4aeada67a81219160df9e9 100644 (file)
--- a/ext/pcre/tests/preg_replace_error1.phpt
+++ b/ext/pcre/tests/preg_replace_error1.phpt
@@ -56,4 +56,4 @@ string(1) "a"
 
 Arg value is /[a-zA-Z]/
 string(1) "1"
-preg_replace(): Argument #1 ($regex) must be of type string|array, stdClass given
+preg_replace(): Argument #1 ($regex) must be of type array|string, stdClass given

diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt
index 9a3056ab882ad47c0bc4abd0ce04ab67ef1e282d..c4503aafd198db21fd88b0b776fd296ece2c1ca9 100644 (file)
--- a/ext/pcre/tests/preg_replace_error2.phpt
+++ b/ext/pcre/tests/preg_replace_error2.phpt
@@ -36,5 +36,5 @@ string(64) "this is a stringthis is a stringthis is a stringthis is a string"
 
 Arg value is: Array
 preg_replace(): Argument #1 ($regex) must be of type array when argument #2 ($replace) is an array, string given
-preg_replace(): Argument #2 ($replace) must be of type string|array, stdClass given
+preg_replace(): Argument #2 ($replace) must be of type array|string, stdClass given
 Done

diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt
index 0ccd9d50d56031d7d40bf1199b8a3fbf55467353..65a96b0aab05ec449811818817d0342875ae9a42 100644 (file)
--- a/ext/phar/tests/phar_extract.phpt
+++ b/ext/phar/tests/phar_extract.phpt
@@ -141,7 +141,7 @@ string(2) "hi"
 string(3) "hi3"
 string(3) "hi2"
 bool(false)
-Phar::extractTo(): Argument #2 ($files) must be of type string|array|null, stdClass given
+Phar::extractTo(): Argument #2 ($files) must be of type array|string|null, stdClass given
 Phar::extractTo(): Argument #1 ($pathto) must be a valid path, array given
 Invalid argument, extraction path must be non-zero length
 Unable to use path "%soops" for extraction, it is a file, must be a directory

diff --git a/ext/soap/tests/fault_warning.phpt b/ext/soap/tests/fault_warning.phpt
index 77b5154b9a5e9f07a83a7590df7ac963b1cdca59..3a9fec6710d4a0df3646e14acfe51dae7afb4351 100644 (file)
--- a/ext/soap/tests/fault_warning.phpt
+++ b/ext/soap/tests/fault_warning.phpt
@@ -40,7 +40,7 @@ echo get_class($fault);
 ?>
 --EXPECT--
 SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code
-SoapFault::__construct(): Argument #1 ($faultcode) must be of type string|array|null, stdClass given
+SoapFault::__construct(): Argument #1 ($faultcode) must be of type array|string|null, stdClass given
 SoapFault
 SoapFault
 SoapFault::__construct(): Argument #1 ($faultcode) is not a valid fault code

diff --git a/ext/standard/tests/array/bug74345.phpt b/ext/standard/tests/array/bug74345.phpt
index 0916e17a54e1a4a599bf4cf70844dc89ad0a79bd..cc5520676089aeb48f4bca45413285ed01b393ac 100644 (file)
--- a/ext/standard/tests/array/bug74345.phpt
+++ b/ext/standard/tests/array/bug74345.phpt
@@ -42,5 +42,5 @@ try {
 --EXPECT--
 array_map(): Argument #2 ($array1) must be of type array, null given
 array_map(): Argument #2 ($array1) must be of type array, null given
-preg_replace_callback(): Argument #3 ($subject) must be of type string|array, stdClass given
+preg_replace_callback(): Argument #3 ($subject) must be of type array|string, stdClass given
 ===DONE===

diff --git a/ext/standard/tests/streams/bug61115.phpt b/ext/standard/tests/streams/bug61115.phpt
index 28a1838c1638a8e0c8df6327676064e20b0dce24..cb11e23d38014b8e1184ab12246efebd804d4683 100644 (file)
--- a/ext/standard/tests/streams/bug61115.phpt
+++ b/ext/standard/tests/streams/bug61115.phpt
@@ -14,4 +14,4 @@ try {
 }
 ?>
 --EXPECT--
-preg_replace(): Argument #2 ($replace) must be of type string|array, Closure given
+preg_replace(): Argument #2 ($replace) must be of type array|string, Closure given

diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index 2e394c08a890790d5575665cb03f40aca145147f..a21251aec2a28e4a05128d6a99f068cf4b184f76 100644 (file)
--- a/ext/standard/tests/strings/join_variation1.phpt
+++ b/ext/standard/tests/strings/join_variation1.phpt
@@ -147,7 +147,7 @@ string(16) "element1element2"
 -- Iteration 23 --
 string(16) "element1element2"
 -- Iteration 24 --
-join(): Argument #1 ($glue) must be of type string|array, resource given
+join(): Argument #1 ($glue) must be of type array|string, resource given
 -- Iteration 25 --
 string(16) "element1element2"
 -- Iteration 26 --

diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt
index 46902e5929d1f6944a9ea9b32cbcda3ab0262d97..fcc903d6377f490c3b7f1d13943a574b9de68fed 100644 (file)
--- a/ext/standard/tests/strings/strtr_variation6.phpt
+++ b/ext/standard/tests/strings/strtr_variation6.phpt
@@ -119,7 +119,7 @@ string(6) "012atm"
 -- Iteration 16 --
 string(6) "012ttm"
 -- Iteration 17 --
-strtr(): Argument #2 ($from) must be of type string|array, resource given
+strtr(): Argument #2 ($from) must be of type array|string, resource given
 -- Iteration 18 --
 string(6) "012atm"
 -- Iteration 19 --

diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt
index 65aba9c51b6e7e4f38716392c2edaecd9cd7191a..7ac60532f8b5bb0bde29551bce84365e81703656 100644 (file)
--- a/ext/standard/tests/strings/strtr_variation8.phpt
+++ b/ext/standard/tests/strings/strtr_variation8.phpt
@@ -136,7 +136,7 @@ strtr(): Argument #2 ($from) must be of type array, string given
 strtr(): Argument #2 ($from) must be of type array, string given
 
 -- Iteration 17 --
-strtr(): Argument #2 ($from) must be of type string|array, resource given
+strtr(): Argument #2 ($from) must be of type array|string, resource given
 
 -- Iteration 18 --
 strtr(): Argument #2 ($from) must be of type array, string given