Skip to content
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

Fix nullable in Imagick.stub.php #674

Closed
wants to merge 3 commits into from
Closed

Fix nullable in Imagick.stub.php #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d4d008
Fix nullable in Imagick.stub.php
mvorisek Jun 16, 2024
bd594b9
Enforce string for numeric values in YML CI
mvorisek Jun 16, 2024
1ba627d
Add PHP 8.2 and 8.3 CI testing
mvorisek Jun 16, 2024
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
86 changes: 43 additions & 43 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
php: [ 5.4 ]
php: [ "5.4" ]
imagemagick: [
7.1.0-13,
6.9.2-0,
"7.1.0-13",
"6.9.2-0",
]

steps:
Expand Down Expand Up @@ -80,49 +80,49 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
php: [5.4, 8.1, 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5]
php: ["5.4", "8.3", "8.2", "8.1", "8.0", "7.4", "7.3", "7.2", "7.1", "7.0", "5.6", "5.5"]
imagemagick: [
7.1.0-13,
7.0.10-27,
7.0.8-4,
7.0.1-0,
git7,
6.9.2-0,
6.8.7-0,
6.7.8-0,
git6
"7.1.0-13",
"7.0.10-27",
"7.0.8-4",
"7.0.1-0",
"git7",
"6.9.2-0",
"6.8.7-0",
"6.7.8-0",
"git6"
]
exclude:
- php: 5.4
imagemagick: 6.8.7-0
- php: 7.4
imagemagick: git6
- php: 7.3
imagemagick: git6
- php: 7.2
imagemagick: git6
- php: 7.1
imagemagick: git6
- php: 7.0
imagemagick: git6
- php: 5.6
imagemagick: git6
- php: 5.5
imagemagick: git6
- php: 7.4
imagemagick: git7
- php: 7.3
imagemagick: git7
- php: 7.2
imagemagick: git7
- php: 7.1
imagemagick: git7
- php: 7.0
imagemagick: git7
- php: 5.6
imagemagick: git7
- php: 5.5
imagemagick: git7
- php: "5.4"
imagemagick: "6.8.7-0"
- php: "7.4"
imagemagick: "git6"
- php: "7.3"
imagemagick: "git6"
- php: "7.2"
imagemagick: "git6"
- php: "7.1"
imagemagick: "git6"
- php: "7.0"
imagemagick: "git6"
- php: "5.6"
imagemagick: "git6"
- php: "5.5"
imagemagick: "git6"
- php: "7.4"
imagemagick: "git7"
- php: "7.3"
imagemagick: "git7"
- php: "7.2"
imagemagick: "git7"
- php: "7.1"
imagemagick: "git7"
- php: "7.0"
imagemagick: "git7"
- php: "5.6"
imagemagick: "git7"
- php: "5.5"
imagemagick: "git7"

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
php: [ 5.4 ]
php: [ "5.4" ]

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion Imagick.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ public function newImage(
int $columns,
int $rows,
ImagickPixel|string $background_color,
string $format = null
?string $format = null
): bool {}

// TODO - canvas? description
Expand Down
4 changes: 1 addition & 3 deletions Imagick_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4890,7 +4890,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_newImage, 0, 0, 3)
ZEND_ARG_OBJ_TYPE_MASK(0, background_color, ImagickPixel, MAY_BE_STRING, NULL)

#if PHP_VERSION_ID >= 80000
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 0, "null")
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 1, "null")
#else
ZEND_ARG_INFO(0, format)
#endif
Expand Down Expand Up @@ -6091,7 +6091,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Imagick_setOrientation, 0, 0, 1)
ZEND_END_ARG_INFO()
#endif


#if MagickLibVersion > 0x628
ZEND_METHOD(Imagick, optimizeImageLayers);
#endif
Expand Down Expand Up @@ -6881,7 +6880,6 @@ ZEND_METHOD(Imagick, setInterpolateMethod);
ZEND_METHOD(Imagick, setOrientation);
#endif


static const zend_function_entry class_Imagick_methods[] = {
#if MagickLibVersion > 0x628
ZEND_ME(Imagick, optimizeImageLayers, arginfo_class_Imagick_optimizeImageLayers, ZEND_ACC_PUBLIC)
Expand Down
Loading