-
Notifications
You must be signed in to change notification settings - Fork 8.1k
ext/gd: Add ZPP specifiers for array|float parameters #23384
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| --TEST-- | ||
| imageaffinematrixget() array|float parameter coercions (strict mode) | ||
| --EXTENSIONS-- | ||
| gd | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| $values = [ | ||
| 'null' => null, | ||
| 'false' => false, | ||
| 'true' => true, | ||
| 'int' => 42, | ||
| 'float' => 73.5, | ||
| 'numeric string' => '15', | ||
| 'non-numeric string' => 'string', | ||
| 'array' => [], | ||
| 'object' => new stdClass(), | ||
| ]; | ||
|
|
||
| foreach ($values as $name => $value) { | ||
| echo "$name:\n"; | ||
| try { | ||
| imageaffinematrixget(IMG_AFFINE_ROTATE, $value); | ||
| echo "accepted\n"; | ||
| } catch (Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), "\n"; | ||
| } | ||
| } | ||
|
|
||
| echo "array for translate:\n"; | ||
| imageaffinematrixget(IMG_AFFINE_TRANSLATE, ['x' => 1, 'y' => 2]); | ||
| echo "accepted\n"; | ||
|
|
||
| echo "float for translate:\n"; | ||
| try { | ||
| imageaffinematrixget(IMG_AFFINE_TRANSLATE, 1.0); | ||
| } catch (Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), "\n"; | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| null: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, null given | ||
| false: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, false given | ||
| true: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, true given | ||
| int: | ||
| accepted | ||
| float: | ||
| accepted | ||
| numeric string: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, string given | ||
| non-numeric string: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, string given | ||
| array: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type float when using rotate or shear | ||
| object: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, stdClass given | ||
| array for translate: | ||
| accepted | ||
| float for translate: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array when using translate or scale |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| --TEST-- | ||
| imageaffinematrixget() array|float parameter coercions (weak mode) | ||
| --EXTENSIONS-- | ||
| gd | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| $values = [ | ||
| 'null' => null, | ||
| 'false' => false, | ||
| 'true' => true, | ||
| 'int' => 42, | ||
| 'float' => 73.5, | ||
| 'numeric string' => '15', | ||
| 'non-numeric string' => 'string', | ||
| 'array' => [], | ||
| 'object' => new stdClass(), | ||
| ]; | ||
|
|
||
| foreach ($values as $name => $value) { | ||
| echo "$name:\n"; | ||
| try { | ||
| imageaffinematrixget(IMG_AFFINE_ROTATE, $value); | ||
| echo "accepted\n"; | ||
| } catch (Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), "\n"; | ||
| } | ||
| } | ||
|
|
||
| echo "array for translate:\n"; | ||
| imageaffinematrixget(IMG_AFFINE_TRANSLATE, ['x' => 1, 'y' => 2]); | ||
| echo "accepted\n"; | ||
|
|
||
| echo "float for translate:\n"; | ||
| try { | ||
| imageaffinematrixget(IMG_AFFINE_TRANSLATE, 1.0); | ||
| } catch (Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), "\n"; | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| null: | ||
|
|
||
| Deprecated: imageaffinematrixget(): Passing null to parameter #2 ($options) of type array|float is deprecated in %s on line %d | ||
| accepted | ||
| false: | ||
| accepted | ||
| true: | ||
| accepted | ||
| int: | ||
| accepted | ||
| float: | ||
| accepted | ||
| numeric string: | ||
| accepted | ||
| non-numeric string: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, string given | ||
| array: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type float when using rotate or shear | ||
| object: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array|float, stdClass given | ||
| array for translate: | ||
| accepted | ||
| float for translate: | ||
| TypeError: imageaffinematrixget(): Argument #2 ($options) must be of type array when using translate or scale |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Future PR: Ideally this should use a stricter variant as tmp could be an object of an array and still pass.