diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-bartlett-php-compatinfo-db.spec | 26 | ||||
| -rw-r--r-- | upstream.patch | 1274 |
3 files changed, 1297 insertions, 5 deletions
diff --git a/composer.json b/composer.json index 0be9056..380796e 100644 --- a/composer.json +++ b/composer.json @@ -19,11 +19,13 @@ "composer/package-versions-deprecated": "^1.8", "composer/semver": "^1.0|^2.0|^3.0", "doctrine/orm": "^2.7", + "symfony/cache": "^4.4|^5.0", "symfony/config": "^4.4|^5.0", "symfony/console": "^4.4|^5.0", "symfony/dependency-injection": "^4.4|^5.0", "symfony/event-dispatcher": "^4.4|^5.0", "symfony/messenger": "^4.4|^5.0", + "symfony/process": "^4.4|^5.0", "symfony/requirements-checker": "^2.0", "symfony/stopwatch": "^4.4|^5.0" }, diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index 0e4c4f1..1700e9b 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -25,13 +25,15 @@ # disabled as too much issues, e.g. with symfony-polyfill %bcond_with tests %endif +%bcond_with im6 +%bcond_with im7 %global upstream_version 3.7.0 #global upstream_prever RC1 Name: php-%{c_vendor}-%{c_project} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 3%{?dist} Summary: Reference Database to be used with php-compatinfo library License: BSD @@ -45,6 +47,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Patch0: %{name}-3.7-rpm.patch # CURL_SSLVERSION constants have been backported Patch1: %{name}-curltls.patch +# upstream fix +Patch2: upstream.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 @@ -73,6 +77,7 @@ BuildRequires: php-symfony4-config >= 4.4 BuildRequires: php-symfony4-console >= 4.4 BuildRequires: php-symfony4-dependency-injection >= 4.4 BuildRequires: php-symfony4-event-dispatcher >= 4.4 +BuildRequires: php-symfony4-process >= 4.4 BuildRequires: php-symfony4-messenger >= 4.4 BuildRequires: php-symfony4-stopwatch >= 4.4 # For our patch / autoloader @@ -82,6 +87,12 @@ BuildRequires: php-composer(fedora/autoloader) BuildRequires: php-cli %if %{with tests} BuildRequires: phpunit9 +%if %{with im6} +BuildRequires: php-pecl-imagick-im6 +%endif +%if %{with im7} +BuildRequires: php-pecl-imagick-im7 +%endif %endif # From composer.json, "require" @@ -94,11 +105,13 @@ BuildRequires: phpunit9 # "composer/package-versions-deprecated": "^1.8", # "composer/semver": "^1.0|^2.0|^3.0", # "doctrine/orm": "^2.7", +# "symfony/cache": "^4.4|^5.0", # "symfony/config": "^4.4|^5.0", # "symfony/console": "^4.4|^5.0", # "symfony/dependency-injection": "^4.4|^5.0", # "symfony/event-dispatcher": "^4.4|^5.0", # "symfony/messenger": "^4.4|^5.0", +# "symfony/process": "^4.4|^5.0", # "symfony/requirements-checker": "^2.0", # "symfony/stopwatch": "^4.4|^5.0" Requires: php(language) >= 7.2 @@ -124,6 +137,7 @@ Requires: php-symfony4-console >= 4.4 Requires: php-symfony4-dependency-injection >= 4.4 Requires: php-symfony4-event-dispatcher >= 4.4 Requires: php-symfony4-messenger >= 4.4 +Requires: php-symfony4-process >= 4.4 Requires: php-symfony4-stopwatch >= 4.4 # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -142,6 +156,7 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5 %patch0 -p1 -b .rpm %patch1 -p1 -b .curltls +%patch2 -p1 -b .up : relocate mv config src/config @@ -249,9 +264,6 @@ require_once '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/config/boot \Fedora\Autoloader\Autoload::addPsr4('Bartlett\\CompatInfoDb\\Tests\\', dirname(__DIR__) . '/tests'); EOF -# https://github.com/llaville/php-compatinfo-db/issues/78 -rm -r tests/Reference/Extension/PhpBundle/Zip - ret=0 %{_bindir}/phpunit9 \ --include-path %{buildroot}%{_datadir}/php \ @@ -274,11 +286,15 @@ exit $ret %changelog -* Thu Jun 24 2021 Remi Collet <remi@remirepo.net> - 3.7.0-1 +* Fri Jun 25 2021 Remi Collet <remi@remirepo.net> - 3.7.0-3 +- test build with upstream patches for zip and imagick + +* Thu Jun 24 2021 Remi Collet <remi@remirepo.net> - 3.7.0-2 - update to 3.7.0 - open https://github.com/llaville/php-compatinfo-db/issues/79 imagick - open https://github.com/llaville/php-compatinfo-db/issues/78 zip - add dependency on symfony/cache for doctrine/cache v2 +- add dependency on symfony/process * Fri May 14 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1 - update to 3.6.0 diff --git a/upstream.patch b/upstream.patch new file mode 100644 index 0000000..57ff3e6 --- /dev/null +++ b/upstream.patch @@ -0,0 +1,1274 @@ +From 0d5f8f57faedcef683ab8246fb210cf9edba14ab Mon Sep 17 00:00:00 2001 +From: Laurent Laville <laurent.laville@gmail.com> +Date: Thu, 24 Jun 2021 15:32:07 +0000 +Subject: [PATCH] partial fix for issue #78 about Zip extension + +--- + data/reference/extension/zip/1/const.json | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/data/reference/extension/zip/1/const.json b/data/reference/extension/zip/1/const.json +index 3496bb98..fe786b60 100644 +--- a/data/reference/extension/zip/1/const.json ++++ b/data/reference/extension/zip/1/const.json +@@ -497,6 +497,18 @@ + } + ] + }, ++ { ++ "class_name": "ZipArchive", ++ "name": "CM_ZSTD", ++ "ext_min": "1.19.1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "libzip", ++ "constraint": ">=1.8.0" ++ } ++ ] ++ }, + { + "class_name": "ZipArchive", + "name": "CM_XZ", +From b318ed3da7265ed1ce33119a417268e773bb19cf Mon Sep 17 00:00:00 2001 +From: Laurent Laville <laurent.laville@gmail.com> +Date: Fri, 25 Jun 2021 05:33:23 +0000 +Subject: [PATCH] fixing issue #79 about Imagick extension and support both API + ImageMagick 6 and 7 + +--- + .../extension/imagick/2/methods.json | 2 +- + data/reference/extension/imagick/3/const.json | 496 +++++++++++++++++- + .../extension/imagick/3/methods.json | 220 +++++++- + 3 files changed, 689 insertions(+), 29 deletions(-) + +diff --git a/data/reference/extension/imagick/2/methods.json b/data/reference/extension/imagick/2/methods.json +index aa0f7309..f77dfb57 100644 +--- a/data/reference/extension/imagick/2/methods.json ++++ b/data/reference/extension/imagick/2/methods.json +@@ -910,7 +910,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": "<=7.0.0" ++ "constraint": "<7.0.0" + } + ] + } +diff --git a/data/reference/extension/imagick/3/const.json b/data/reference/extension/imagick/3/const.json +index 0e0cd6f8..22fc9b49 100644 +--- a/data/reference/extension/imagick/3/const.json ++++ b/data/reference/extension/imagick/3/const.json +@@ -4599,12 +4599,504 @@ + "class_name": "Imagick", + "name": "VIRTUALPIXELMETHOD_DITHER", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", + "name": "VIRTUALPIXELMETHOD_RANDOM", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_FREEZE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_INTERPOLATE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_NEGATE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_REFLECT", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_SOFTBURN", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_SOFTDODGE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_STAMP", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPOSITE_RMSE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPRESSION_DWAA", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPRESSION_DWAB", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "EVALUATE_INVERSE_LOG", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COLORSPACE_DISPLAYP3", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COLORSPACE_ADOBE98", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COLORSPACE_PROPHOTO", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COLORSPACE_JZAZBZ", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "DISTORTION_RIGID_AFFINE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "DISTORTION_BARRELINVERSE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "STATISTIC_ROOT_MEAN_SQUARE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "FILTER_HANN", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "FILTER_WELCH", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "FILTER_CUBIC_SPLINE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "IMGTYPE_GRAYSCALEALPHA", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "IMGTYPE_PALETTEALPHA", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "IMGTYPE_TRUECOLORALPHA", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "IMGTYPE_COLORSEPARATIONALPHA", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "IMGTYPE_PALETTEBILEVELALPHA", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPRESSION_ZSTD", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPRESSION_WEBP", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPRESSION_DWAA", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "COMPRESSION_DWAB", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "CHANNEL_READ_MASK", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "CHANNEL_WRITE_MASK", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "CHANNEL_META", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "CHANNEL_COMPOSITE_MASK", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "METRIC_STRUCTURAL_SIMILARITY_ERROR", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "METRIC_STRUCTURAL_DISSIMILARITY_ERROR", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "STATISTIC_CONTRAST", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "PIXELMASK_READ", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "PIXELMASK_WRITE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "PIXELMASK_COMPOSITE", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] + } + ] +diff --git a/data/reference/extension/imagick/3/methods.json b/data/reference/extension/imagick/3/methods.json +index 4cfc760a..0b6e3333 100644 +--- a/data/reference/extension/imagick/3/methods.json ++++ b/data/reference/extension/imagick/3/methods.json +@@ -45,7 +45,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.4" ++ "constraint": ">6.3.4 <7.0.0" + } + ] + }, +@@ -140,6 +140,18 @@ + } + ] + }, ++ { ++ "class_name": "Imagick", ++ "name": "setImageAlpha", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, + { + "class_name": "Imagick", + "name": "setImageAlphaChannel", +@@ -687,7 +699,13 @@ + "class_name": "Imagick", + "name": "roundCorners", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -746,7 +764,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.2.8" ++ "constraint": ">6.2.8 <7.0.0" + } + ] + }, +@@ -796,7 +814,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.0" ++ "constraint": ">6.3.0 <7.0.0" + } + ] + }, +@@ -1908,7 +1926,13 @@ + "class_name": "Imagick", + "name": "getImageSize", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -2049,13 +2073,25 @@ + "class_name": "Imagick", + "name": "setImageIndex", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", + "name": "getImageIndex", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -2488,7 +2524,13 @@ + "class_name": "Imagick", + "name": "setImageAttribute", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -2579,7 +2621,13 @@ + "class_name": "Imagick", + "name": "setImageMatteColor", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -3053,7 +3101,13 @@ + "class_name": "Imagick", + "name": "colorFloodfillImage", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -3446,7 +3500,13 @@ + "class_name": "Imagick", + "name": "getImageChannelExtrema", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -3556,7 +3616,13 @@ + "class_name": "Imagick", + "name": "getImageExtrema", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -3660,13 +3726,25 @@ + "class_name": "Imagick", + "name": "getImageMatteColor", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", + "name": "getImageMatte", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -3957,13 +4035,25 @@ + "class_name": "Imagick", + "name": "mapImage", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", + "name": "matteFloodfillImage", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -3994,13 +4084,25 @@ + "class_name": "Imagick", + "name": "paintOpaqueImage", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", + "name": "paintTransparentImage", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -4135,13 +4237,7 @@ + "name": "setimagebiasquantum", + "ext_min": "3.3.0RC1", + "ext_max": "3.4.4", +- "php_min": "5.1.3", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.1.3" + }, + { + "class_name": "Imagick", +@@ -5151,7 +5247,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.8.0" ++ "constraint": ">6.8.0 <7.0.0" + } + ] + }, +@@ -7603,5 +7699,77 @@ + "constraint": ">6.8.6" + } + ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "houghLineImage", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "setImagePixelColor", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "setImageMask", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "getImageMask", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "identifyImageType", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "alpha", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] + } + ] +From 9e6fb71d99778f4c7f5c45c256f19a2633484301 Mon Sep 17 00:00:00 2001 +From: Laurent Laville <laurent.laville@gmail.com> +Date: Fri, 25 Jun 2021 07:31:43 +0000 +Subject: [PATCH] should fix the latest 3 failures in issue #79 with commit + b318ed3 + +--- + data/reference/extension/imagick/3/const.json | 12 ++++++++++++ + data/reference/extension/imagick/3/methods.json | 6 +++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/data/reference/extension/imagick/3/const.json b/data/reference/extension/imagick/3/const.json +index 22fc9b49..9c42fdf7 100644 +--- a/data/reference/extension/imagick/3/const.json ++++ b/data/reference/extension/imagick/3/const.json +@@ -5098,5 +5098,17 @@ + "constraint": ">=7.0.0" + } + ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "INTERPOLATE_NEAREST_PIXEL", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] + } + ] +diff --git a/data/reference/extension/imagick/3/methods.json b/data/reference/extension/imagick/3/methods.json +index 0b6e3333..8233f3b7 100644 +--- a/data/reference/extension/imagick/3/methods.json ++++ b/data/reference/extension/imagick/3/methods.json +@@ -7447,8 +7447,8 @@ + }, + { + "class_name": "Imagick", +- "name": "setimagechannelmask", +- "ext_min": "3.4.0RC1", ++ "name": "setImageChannelMask", ++ "ext_min": "3.5.0RC1", + "php_min": "5.4.0", + "dependencies": [ + { +@@ -7761,7 +7761,7 @@ + ] + }, + { +- "class_name": "Imagick", ++ "class_name": "ImagickDraw", + "name": "alpha", + "ext_min": "3.5.0RC1", + "php_min": "5.4.0", +From 62643e3e2e8ee50b5e5d5bb551c015a48c7cb4fd Mon Sep 17 00:00:00 2001 +From: Laurent Laville <laurent.laville@gmail.com> +Date: Fri, 25 Jun 2021 15:16:51 +0000 +Subject: [PATCH] still failures about constants on IM7 API in issue #79 + +--- + data/reference/extension/imagick/3/const.json | 128 ++++++++---------- + 1 file changed, 55 insertions(+), 73 deletions(-) + +diff --git a/data/reference/extension/imagick/3/const.json b/data/reference/extension/imagick/3/const.json +index 9c42fdf7..e3ef6ac0 100644 +--- a/data/reference/extension/imagick/3/const.json ++++ b/data/reference/extension/imagick/3/const.json +@@ -225,13 +225,7 @@ + "class_name": "Imagick", + "name": "COMPOSITE_COPYOPACITY", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -1041,13 +1035,7 @@ + "class_name": "Imagick", + "name": "IMGTYPE_GRAYSCALEMATTE", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -1059,13 +1047,7 @@ + "class_name": "Imagick", + "name": "IMGTYPE_PALETTEMATTE", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -1077,13 +1059,7 @@ + "class_name": "Imagick", + "name": "IMGTYPE_TRUECOLORMATTE", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -1095,13 +1071,7 @@ + "class_name": "Imagick", + "name": "IMGTYPE_COLORSEPARATIONMATTE", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -1113,13 +1083,7 @@ + "class_name": "Imagick", + "name": "IMGTYPE_PALETTEBILEVELMATTE", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -1815,13 +1779,7 @@ + "class_name": "Imagick", + "name": "METRIC_MEANERRORPERPIXELMETRIC", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -1839,13 +1797,7 @@ + "class_name": "Imagick", + "name": "METRIC_PEAKSIGNALTONOISERATIO", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -2355,13 +2307,7 @@ + "class_name": "Imagick", + "name": "COLORSPACE_REC601LUMA", + "ext_min": "3.4.0", +- "php_min": "5.4.0", +- "dependencies": [ +- { +- "name": "imagick", +- "constraint": "<7.0.0" +- } +- ] ++ "php_min": "5.4.0" + }, + { + "class_name": "Imagick", +@@ -3667,7 +3613,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.6" ++ "constraint": ">6.3.6 <7.0.0" + } + ] + }, +@@ -3679,7 +3625,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.6" ++ "constraint": ">6.3.6 <7.0.0" + } + ] + }, +@@ -3691,7 +3637,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.3.6" ++ "constraint": ">6.3.6 <7.0.0" + } + ] + }, +@@ -3745,7 +3691,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.4.5" ++ "constraint": ">6.4.5 <7.0.0" + } + ] + }, +@@ -3781,7 +3727,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">6.4.5" ++ "constraint": ">6.4.5 <7.0.0" + } + ] + }, +@@ -3949,7 +3895,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">=6.5.3" ++ "constraint": ">=6.5.3 <7.0.0" + } + ] + }, +@@ -3961,7 +3907,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">=6.5.3" ++ "constraint": ">=6.5.3 <7.0.0" + } + ] + }, +@@ -3973,7 +3919,7 @@ + "dependencies": [ + { + "name": "imagick", +- "constraint": ">=6.5.3" ++ "constraint": ">=6.5.3 <7.0.0" + } + ] + }, +@@ -3993,7 +3939,13 @@ + "class_name": "Imagick", + "name": "ALPHACHANNEL_REMOVE", + "ext_min": "3.2.0b2", +- "php_min": "5.1.3" ++ "php_min": "5.1.3", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -4575,7 +4527,13 @@ + "class_name": "Imagick", + "name": "PIXELSTORAGE_INTEGER", + "ext_min": "3.5.0RC1", +- "php_min": "5.4.0" ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": "<7.0.0" ++ } ++ ] + }, + { + "class_name": "Imagick", +@@ -5110,5 +5068,29 @@ + "constraint": ">=7.0.0" + } + ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "ALPHACHANNEL_ON", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] ++ }, ++ { ++ "class_name": "Imagick", ++ "name": "ALPHACHANNEL_OFF", ++ "ext_min": "3.5.0RC1", ++ "php_min": "5.4.0", ++ "dependencies": [ ++ { ++ "name": "imagick", ++ "constraint": ">=7.0.0" ++ } ++ ] + } + ] |