diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-04 11:33:49 -0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-04 19:08:23 +0100 |
| commit | ce1d69a1f6dcf15d43029301059c25e5bc09a577 (patch) | |
| tree | 3df785771b4bfa07a9e270b04750840ed47f1cbf /ext/curl | |
| parent | 4861730a945908208a049b0c037ddf4a339f999a (diff) | |
| download | php-git-ce1d69a1f6dcf15d43029301059c25e5bc09a577.tar.gz | |
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".
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/tests/curl_setopt_error.phpt | 2 | ||||
| -rw-r--r-- | ext/curl/tests/curl_version_variation1.phpt | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt index b9727c8a55..3d157c1ede 100644 --- 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 7c0106cb6a..cbf2d4cbac 100644 --- 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) |