From 3d4d0086bd37e24eaf6800a7c992d2b9fd6d49a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 16 Jun 2024 15:46:28 +0200 Subject: [PATCH 1/3] Fix nullable in Imagick.stub.php --- Imagick.stub.php | 2 +- Imagick_arginfo.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Imagick.stub.php b/Imagick.stub.php index 804c0152..280c8bc8 100644 --- a/Imagick.stub.php +++ b/Imagick.stub.php @@ -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 diff --git a/Imagick_arginfo.h b/Imagick_arginfo.h index 577bcb0b..c091e7c4 100644 --- a/Imagick_arginfo.h +++ b/Imagick_arginfo.h @@ -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 @@ -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 @@ -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) From bd594b9e0be6539b612de9fcfff36d1f3504ef8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 16 Jun 2024 15:50:59 +0200 Subject: [PATCH 2/3] Enforce string for numeric values in YML CI --- .github/workflows/main.yml | 86 +++++++++++++------------- .github/workflows/release_validate.yml | 2 +- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52ba9606..57a6f558 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: @@ -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.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 diff --git a/.github/workflows/release_validate.yml b/.github/workflows/release_validate.yml index 9759e45b..436243c7 100644 --- a/.github/workflows/release_validate.yml +++ b/.github/workflows/release_validate.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest ] - php: [ 5.4 ] + php: [ "5.4" ] steps: - name: Checkout code From 1ba627de1b115f95943ccf7cf2f97aefb2d845fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 16 Jun 2024 15:51:20 +0200 Subject: [PATCH 3/3] Add PHP 8.2 and 8.3 CI testing --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 57a6f558..73f4b2e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,7 +80,7 @@ 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",