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/sysvshm/tests | |
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/sysvshm/tests')
-rw-r--r-- | ext/sysvshm/tests/002.phpt | 2 | ||||
-rw-r--r-- | ext/sysvshm/tests/003.phpt | 6 | ||||
-rw-r--r-- | ext/sysvshm/tests/004.phpt | 4 | ||||
-rw-r--r-- | ext/sysvshm/tests/005.phpt | 4 | ||||
-rw-r--r-- | ext/sysvshm/tests/006.phpt | 2 | ||||
-rw-r--r-- | ext/sysvshm/tests/007.phpt | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt index cf83b8228b..c27782a07f 100644 --- 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 9b5ed4ddba..565c7c454e 100644 --- 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 877f9f4a6d..ea931cbca2 100644 --- 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 15200c6dd8..6608aba2c7 100644 --- 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 1e4ec1c357..a8f5064b4b 100644 --- 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 584f13ac7a..89e32e6c4f 100644 --- 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 |