diff options
| author | Stanislav Malyshev <stas@php.net> | 2017-01-15 18:42:33 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2017-01-15 18:42:33 -0800 |
| commit | 2c7909697a98eb51e3671bc59edc1d7adfa72a0e (patch) | |
| tree | d84c59e17d545bf8ef87cba2a6c8886200c31372 | |
| parent | 43d0f2abc552781847a23fe9b2d89925c6201078 (diff) | |
| parent | 814966ad33f9a734e422e34327256d58a91d1272 (diff) | |
| download | php-git-2c7909697a98eb51e3671bc59edc1d7adfa72a0e.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix test
| -rw-r--r-- | ext/exif/tests/exif_imagetype_variation1.phpt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/exif/tests/exif_imagetype_variation1.phpt b/ext/exif/tests/exif_imagetype_variation1.phpt index 767ed5fecb..d33217c5f8 100644 --- a/ext/exif/tests/exif_imagetype_variation1.phpt +++ b/ext/exif/tests/exif_imagetype_variation1.phpt @@ -142,23 +142,23 @@ Warning: exif_imagetype(0.5): failed to open stream: No such file or directory i bool(false) -- Iteration 10 -- -Warning: exif_imagetype() expects parameter 1 to be string, array given in %s on line %d +Warning: exif_imagetype() expects parameter 1 to be a valid path, array given in %s on line %d NULL -- Iteration 11 -- -Warning: exif_imagetype() expects parameter 1 to be string, array given in %s on line %d +Warning: exif_imagetype() expects parameter 1 to be a valid path, array given in %s on line %d NULL -- Iteration 12 -- -Warning: exif_imagetype() expects parameter 1 to be string, array given in %s on line %d +Warning: exif_imagetype() expects parameter 1 to be a valid path, array given in %s on line %d NULL -- Iteration 13 -- -Warning: exif_imagetype() expects parameter 1 to be string, array given in %s on line %d +Warning: exif_imagetype() expects parameter 1 to be a valid path, array given in %s on line %d NULL -- Iteration 14 -- -Warning: exif_imagetype() expects parameter 1 to be string, array given in %s on line %d +Warning: exif_imagetype() expects parameter 1 to be a valid path, array given in %s on line %d NULL -- Iteration 15 -- @@ -198,7 +198,7 @@ Warning: exif_imagetype(obj'ct): failed to open stream: No such file or director bool(false) -- Iteration 24 -- -Warning: exif_imagetype() expects parameter 1 to be string, resource given in %s on line %d +Warning: exif_imagetype() expects parameter 1 to be a valid path, resource given in %s on line %d NULL -- Iteration 25 -- |