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/exif | |
| 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/exif')
| -rw-r--r-- | ext/exif/tests/exif_tagname_variation1-64bit.phpt | 18 | ||||
| -rw-r--r-- | ext/exif/tests/exif_tagname_variation1.phpt | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/ext/exif/tests/exif_tagname_variation1-64bit.phpt b/ext/exif/tests/exif_tagname_variation1-64bit.phpt index 22298af2ae..4e61c25bb9 100644 --- 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 44d2568f49..207b200aac 100644 --- 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) |