Skip to content

Review parameter names in ext/exif #6256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Review parameter names in ext/exif #6256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ext/exif/exif.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 6 deletions ext/exif/exif_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ext/exif/tests/filename_empty.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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