archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Review parameter names in ext/exif

Browse source 
Closes GH-6256
This commit is contained in:
Máté Kocsis 2020-10-01 23:20:09 +02:00
parent 811f6dd8e5
commit 4f42519571
No known key found for this signature in database
GPG key ID: FD055E41728BF310
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/exif/exif.stub.php
View file

@ -4,15 +4,15 @@
function exif_tagname(int $index): string|false {}
/** @param resource|string $filename */
function exif_read_data($filename, ?string $sections_needed = null, bool $sub_arrays = false, bool $read_thumbnail = false): array|false {}
/** @param resource|string $file */
function exif_read_data($file, ?string $required_sections = null, bool $as_arrays = false, bool $read_thumbnail = false): array|false {}
/**
* @param resource|string $filename
* @param resource|string $file
* @param int $width
* @param int $height
* @param int $imagetype
* @param int $image_type
*/
function exif_thumbnail($filename, &$width = null, &$height = null, &$imagetype = null): string|false {}
function exif_thumbnail($file, &$width = null, &$height = null, &$image_type = null): string|false {}
function exif_imagetype(string $filename): int|false {}

12
ext/exif/exif_arginfo.h
View file

@ -1,22 +1,22 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: d8cb3719a7de74b27b306c30b6be0af0647b6af4 */
* Stub hash: ef23ff502ea9658af29e50d57366c281f7a7eb6c */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_exif_tagname, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_exif_read_data, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
ZEND_ARG_INFO(0, filename)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sections_needed, IS_STRING, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sub_arrays, _IS_BOOL, 0, "false")
ZEND_ARG_INFO(0, file)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, required_sections, IS_STRING, 1, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, as_arrays, _IS_BOOL, 0, "false")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, read_thumbnail, _IS_BOOL, 0, "false")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_exif_thumbnail, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_INFO(0, filename)
ZEND_ARG_INFO(0, file)
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, width, "null")
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, height, "null")
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, imagetype, "null")
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, image_type, "null")
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_exif_imagetype, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)

8
ext/exif/tests/filename_empty.phpt
View file

@ -29,7 +29,7 @@ try {
?>
--EXPECT--
exif_read_data(): Argument #1 ($filename) cannot be empty
exif_thumbnail(): Argument #1 ($filename) cannot be empty
exif_read_data(): Argument #1 ($filename) must not contain any null bytes
exif_thumbnail(): Argument #1 ($filename) must not contain any null bytes
exif_read_data(): Argument #1 ($file) cannot be empty
exif_thumbnail(): Argument #1 ($file) cannot be empty
exif_read_data(): Argument #1 ($file) must not contain any null bytes
exif_thumbnail(): Argument #1 ($file) must not contain any null bytes