From 4bb031efe5c12e4dd62ee3e9cc753d2478b639df Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Fri, 7 Apr 2023 05:52:10 +0000
Subject: [PATCH] testing/php7*: remove
these are now EOL, and have no further releases or security fixes.
closes #14409
---
testing/php7-brotli/APKBUILD | 46 --
testing/php7-diseval/APKBUILD | 32 -
testing/php7-gearman/APKBUILD | 38 -
testing/php7-libvirt-php/APKBUILD | 42 -
testing/php7-libvirt-php/musl-fixes.patch | 16 -
testing/php7-libvirt-php/musl-idn.patch | 11 -
testing/php7-libvirt-php/offline-tests.patch | 30 -
testing/php7-pdlib/APKBUILD | 45 --
testing/php7-pecl-amqp/APKBUILD | 38 -
testing/php7-pecl-apcu/APKBUILD | 44 --
testing/php7-pecl-ast/APKBUILD | 39 -
testing/php7-pecl-decimal/APKBUILD | 47 --
testing/php7-pecl-decimal/fix-build.patch | 61 --
testing/php7-pecl-decimal/fix-test.patch | 49 --
testing/php7-pecl-decimal/fix-tests.patch | 138 ----
testing/php7-pecl-event/APKBUILD | 42 -
testing/php7-pecl-gmagick/APKBUILD | 46 --
testing/php7-pecl-grpc/APKBUILD | 35 -
testing/php7-pecl-igbinary/APKBUILD | 49 --
testing/php7-pecl-imagick/APKBUILD | 45 --
testing/php7-pecl-inotify/APKBUILD | 35 -
testing/php7-pecl-jsmin/APKBUILD | 44 --
testing/php7-pecl-jsmin/fix-tests.patch | 39 -
testing/php7-pecl-lzf/APKBUILD | 37 -
testing/php7-pecl-mailparse/APKBUILD | 40 -
testing/php7-pecl-maxminddb/APKBUILD | 39 -
testing/php7-pecl-mcrypt/APKBUILD | 37 -
testing/php7-pecl-memcache/APKBUILD | 34 -
testing/php7-pecl-memcached/APKBUILD | 44 --
testing/php7-pecl-mongodb/APKBUILD | 40 -
testing/php7-pecl-msgpack/APKBUILD | 45 --
testing/php7-pecl-mustache/APKBUILD | 39 -
testing/php7-pecl-oauth/APKBUILD | 44 --
testing/php7-pecl-oauth/pcre.patch | 13 -
testing/php7-pecl-pcov/APKBUILD | 38 -
testing/php7-pecl-protobuf/APKBUILD | 40 -
testing/php7-pecl-psr/APKBUILD | 36 -
testing/php7-pecl-rdkafka/APKBUILD | 38 -
testing/php7-pecl-redis/APKBUILD | 44 --
testing/php7-pecl-rrd/APKBUILD | 37 -
testing/php7-pecl-seaslog/APKBUILD | 39 -
.../php7-pecl-simple-kafka-client/APKBUILD | 37 -
testing/php7-pecl-smbclient/APKBUILD | 37 -
testing/php7-pecl-solr/APKBUILD | 44 --
testing/php7-pecl-solr/fix-tests.patch | 11 -
testing/php7-pecl-ssh2/APKBUILD | 37 -
testing/php7-pecl-stats/APKBUILD | 43 -
testing/php7-pecl-swoole/APKBUILD | 52 --
testing/php7-pecl-timezonedb/APKBUILD | 38 -
testing/php7-pecl-uploadprogress/APKBUILD | 45 --
testing/php7-pecl-uuid/APKBUILD | 35 -
testing/php7-pecl-varnish/APKBUILD | 36 -
testing/php7-pecl-vips/APKBUILD | 35 -
testing/php7-pecl-xdebug/APKBUILD | 49 --
testing/php7-pecl-xhprof/APKBUILD | 56 --
testing/php7-pecl-xlswriter/APKBUILD | 38 -
testing/php7-pecl-yaml/APKBUILD | 39 -
testing/php7-pecl-zmq/APKBUILD | 40 -
.../php7-pecl-zmq/fix-php-7.3-compile.patch | 266 -------
.../php7-pecl-zmq/fix-php-7.4-compile.patch | 261 -------
testing/php7-pecl-zstd/APKBUILD | 41 -
testing/php7-snappy/APKBUILD | 41 -
testing/php7-snuffleupagus/APKBUILD | 45 --
testing/php7-spx/APKBUILD | 35 -
testing/php7-tideways_xhprof/APKBUILD | 34 -
testing/php7/APKBUILD | 737 ------------------
testing/php7/CVE-2023-0567-1.patch | 144 ----
testing/php7/CVE-2023-0567-2.patch | 39 -
testing/php7/CVE-2023-0568.patch | 64 --
testing/php7/CVE-2023-0662-1.patch | 27 -
testing/php7/CVE-2023-0662-2.patch | 413 ----------
testing/php7/atomic-lsapi.patch | 82 --
testing/php7/disabled-tests.list | 243 ------
testing/php7/enchant-2.patch | 76 --
testing/php7/fix-curl-7.83-test.patch | 25 -
testing/php7/fix-fpm-syntax.patch | 33 -
testing/php7/fix-fpm-tests.patch | 58 --
testing/php7/fix-icu72.patch | 735 -----------------
testing/php7/fix-tests-devserver.patch | 23 -
testing/php7/includedir.patch | 41 -
testing/php7/install-pear.patch | 14 -
testing/php7/openssl3.patch | 197 -----
testing/php7/php7-fpm-version-suffix.patch | 79 --
testing/php7/php7-fpm.initd | 93 ---
testing/php7/php7-fpm.logrotate | 13 -
testing/php7/php7-module.conf | 13 -
testing/php7/sharedir.patch | 11 -
testing/php7/xfail-openssl-1.1-test.patch | 13 -
88 files changed, 6263 deletions(-)
delete mode 100644 testing/php7-brotli/APKBUILD
delete mode 100644 testing/php7-diseval/APKBUILD
delete mode 100644 testing/php7-gearman/APKBUILD
delete mode 100644 testing/php7-libvirt-php/APKBUILD
delete mode 100644 testing/php7-libvirt-php/musl-fixes.patch
delete mode 100644 testing/php7-libvirt-php/musl-idn.patch
delete mode 100644 testing/php7-libvirt-php/offline-tests.patch
delete mode 100644 testing/php7-pdlib/APKBUILD
delete mode 100644 testing/php7-pecl-amqp/APKBUILD
delete mode 100644 testing/php7-pecl-apcu/APKBUILD
delete mode 100644 testing/php7-pecl-ast/APKBUILD
delete mode 100644 testing/php7-pecl-decimal/APKBUILD
delete mode 100644 testing/php7-pecl-decimal/fix-build.patch
delete mode 100644 testing/php7-pecl-decimal/fix-test.patch
delete mode 100644 testing/php7-pecl-decimal/fix-tests.patch
delete mode 100644 testing/php7-pecl-event/APKBUILD
delete mode 100644 testing/php7-pecl-gmagick/APKBUILD
delete mode 100644 testing/php7-pecl-grpc/APKBUILD
delete mode 100644 testing/php7-pecl-igbinary/APKBUILD
delete mode 100644 testing/php7-pecl-imagick/APKBUILD
delete mode 100644 testing/php7-pecl-inotify/APKBUILD
delete mode 100644 testing/php7-pecl-jsmin/APKBUILD
delete mode 100644 testing/php7-pecl-jsmin/fix-tests.patch
delete mode 100644 testing/php7-pecl-lzf/APKBUILD
delete mode 100644 testing/php7-pecl-mailparse/APKBUILD
delete mode 100644 testing/php7-pecl-maxminddb/APKBUILD
delete mode 100644 testing/php7-pecl-mcrypt/APKBUILD
delete mode 100644 testing/php7-pecl-memcache/APKBUILD
delete mode 100644 testing/php7-pecl-memcached/APKBUILD
delete mode 100644 testing/php7-pecl-mongodb/APKBUILD
delete mode 100644 testing/php7-pecl-msgpack/APKBUILD
delete mode 100644 testing/php7-pecl-mustache/APKBUILD
delete mode 100644 testing/php7-pecl-oauth/APKBUILD
delete mode 100644 testing/php7-pecl-oauth/pcre.patch
delete mode 100644 testing/php7-pecl-pcov/APKBUILD
delete mode 100644 testing/php7-pecl-protobuf/APKBUILD
delete mode 100644 testing/php7-pecl-psr/APKBUILD
delete mode 100644 testing/php7-pecl-rdkafka/APKBUILD
delete mode 100644 testing/php7-pecl-redis/APKBUILD
delete mode 100644 testing/php7-pecl-rrd/APKBUILD
delete mode 100644 testing/php7-pecl-seaslog/APKBUILD
delete mode 100644 testing/php7-pecl-simple-kafka-client/APKBUILD
delete mode 100644 testing/php7-pecl-smbclient/APKBUILD
delete mode 100644 testing/php7-pecl-solr/APKBUILD
delete mode 100644 testing/php7-pecl-solr/fix-tests.patch
delete mode 100644 testing/php7-pecl-ssh2/APKBUILD
delete mode 100644 testing/php7-pecl-stats/APKBUILD
delete mode 100644 testing/php7-pecl-swoole/APKBUILD
delete mode 100644 testing/php7-pecl-timezonedb/APKBUILD
delete mode 100644 testing/php7-pecl-uploadprogress/APKBUILD
delete mode 100644 testing/php7-pecl-uuid/APKBUILD
delete mode 100644 testing/php7-pecl-varnish/APKBUILD
delete mode 100644 testing/php7-pecl-vips/APKBUILD
delete mode 100644 testing/php7-pecl-xdebug/APKBUILD
delete mode 100644 testing/php7-pecl-xhprof/APKBUILD
delete mode 100644 testing/php7-pecl-xlswriter/APKBUILD
delete mode 100644 testing/php7-pecl-yaml/APKBUILD
delete mode 100644 testing/php7-pecl-zmq/APKBUILD
delete mode 100644 testing/php7-pecl-zmq/fix-php-7.3-compile.patch
delete mode 100644 testing/php7-pecl-zmq/fix-php-7.4-compile.patch
delete mode 100644 testing/php7-pecl-zstd/APKBUILD
delete mode 100644 testing/php7-snappy/APKBUILD
delete mode 100644 testing/php7-snuffleupagus/APKBUILD
delete mode 100644 testing/php7-spx/APKBUILD
delete mode 100644 testing/php7-tideways_xhprof/APKBUILD
delete mode 100644 testing/php7/APKBUILD
delete mode 100644 testing/php7/CVE-2023-0567-1.patch
delete mode 100644 testing/php7/CVE-2023-0567-2.patch
delete mode 100644 testing/php7/CVE-2023-0568.patch
delete mode 100644 testing/php7/CVE-2023-0662-1.patch
delete mode 100644 testing/php7/CVE-2023-0662-2.patch
delete mode 100644 testing/php7/atomic-lsapi.patch
delete mode 100644 testing/php7/disabled-tests.list
delete mode 100644 testing/php7/enchant-2.patch
delete mode 100644 testing/php7/fix-curl-7.83-test.patch
delete mode 100644 testing/php7/fix-fpm-syntax.patch
delete mode 100644 testing/php7/fix-fpm-tests.patch
delete mode 100644 testing/php7/fix-icu72.patch
delete mode 100644 testing/php7/fix-tests-devserver.patch
delete mode 100644 testing/php7/includedir.patch
delete mode 100644 testing/php7/install-pear.patch
delete mode 100644 testing/php7/openssl3.patch
delete mode 100644 testing/php7/php7-fpm-version-suffix.patch
delete mode 100644 testing/php7/php7-fpm.initd
delete mode 100644 testing/php7/php7-fpm.logrotate
delete mode 100644 testing/php7/php7-module.conf
delete mode 100644 testing/php7/sharedir.patch
delete mode 100644 testing/php7/xfail-openssl-1.1-test.patch
diff --git a/testing/php7-brotli/APKBUILD b/testing/php7-brotli/APKBUILD
deleted file mode 100644
index 9afb85f634f5..000000000000
--- a/testing/php7-brotli/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: TBK <alpine@jjtc.eu>
-# Maintainer: TBK <alpine@jjtc.eu>
-pkgname=php7-brotli
-_extname=brotli
-pkgver=0.13.1
-pkgrel=0
-pkgdesc="Brotli Extension for PHP 7.4"
-url="https://github.com/kjdev/php-ext-brotli"
-arch="all"
-license="MIT"
-_phpv=7
-_php=php$_phpv
-depends="$_php-common"
-makedepends="$_php-dev $_php-pecl-apcu brotli-dev"
-checkdepends="$_php-cgi"
-source="php-$_extname-$pkgver.tar.gz::https://github.com/kjdev/php-ext-brotli/archive/$pkgver.tar.gz"
-builddir="$srcdir/php-ext-brotli-$pkgver"
-
-build() {
- phpize$_phpv
- ./configure \
- --prefix=/usr \
- --with-php-config=php-config$_phpv \
- --with-libbrotli # Use system lib
- make
-}
-
-check() {
- local _modules=/usr/lib/$_php/modules
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 test \
- TEST_PHP_CGI_EXECUTABLE=/usr/bin/php-cgi$_phpv \
- PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=$_modules/apcu.so \
- -d extension=modules/$_extname.so" TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/$_php/conf.d
- install -d $_confdir
- echo "extension=$_extname.so" > $_confdir/50_$_extname.ini
-}
-
-sha512sums="
-453136dd7eb5e2e1b92026276f73f3c98c3f230f99d1ca747e1dc7266c0b04a4dce210a91bc4cb29ab22e7c8a0754e93a69b0c8d37b1f58ef2277ce56fd0a172 php-brotli-0.13.1.tar.gz
-"
diff --git a/testing/php7-diseval/APKBUILD b/testing/php7-diseval/APKBUILD
deleted file mode 100644
index fc022bf3102f..000000000000
--- a/testing/php7-diseval/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
-# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
-pkgname=php7-diseval
-_pkgreal=diseval
-pkgver=0.1
-pkgrel=3
-pkgdesc="Disable eval in php7 (suhosin is not stable yet for php7)"
-url="https://github.com/mk-j/PHP_diseval_extension"
-arch="all"
-license="MIT"
-depends="php7-common"
-makedepends="php7-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/mk-j/PHP_diseval_extension/archive/$pkgver.tar.gz"
-builddir="$srcdir/PHP_diseval_extension-$pkgver/source"
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- install -d "$pkgdir"/etc/php7/conf.d
- echo "extension=$_pkgreal.so" > "$pkgdir"/etc/php7/conf.d/$_pkgreal.ini
-}
-
-sha512sums="14cddbebe1cb1bd114dd6f1ea122b262340ed5894178d7332f4168753c07670925fbbf9bae444a726b8d1e1cf28fc8f2e45d511e0523ac30ab37a1fb9f758c8e php7-diseval-0.1.tar.gz"
diff --git a/testing/php7-gearman/APKBUILD b/testing/php7-gearman/APKBUILD
deleted file mode 100644
index cb4996ab6848..000000000000
--- a/testing/php7-gearman/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer: Valery Kartel <valery.kartel@gmail.com>
-pkgname=php7-gearman
-_extname=gearman
-pkgver=2.1.0
-pkgrel=0
-pkgdesc="PHP 7 wrapper to libgearman - PECL"
-url="https://pecl.php.net/package/gearman/"
-arch="all"
-license="PHP-3.01"
-depends="php7-pcntl"
-makedepends="gearman-dev php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-pecl-gearman=$pkgver-r$pkgrel" # for forward compatibility
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- php7 -dextension=modules/$_extname.so --ri $_extname
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
- TESTS=--show-diff SKIP_ONLINE_TESTS=1
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="78a3877ba2212777a1c8387ce14c0e2210f3141b9a6bb87507547f6e3f02dfc03387111e6ac84729dba8b1b9c0483ef1ba3c458480bc0f2e9d68dd49bd073ba6 php-pecl-gearman-2.1.0.tgz"
diff --git a/testing/php7-libvirt-php/APKBUILD b/testing/php7-libvirt-php/APKBUILD
deleted file mode 100644
index 6bfb7c00644f..000000000000
--- a/testing/php7-libvirt-php/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Fernando Casas Schossow <casasfernando@outlook.com>
-# Maintainer: Fernando Casas Schossow <casasfernando@outlook.com>
-pkgname=php7-libvirt-php
-pkgver=0.5.5
-pkgrel=1
-pkgdesc="PHP language bindings for Libvirt API. For more details see: http://www.libvirt.org/php/"
-url="https://libvirt.org/php/"
-arch="all !x86 !armhf !armv7 !s390x !riscv64" # segfault on x86, armhf and armv7
-license="LGPL-2.1-only"
-makedepends="autoconf libvirt-dev libxml2-dev libxml2-utils libxslt php7-dev php7-pecl-imagick libtool linux-headers"
-subpackages="$pkgname-doc"
-source="https://libvirt.org/sources/php/libvirt-php-$pkgver.tar.gz
- offline-tests.patch
- musl-idn.patch
- musl-fixes.patch"
-builddir="$srcdir/libvirt-php-$pkgver"
-
-prepare() {
- default_prepare
- autoconf
-}
-
-build() {
- ./configure --prefix=/usr
- make
-}
-
-check() {
- make check
- php7 --define extension=src/.libs/libvirt-php.so --ri libvirt
-}
-
-package() {
- make DESTDIR="$pkgdir" install
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- rm "$pkgdir/usr/lib/php7/modules/libvirt-php.la"
-}
-
-sha512sums="2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684 libvirt-php-0.5.5.tar.gz
-a212746438428537422716f5883f6941704137cd2cdceafb965fec8306c81c3bc4a4ce1caf65efc2a033823e8eb6f5afa1b452f9a191c50cd07d4c979e10d5fd offline-tests.patch
-cae4423b361c7735052ae1c1ec4e24090486020d4f3aaf87c16991b9fb90960d90cd8bc392bb017449525fc4567de1080e3d29337b2d756f46edac672b2bd81b musl-idn.patch
-732f22ca206187b7a0ea41fe2d63808c8afc0994f941fbbb933dbde219f597d108aa3ed10b67e074fe90ac6ab571ee0dc70ef725ce8ed746d8f6e4689e972291 musl-fixes.patch"
diff --git a/testing/php7-libvirt-php/musl-fixes.patch b/testing/php7-libvirt-php/musl-fixes.patch
deleted file mode 100644
index 92388095b401..000000000000
--- a/testing/php7-libvirt-php/musl-fixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tools/generate-api-docs.c b/tools/generate-api-docs.c
-index 3b88f16..12c0283 100644
---- a/tools/generate-api-docs.c
-+++ b/tools/generate-api-docs.c
-@@ -129,7 +129,9 @@ void free_functions(int function_number)
- free(functions[i].args[j]);
- free(functions[i].name);
- free(functions[i].desc);
-- free(functions[i].returns);
-+ //Commenting the line below as when compiled with musl libc it is creating a SIGSEGV
-+ //Moreover this program is only used to create libvirt-php html documentation at compile time
-+ //free(functions[i].returns);
- }
- free(functions);
- }
-
diff --git a/testing/php7-libvirt-php/musl-idn.patch b/testing/php7-libvirt-php/musl-idn.patch
deleted file mode 100644
index 323a5f56f1c1..000000000000
--- a/testing/php7-libvirt-php/musl-idn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/libvirt-php.c
-+++ b/src/libvirt-php.c
-@@ -1168,7 +1168,7 @@
-
- /* need to get FQDN of the local name */
- memset(&hints, 0, sizeof(hints));
-- hints.ai_flags = AI_CANONNAME|AI_CANONIDN;
-+ hints.ai_flags = AI_CANONNAME;
- hints.ai_family = AF_UNSPEC;
-
- /* could not get FQDN or got localhost, use whatever gethostname gave us */
diff --git a/testing/php7-libvirt-php/offline-tests.patch b/testing/php7-libvirt-php/offline-tests.patch
deleted file mode 100644
index 90826023f00b..000000000000
--- a/testing/php7-libvirt-php/offline-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/tests/runtests.sh
-+++ b/tests/runtests.sh
-@@ -8,7 +8,7 @@
- "test-domain-define-undefine"
- "test-domain-define-create-destroy"
- "test-domain-create" "test-domain-create-and-get-xpath" "test-domain-create-and-coredump"
-- "test-install" "test-get-models" "test-get-models-unsupported-hw" "test-domain-create-get-metadata"
-+ "test-install" "test-get-models-unsupported-hw" "test-domain-create-get-metadata"
- )
-
- run_test()
-@@ -41,12 +41,12 @@
- fi
- done
-
--qemu-img create -f qcow2 /tmp/example-test.qcow2 1M > /dev/null
--run_test "test-domain-snapshot" $nf; ret="$?"
--if [ "x$ret" == "x1" ]; then
-- error=1
--fi
--rm -f /tmp/example-test.qcow2
-+#qemu-img create -f qcow2 /tmp/example-test.qcow2 1M > /dev/null
-+#run_test "test-domain-snapshot" $nf; ret="$?"
-+#if [ "x$ret" == "x1" ]; then
-+# error=1
-+#fi
-+#rm -f /tmp/example-test.qcow2
-
- if [ "x$error" == "x0" ]; then
- echo "All tests passed successfully"
diff --git a/testing/php7-pdlib/APKBUILD b/testing/php7-pdlib/APKBUILD
deleted file mode 100644
index 0fcdce74ee26..000000000000
--- a/testing/php7-pdlib/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: goodspb <goodspb.luo@gmail.com>
-# Maintainer: Adriaan Groenenboom <agboom@pm.me>
-pkgname=php7-pdlib
-_extname=pdlib
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="PHP 7 extension for Dlib"
-url="https://github.com/goodspb/pdlib"
-arch="all !ppc64le" # build fails https://github.com/goodspb/pdlib/issues/19
-license="MIT"
-depends="php7-common dlib"
-makedepends="dlib-dev php7-dev pkgconf php7-bz2"
-source="php-$_extname-$pkgver.tar.gz::https://github.com/goodspb/$_extname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$_extname-$pkgver"
-
-#disable check on s390x as Frontal face detection failling
-[ "$CARCH" = "s390x" ] && options="!check"
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Tests require bz2 extension which is not bundled
- local _modules=/usr/lib/php7/modules
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
- TESTS=--show-diff SKIP_ONLINE_TESTS=1 \
- PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=$_modules/bz2.so \
- -d extension=modules/$_extname.so"
- php7 -dextension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-a87316495c04e5ca9b8b6980f859b1e9b4cfccc9b9ad0ab5f83320f2e9bc2f92a006fe0fe9621b21a9755efdf719e533519dfc2319d437a5475e067d5e633661 php-pdlib-1.1.0.tar.gz
-"
diff --git a/testing/php7-pecl-amqp/APKBUILD b/testing/php7-pecl-amqp/APKBUILD
deleted file mode 100644
index c9d8b5919a37..000000000000
--- a/testing/php7-pecl-amqp/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-amqp
-_extname=amqp
-pkgver=1.11.0
-pkgrel=0
-pkgdesc="PHP 7 extension to communicate with any AMQP spec 0-9-1 compatible server - PECL"
-url="https://pecl.php.net/package/amqp"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev rabbitmq-c-dev"
-source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-amqp=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-amqp" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Tests require running AMQP server, so basic check
- php7 -d extension="$builddir"/modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- mkdir -p $_confdir
- echo "extension=$_extname" > $_confdir/40_$_extname.ini
-}
-
-sha512sums="
-0f0220fc2f1f9109640e096ab38a4bb06b2569a336b83f527d18dae2b8c21efaf383dade807ee5bb3dbf4447bc3548c15f38ac18155762fe7920ef8939bc0321 php7-pecl-amqp-1.11.0.tgz
-"
diff --git a/testing/php7-pecl-apcu/APKBUILD b/testing/php7-pecl-apcu/APKBUILD
deleted file mode 100644
index d347abce8ac0..000000000000
--- a/testing/php7-pecl-apcu/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
-# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
-pkgname=php7-pecl-apcu
-_extname=apcu
-pkgver=5.1.22
-pkgrel=0
-pkgdesc="PHP 7 extension APC User Cache - PECL"
-url="https://pecl.php.net/package/apcu"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev"
-checkdepends="php7-pcntl php7-session"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-apcu=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-apcu" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- local _modules="/usr/lib/php7/modules"
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
- PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=$_modules/pcntl.so \
- -d extension=modules/$_extname.so" TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir"/ install
- install -D -m644 apc.php "$pkgdir"/usr/share/php7/apcu/apc.php
-
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-8f2f4292679bc359ea680ecaf397d69de32bf67d57d719a4839a026ab1b96d5ec4725e92c5c0d1972a117a7cd3d3c456a1f4ec03192fda4657e685de60b9e93e php-pecl-apcu-5.1.22.tgz
-"
diff --git a/testing/php7-pecl-ast/APKBUILD b/testing/php7-pecl-ast/APKBUILD
deleted file mode 100644
index c23dae7c1bbc..000000000000
--- a/testing/php7-pecl-ast/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Andy Blyler <andy@blyler.cc>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-ast
-_extname=ast
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="PHP extension exposing PHP 7.4 abstract syntax tree - PECL"
-url="https://pecl.php.net/package/ast"
-arch="all"
-license="BSD-3-Clause"
-_phpv=7
-_php=php$_phpv
-depends="$_php-common"
-makedepends="$_php-dev"
-source="php-pecl-$_extname-$pkgver.tar.gz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-provides="php7-ast=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-ast" # for backward compatibility
-
-build() {
- phpize$_phpv
- ./configure --prefix=/usr --with-php-config=/usr/bin/php-config$_phpv
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/$_php/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-9049a6f1f3312c9efc68dd4f4e324bd9c2fbc2c97d1e9aecf1f808f91002bf5cfc20247560b288cc6581f2651d9419470e349713680da64d26a8eba77c8eac64 php-pecl-ast-1.1.0.tar.gz
-"
diff --git a/testing/php7-pecl-decimal/APKBUILD b/testing/php7-pecl-decimal/APKBUILD
deleted file mode 100644
index 25daefe27e92..000000000000
--- a/testing/php7-pecl-decimal/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-decimal
-_pkgreal=decimal
-pkgver=2.0.0
-pkgrel=2
-pkgdesc="Correctly-rounded arbitrary precision decimal floating-point arithmetic in PHP."
-# Some tests fail until 2.0.0 is released
-# https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/17821#note_140064
-options="!check"
-url="https://pecl.php.net/package/decimal"
-arch="all"
-license="MIT"
-depends="php7-json"
-makedepends="php7-dev mpdecimal-dev"
-source="https://pecl.php.net/get/$_pkgreal-$pkgver.tgz
- fix-build.patch
- fix-test.patch
- fix-tests.patch"
-builddir="$srcdir/$_pkgreal-$pkgver"
-provides="php7-decimal=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-decimal" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # waiting upstream release
- rm -f tests/Decimal/operators.phpt tests/Number/operators.phpt tests/Rational/operators.phpt
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 TESTS="--show-diff" \
- test PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=/usr/lib/php7/modules/json.so \
- -d extension=modules/$_pkgreal.so"
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir"/ install
- install -d "$pkgdir"/etc/php7/conf.d
- echo "extension=$_pkgreal.so" > "$pkgdir"/etc/php7/conf.d/$_pkgreal.ini
-}
-
-sha512sums="765a2871af38338d1020730936d70c7d493e07c4d0fe6da5b07bf1b5f6bd7ae45239351f9202ced8f579ad1e1c909fbfede1350cc1ec85e0f4cb5f1ef8617cfe decimal-2.0.0.tgz
-8db95e40c19806d2fbb88e8132a3f679f5856ce73548d0b72bb1c806fdb59bfadad0260dd89962f4ac4c41b388d98e8ec988b5bd989e582c9cffc521e832b6d7 fix-build.patch
-36d24c2c2fd310d64f6c326ac5241c4732d323608d6dfc7e76d906cd30282e94bdbc5851f1de3e4e2056f005761af52c22afc7a7b672dc4a718f46a74bb75714 fix-test.patch
-f972d727fba7bbdf827c2b5ba0cf7588b7e9234f3e5989f06dc92c1a8c34516fdca3e1089e98e3a8c092328a04f524d7d6a0a017869188e219f4bcc1e869a261 fix-tests.patch"
diff --git a/testing/php7-pecl-decimal/fix-build.patch b/testing/php7-pecl-decimal/fix-build.patch
deleted file mode 100644
index dc6b75ec02bc..000000000000
--- a/testing/php7-pecl-decimal/fix-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d983b8f76f59996339a434c40d1f57703fadbd42 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 4 Feb 2020 08:25:35 +0100
-Subject: [PATCH] fix #33 remomve unused function
-
----
- src/convert.c | 15 +--------------
- src/convert.h | 2 --
- 2 files changed, 1 insertion(+), 16 deletions(-)
-
-diff --git a/src/convert.c b/src/convert.c
-index 4136a35..77581e3 100644
---- a/src/convert.c
-+++ b/src/convert.c
-@@ -444,19 +444,6 @@ zend_string *php_decimal_rational_to_sci(const php_rational_t *obj, zend_long pr
- return str;
- }
-
--zend_string *php_decimal_rational_to_eng(const php_rational_t *obj, zend_long prec)
--{
-- zend_string *str;
--
-- PHP_DECIMAL_TEMP_MPD(tmp);
-- php_decimal_rational_evaluate(&tmp, obj, prec);
--
-- str = php_decimal_mpd_to_eng(&tmp);
-- mpd_del(&tmp);
--
-- return str;
--}
--
- zend_string *php_decimal_rational_to_fixed(const php_rational_t *obj, zend_long places, zend_bool commas, php_decimal_rounding_t mode)
- {
- PHP_DECIMAL_TEMP_MPD(tmp);
-@@ -597,4 +584,4 @@ void php_decimal_number_to_num_den(mpd_t *num, mpd_t *den, const zval *obj)
-
- assert(status == 0);
- zval_ptr_dtor(&result);
--}
-\ No newline at end of file
-+}
-diff --git a/src/convert.h b/src/convert.h
-index cb5e031..a3924e3 100644
---- a/src/convert.h
-+++ b/src/convert.h
-@@ -56,7 +56,6 @@ php_decimal_success_t php_decimal_mpd_set_string(mpd_t *mpd, const zend_string *
- php_decimal_success_t php_decimal_mpd_set_charptr(mpd_t *mpd, const char *str);
-
- zend_string *php_decimal_mpd_to_serialized(const mpd_t *mpd);
--zend_string *php_decimal_mpd_to_eng(const mpd_t *mpd);
- zend_string *php_decimal_mpd_to_sci(const mpd_t *mpd);
- zend_string *php_decimal_mpd_to_string(const mpd_t *mpd);
- zend_string *php_decimal_mpd_to_fixed(const mpd_t *mpd, zend_long places, zend_bool commas, php_decimal_rounding_t mode);
-@@ -69,7 +68,6 @@ void php_decimal_rational_set_nan(php_rational_t *obj);
- void php_decimal_rational_set_zero(php_rational_t *obj);
-
- zend_string *php_decimal_rational_to_sci(const php_rational_t *obj, zend_long prec);
--zend_string *php_decimal_rational_to_eng(const php_rational_t *obj, zend_long prec);
- zend_string *php_decimal_rational_to_string(const php_rational_t *obj);
- zend_string *php_decimal_rational_to_fixed(const php_rational_t *obj, zend_long places, zend_bool commas, php_decimal_rounding_t mode);
- zend_long php_decimal_rational_to_long(const php_rational_t *obj);
diff --git a/testing/php7-pecl-decimal/fix-test.patch b/testing/php7-pecl-decimal/fix-test.patch
deleted file mode 100644
index 8ed7831e51f2..000000000000
--- a/testing/php7-pecl-decimal/fix-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e71f1488b666e30e4f0121a10fee3eeab22bd327 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 4 Feb 2020 08:23:05 +0100
-Subject: [PATCH] fix harcoded path in test
-
----
- tests/Number/methods/pow.phpt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/Number/methods/pow.phpt b/tests/Number/methods/pow.phpt
-index 5ce6582..2c78f16 100644
---- a/tests/Number/methods/pow.phpt
-+++ b/tests/Number/methods/pow.phpt
-@@ -87,7 +87,7 @@ Number Object
- )
- Number::pow
-
--Warning: Decimal arithmetic operand truncated to integer in /Users/rtheunissen/dev/decimal/ext-decimal/tests/Number/helpers/Number.php on line 63
-+Warning: Decimal arithmetic operand truncated to integer in %sNumber.php on line 63
- Number Object
- (
- [value:protected] => Decimal\Rational Object
-@@ -99,7 +99,7 @@ Number Object
- )
- Number::pow
-
--Warning: Decimal arithmetic operand truncated to integer in /Users/rtheunissen/dev/decimal/ext-decimal/tests/Number/helpers/Number.php on line 63
-+Warning: Decimal arithmetic operand truncated to integer in %sNumber.php on line 63
- Number Object
- (
- [value:protected] => Decimal\Rational Object
-@@ -123,7 +123,7 @@ Decimal\Decimal Object
- )
- Number::toRational
-
--Warning: Decimal arithmetic operand truncated to integer in /Users/rtheunissen/dev/decimal/ext-decimal/tests/Number/methods/pow.php on line 38
-+Warning: Decimal arithmetic operand truncated to integer in %spow.php on line 38
- Decimal\Rational Object
- (
- [num] => 16
-@@ -131,7 +131,7 @@ Decimal\Rational Object
- )
- Number::toRational
-
--Warning: Decimal arithmetic operand truncated to integer in /Users/rtheunissen/dev/decimal/ext-decimal/tests/Number/methods/pow.php on line 41
-+Warning: Decimal arithmetic operand truncated to integer in %spow.php on line 41
- Decimal\Rational Object
- (
- [num] => 16
diff --git a/testing/php7-pecl-decimal/fix-tests.patch b/testing/php7-pecl-decimal/fix-tests.patch
deleted file mode 100644
index efbf27bba7bc..000000000000
--- a/testing/php7-pecl-decimal/fix-tests.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/tests/Number/helpers/Number.php b/tests/Number/helpers/Number.php
-new file mode 100644
-index 0000000..07ca222
---- /dev/null
-+++ b/tests/Number/helpers/Number.php
-@@ -0,0 +1,132 @@
-+<?php
-+
-+/**
-+ *
-+ */
-+class Number extends \Decimal\Number
-+{
-+ protected $value;
-+
-+ private static function parse($number)
-+ {
-+ $value = $number instanceof self ? $number->value : $number;
-+
-+ if ($value === "INF") $value = INF;
-+ else if ($value === "-INF") $value = -INF;
-+ else if ($value === "NAN") $value = NAN;
-+
-+ return $value;
-+ }
-+
-+ protected function __construct($value)
-+ {
-+ $this->value = self::parse($value);
-+ }
-+
-+ public static function valueOf($value): \Decimal\Number
-+ {
-+ return new static($value);
-+ }
-+
-+ public function add($other): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value + $this->parse($other));
-+ }
-+
-+ public function sub($other): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value - $this->parse($other));
-+ }
-+
-+ public function mul($other): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value * $this->parse($other));
-+ }
-+
-+ public function div($other): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value / $this->parse($other));
-+ }
-+
-+ public function pow($other): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value ** $this->parse($other));
-+ }
-+
-+ public function mod($other): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value % $this->parse($other));
-+ }
-+
-+ public function shiftl($places): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value * (10 ** $places));
-+ }
-+
-+ public function shiftr($places): \Decimal\Number
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return new static($this->value / (10 ** $places));
-+ }
-+
-+ public function round(int $places = NULL, int $mode = NULL): \Decimal\Number
-+ {
-+ return new static($this->toDecimal(\Decimal\Decimal::MAX_PRECISION)->round($places, $mode)->toString());
-+ }
-+
-+ public function toFixed(int $places = NULL, bool $commas = NULL, int $mode = NULL): string
-+ {
-+ return new static($this->toDecimal(\Decimal\Decimal::MAX_PRECISION)->toFixed($places, $commas, $mode));
-+ }
-+
-+ public function toDecimal(int $precision): \Decimal\Decimal
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return parent::toDecimal($precision);
-+ }
-+
-+ public function toRational(): \Decimal\Rational
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return parent::toRational();
-+ }
-+
-+ public function toString(): string
-+ {
-+ return (string) $this->value;
-+ }
-+
-+ public function toInt(): int
-+ {
-+ return (int) $this->value;
-+ }
-+
-+ public function toFloat(): float
-+ {
-+ return (float) $this->value;
-+ }
-+
-+ public function compareTo($other): int
-+ {
-+ printf("%s\n", __METHOD__);
-+
-+ return $this->value <=> self::parse($other);
-+ }
-+}
diff --git a/testing/php7-pecl-event/APKBUILD b/testing/php7-pecl-event/APKBUILD
deleted file mode 100644
index c7dcf1ac5a51..000000000000
--- a/testing/php7-pecl-event/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-event
-_extname=event
-pkgver=3.0.8
-pkgrel=0
-pkgdesc="PHP 7 extension that provides interface to libevent library - PECL"
-url="https://pecl.php.net/package/event"
-arch="all"
-license="PHP-3.01"
-depends="php7-sockets"
-makedepends="php7-dev libevent-dev openssl1.1-compat-dev pkgconf"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-event=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-event" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Tests require sockets extension which is not bundled
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 test \
- TESTS=--show-diff \
- PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=/usr/lib/php7/modules/sockets.so \
- -d extension=modules/$_extname.so"
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-45b4c07cac6dfca386cf9e6c792abc72c6f68d1443a1c67fd645f5e6f05ae9d45fb346b50b35cc6818ca70ebbff93c42afd801e70e9ebc63f997366996193593 php-pecl-event-3.0.8.tgz
-"
diff --git a/testing/php7-pecl-gmagick/APKBUILD b/testing/php7-pecl-gmagick/APKBUILD
deleted file mode 100644
index 913a43dfbe09..000000000000
--- a/testing/php7-pecl-gmagick/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer: Valery Kartel <valery.kartel@gmail.com>
-pkgname=php7-pecl-gmagick
-_pkgreal=gmagick
-pkgver=2.0.6_rc1
-_pkgver=${pkgver/_rc/RC}
-pkgrel=1
-pkgdesc="PHP 7 bindings to the GraphicsMagick library - PECL"
-url="https://pecl.php.net/package/gmagick"
-arch="all"
-license="PHP-3.01"
-depends="php7-common ghostscript-fonts"
-makedepends="graphicsmagick-dev libtool php7-dev"
-source="php-pecl-$_pkgreal-$_pkgver.tgz::https://pecl.php.net/get/$_pkgreal-$_pkgver.tgz"
-builddir="$srcdir/$_pkgreal-$_pkgver"
-provides="php7-gmagick=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-gmagick" # for backward compatibility
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- if [ "$CARCH" = "x86" ]; then
- # https://gitlab.alpinelinux.org/alpine/aports/issues/11011
- rm -f \
- tests/gmagick-107_setimagevirtualpixelmethod.phpt \
- tests/gmagick-116_waveImage_basic.phpt
- fi
- # https://github.com/vitoc/gmagick/issues/53
- rm -f tests/gmagick-056-set_getsamplingfactors.phpt
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_pkgreal" > $_confdir/$_pkgreal.ini
-}
-
-sha512sums="c09ad751815d06964f16ab95025badc0711ceaaac0cf79035307aa75f2730b021b070d0e45e549ddd5447de68581ec666a817ec5c05a2a4557d4c1548216714f php-pecl-gmagick-2.0.6RC1.tgz"
diff --git a/testing/php7-pecl-grpc/APKBUILD b/testing/php7-pecl-grpc/APKBUILD
deleted file mode 100644
index fefe750084f6..000000000000
--- a/testing/php7-pecl-grpc/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-grpc
-_extname=grpc
-pkgver=1.51.1
-pkgrel=0
-pkgdesc="PHP 7 extension provide a concrete implementation of the gRPC protocol, layered over HTTP/2."
-url="https://pecl.php.net/package/grpc"
-arch="all !s390x !ppc64le !riscv64" # build failures
-license="Apache-2.0"
-depends="php7-common"
-makedepends="php7-dev openssl-dev linux-headers"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Test suite is not a part of pecl release.
- php7 -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/50_$_extname.ini
-}
-
-sha512sums="
-9531d31d771727a6d994fb304467d908329f8ec85f6e484effd7bc75bc6ccb005dd623b730e6664837571abefbba1493633c10c171202429f447496fe491fc16 php-pecl-grpc-1.51.1.tgz
-"
diff --git a/testing/php7-pecl-igbinary/APKBUILD b/testing/php7-pecl-igbinary/APKBUILD
deleted file mode 100644
index ec53f3dec74b..000000000000
--- a/testing/php7-pecl-igbinary/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-
-pkgname=php7-pecl-igbinary
-_extname=igbinary
-pkgver=3.2.14
-pkgrel=0
-pkgdesc="Igbinary is a drop in replacement for the standard PHP 7 serializer - PECL"
-url="https://pecl.php.net/package/igbinary"
-arch="all"
-license="BSD-3-Clause"
-provides="php7-igbinary=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-igbinary" # for backward compatibility
-depends="php7-common"
-makedepends="php7-dev php7-pecl-apcu"
-checkdepends="php7-json php7-session" # sessions needs work https://github.com/igbinary/igbinary/issues/116
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- local modules="/usr/lib/php7/modules"
- # Tests require extra extensions which are not bundled
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
- TESTS=--show-diff \
- PHP_TEST_SHARED_EXTENSIONS="
- -d extension=$modules/apcu.so \
- -d extension=$modules/json.so \
- -d extension=$modules/session.so \
- -d extension=modules/$_extname.so"
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/10_$_extname.ini
-}
-
-sha512sums="
-2d9d7b36ab9ecd4f19b0e1b4dc958ce8b4e25a8930468e9308d70284b85f92a8f3b4ac241e35110287ba3a0e0f17d21cc6e6b4fbfdea2b2ea27d6a47eaccbdaf php-pecl-igbinary-3.2.14.tgz
-"
diff --git a/testing/php7-pecl-imagick/APKBUILD b/testing/php7-pecl-imagick/APKBUILD
deleted file mode 100644
index a3228fa011c5..000000000000
--- a/testing/php7-pecl-imagick/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer: Valery Kartel <valery.kartel@gmail.com>
-pkgname=php7-pecl-imagick
-_extname=imagick
-pkgver=3.7.0
-pkgrel=0
-pkgdesc="PHP 7 extension provides a wrapper to the ImageMagick library - PECL"
-url="https://pecl.php.net/package/imagick"
-arch="all !x86" # https://gitlab.alpinelinux.org/alpine/aports/-/issues/12537
-license="PHP-3.01"
-depends="php7-common imagemagick"
-checkdepends="ghostscript-fonts"
-makedepends="php7-dev imagemagick-dev"
-subpackages="$pkgname-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-imagick=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-imagick" # for backward compatibility
-
-# secfixes:
-# 3.4.4-r0:
-# - CVE-2019-11037
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- rm tests/009_properties.phpt # fails on s390x
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local _confdir="$pkgdir"/etc/php7/conf.d
- mkdir -p $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe php-pecl-imagick-3.7.0.tgz
-"
diff --git a/testing/php7-pecl-inotify/APKBUILD b/testing/php7-pecl-inotify/APKBUILD
deleted file mode 100644
index 545812f7ecee..000000000000
--- a/testing/php7-pecl-inotify/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-inotify
-_extname=inotify
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Inotify bindings for PHP"
-url="https://pecl.php.net/package/inotify"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-provides="php7-inotify=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-inotify" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/70_$_extname.ini
-}
-
-sha512sums="f8b29f8611f16b92136ab8de89181c254bba1abee1e61cac2344440567a3155aae4b9b54b10fdb1b0254fd7a96da8c14b7dc5c9f7f08a03db30ab1645aca1eee php-pecl-inotify-3.0.0.tgz"
diff --git a/testing/php7-pecl-jsmin/APKBUILD b/testing/php7-pecl-jsmin/APKBUILD
deleted file mode 100644
index af10fed3dcca..000000000000
--- a/testing/php7-pecl-jsmin/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-jsmin
-_extname=jsmin
-pkgver=3.0.0
-pkgrel=0
-_jqver=2.1.3
-pkgdesc="PHP 8 extension for minifying JavaScript - PECL"
-url="https://pecl.php.net/package/jsmin"
-arch="all !ppc64le" # test fails on builder
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
- jquery-$_jqver.js::https://github.com/sqmk/pecl-jsmin/raw/v$pkgver/tests/data/jquery-$_jqver.js
- fix-tests.patch
- "
-builddir="$srcdir/$_extname-$pkgver"
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- mkdir -p tests/data
- cp "$srcdir"/jquery-$_jqver.js tests/data/
-
- php7 -dextension=modules/$_extname.so --ri $_extname
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS='--show-diff '
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-a465ae024a49bb8ac20463efc6b2546021806c2c43053f42c7ebfea4924b9b647b6e7c0c673102e12ecd8b693666441dc07203edef216eee958fa62f73056ea6 php-pecl-jsmin-3.0.0.tgz
-b8eb1a740c63feaab8ac24d87f39f4cfe263694c972f4978b9f0e3092f912a722596fd094dd637d22f03816617e13210bf11fad9a545dbb0423dc821c827081e jquery-2.1.3.js
-e44a2615d98d786e0188d3880b41f267dab2fa215fb17cd37b17f8cc499bee7dd9e4fe1def4707dbd6769fa40ba2dbf7895ba3544db427a7d851f69a515fa83c fix-tests.patch
-"
diff --git a/testing/php7-pecl-jsmin/fix-tests.patch b/testing/php7-pecl-jsmin/fix-tests.patch
deleted file mode 100644
index d7b9c636af6b..000000000000
--- a/testing/php7-pecl-jsmin/fix-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch-Source: https://github.com/sqmk/pecl-jsmin/pull/60
-
-diff --git a/tests/missing-argument.phpt b/tests/missing-argument.phpt
-index 57d0925..826038b 100644
---- a/tests/missing-argument.phpt
-+++ b/tests/missing-argument.phpt
-@@ -1,5 +1,9 @@
- --TEST--
- Missing argument throws warning
-+--SKIPIF--
-+<?php
-+if (PHP_VERSION_ID >= 80000) die('skip Only for PHP < 8.0');
-+?>
- --FILE--
- <?php
-
-diff --git a/tests/missing-argument8.phpt b/tests/missing-argument8.phpt
-new file mode 100644
-index 0000000..4638dc2
---- /dev/null
-+++ b/tests/missing-argument8.phpt
-@@ -0,0 +1,17 @@
-+--TEST--
-+Missing argument throws fatal error
-+--SKIPIF--
-+<?php
-+if (PHP_VERSION_ID < 80000) die('skip Only for PHP >= 8.0');
-+?>
-+--FILE--
-+<?php
-+
-+echo jsmin();
-+
-+--EXPECTF--
-+Fatal error: Uncaught ArgumentCountError: jsmin() expects at least 1 argument, 0 given in %s
-+Stack trace:
-+#0 %s(3): jsmin()
-+#1 {main}
-+ thrown in %s on line 3
diff --git a/testing/php7-pecl-lzf/APKBUILD b/testing/php7-pecl-lzf/APKBUILD
deleted file mode 100644
index ab537f069331..000000000000
--- a/testing/php7-pecl-lzf/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-lzf
-_pkgreal=LZF
-_pkgextname=lzf
-pkgver=1.7.0
-pkgrel=0
-pkgdesc="PHP extension handles LZF de/compression - PECL"
-url="https://pecl.php.net/package/LZF"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev autoconf re2c"
-source="https://pecl.php.net/get/$_pkgreal-$pkgver.tgz"
-builddir="$srcdir"/$_pkgreal-$pkgver
-provides="php7-lzf=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-lzf" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir"/ install
- install -d "$pkgdir"/etc/php7/conf.d
- echo "extension=$_pkgextname" > "$pkgdir"/etc/php7/conf.d/50_$_pkgreal.ini
-}
-
-sha512sums="
-76a2bce7aa44f9aae40345f37c9294626d453879c7f98099ad6c31ae32abc638233934bf22ddd9bc0d4a6d285b25aa06dedc175ad5bb1544884a272e6b031ced LZF-1.7.0.tgz
-"
diff --git a/testing/php7-pecl-mailparse/APKBUILD b/testing/php7-pecl-mailparse/APKBUILD
deleted file mode 100644
index 7b9764f0f448..000000000000
--- a/testing/php7-pecl-mailparse/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-mailparse
-_extname=mailparse
-pkgver=3.1.4
-pkgrel=0
-pkgdesc="PHP 7 extension for parsing and working with email messages - PECL"
-url="https://pecl.php.net/package/mailparse"
-arch="all"
-license="PHP-3.01"
-depends="php7-mbstring"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-mailparse=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-mailparse" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Tests require mbstring extension which is not bundled
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=/usr/lib/php7/modules/mbstring.so \
- -d extension=modules/$_extname.so" TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/60_$_extname.ini
-}
-
-sha512sums="
-f4d8fd72dddaf6697d0b33def626c9be2e16c27e018f8f4aa71e5375e73a2f1e17419328439159f58bd1d4047640296c24d6b315ad0695fd02218f98376a73a9 php-pecl-mailparse-3.1.4.tgz
-"
diff --git a/testing/php7-pecl-maxminddb/APKBUILD b/testing/php7-pecl-maxminddb/APKBUILD
deleted file mode 100644
index a378113d21e1..000000000000
--- a/testing/php7-pecl-maxminddb/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: TBK <alpine@jjtc.eu>
-# Maintainer: TBK <alpine@jjtc.eu>
-pkgname=php7-pecl-maxminddb
-_extname=maxminddb
-pkgver=1.11.0
-pkgrel=0
-pkgdesc="PHP 7.4 MaxMind DB Reader extension - PECL"
-url="https://pecl.php.net/package/maxminddb"
-arch="all"
-license="Apache-2.0"
-depends="php7-bcmath"
-makedepends="libmaxminddb-dev php7-dev"
-source="php-pecl-$_extname-$pkgver.tar.gz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver/ext"
-provides="php7-maxminddb=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-maxminddb" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr \
- --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- make test NO_INTERACTION=1 REPORT_EXIT_STATUS=1
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local confdir="$pkgdir"/etc/php7/conf.d
- install -d $confdir
- echo "extension=maxminddb" > $confdir/maxminddb.ini
-}
-
-sha512sums="
-9ae2b168519d67803026862a035cf7ab392f4276a662fb674b4f3b9c2c6e28616b609b9121e0af46a599e16895f59282c4ff4db47ac22134bd5bbdec4aec950f php-pecl-maxminddb-1.11.0.tar.gz
-"
diff --git a/testing/php7-pecl-mcrypt/APKBUILD b/testing/php7-pecl-mcrypt/APKBUILD
deleted file mode 100644
index 0d2276631eff..000000000000
--- a/testing/php7-pecl-mcrypt/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: TBK <alpine@jjtc.eu>
-pkgname=php7-pecl-mcrypt
-_extname=mcrypt
-pkgver=1.0.6
-pkgrel=0
-pkgdesc="Provides PHP 7 bindings for the unmaintained libmcrypt - PECL"
-url="https://pecl.php.net/package/mcrypt"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev libmcrypt-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-mcrypt=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-mcrypt" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-506d5eb5b52aea6d48ab1800326fdd46af7992511bd9ac6604bb090d3724e058c936265da064cd6188bc0445d646a3678a7540498925ae7d119f821b2bd43880 php-pecl-mcrypt-1.0.6.tgz
-"
diff --git a/testing/php7-pecl-memcache/APKBUILD b/testing/php7-pecl-memcache/APKBUILD
deleted file mode 100644
index 00c5814a9951..000000000000
--- a/testing/php7-pecl-memcache/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-memcache
-_pkgreal=memcache
-pkgver=4.0.5.2
-pkgrel=1
-pkgdesc="PECL memcache extension, provides handy OO and procedural interfaces, can be used as session handler."
-url="https://pecl.php.net/package/memcache"
-arch="all"
-license="PHP-3.01"
-depends="php7-session"
-makedepends="php7-dev autoconf re2c"
-source="https://pecl.php.net/get/$_pkgreal-$pkgver.tgz"
-builddir="$srcdir/$_pkgreal-$pkgver"
-provides="php7-memcache=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-memcache" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Tests require memcached server, basic check, see tests/memcache.sh
- php7 -d extension="$builddir"/modules/$_pkgreal.so --ri $_pkgreal
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir"/ install
- install -d "$pkgdir"/etc/php7/conf.d
- echo "extension=$_pkgreal.so" > "$pkgdir"/etc/php7/conf.d/$_pkgreal.ini
-}
-
-sha512sums="93e163acf3a6c28f16b5f0982105f6f558cceeb314b3f09ad71655d8a5adf64d23959f1a2f3589eb7e7a7e18c88ba8132014e13f697a737cd570cf9405137384 memcache-4.0.5.2.tgz"
diff --git a/testing/php7-pecl-memcached/APKBUILD b/testing/php7-pecl-memcached/APKBUILD
deleted file mode 100644
index 16e37ab87515..000000000000
--- a/testing/php7-pecl-memcached/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-memcached
-_pkgreal=memcached
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="PHP 7 extension for interfacing with memcached via libmemcached library - PECL"
-url="https://pecl.php.net/package/memcached"
-arch="all"
-license="PHP-3.01"
-depends="php7-session php7-pecl-igbinary"
-makedepends="php7-dev zlib-dev libmemcached-dev cyrus-sasl-dev"
-source="php-pecl-$_pkgreal-$pkgver.tgz::https://pecl.php.net/get/$_pkgreal-$pkgver.tgz"
-builddir="$srcdir/$_pkgreal-$pkgver"
-provides="php7-memcached=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-memcached" # for backward compatibility
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --with-php-config=php-config7 \
- --enable-memcached-igbinary \
- --disable-memcached-sasl
- make
-}
-
-check() {
- # Tests require memcached server, basic check
- php7 -d extension="$builddir"/modules/$_pkgreal.so --ri $_pkgreal
-}
-
-package() {
- local confdir="$pkgdir/etc/php7/conf.d"
-
- make INSTALL_ROOT="$pkgdir" install
-
- mkdir -p "$confdir"
- echo "extension=$_pkgreal.so" > "$confdir"/20_$_pkgreal.ini
-}
-
-sha512sums="
-ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514 php-pecl-memcached-3.2.0.tgz
-"
diff --git a/testing/php7-pecl-mongodb/APKBUILD b/testing/php7-pecl-mongodb/APKBUILD
deleted file mode 100644
index 0da714ddbce3..000000000000
--- a/testing/php7-pecl-mongodb/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-mongodb
-_extname=mongodb
-pkgver=1.15.1
-pkgrel=0
-pkgdesc="PHP 7 MongoDB driver - PECL"
-url="https://pecl.php.net/package/mongodb"
-arch="all"
-license="Apache-2.0"
-depends="php7-json"
-makedepends="cyrus-sasl-dev icu-dev openssl1.1-compat-dev php7-dev snappy-dev zstd-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-provides="php7-mongodb=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-mongodb" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr \
- --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- # tests requires additional dependencies (vagrant)
- php7 -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname.so" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-ad419ab0d0b971280debc2bf25579627c91e8f231cdd2112b1ff7b14272c28267c4b7b52eeaf4d550de57c6b130dd575b9f3e65ce42153a81ad8b7efad57a0b2 php-pecl-mongodb-1.15.1.tgz
-"
diff --git a/testing/php7-pecl-msgpack/APKBUILD b/testing/php7-pecl-msgpack/APKBUILD
deleted file mode 100644
index f05b974d0d7e..000000000000
--- a/testing/php7-pecl-msgpack/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-msgpack
-_extname=msgpack
-pkgver=2.2.0_rc2
-_pkgver=${pkgver/_rc/RC}
-pkgrel=0
-pkgdesc="PHP 7 extension provides API for communicating with MessagePack serialization - PECL"
-url="https://pecl.php.net/package/msgpack"
-arch="all"
-license="BSD-3-Clause"
-depends="php7-session php7-sockets"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$_pkgver.tgz::https://pecl.php.net/get/$_extname-$_pkgver.tgz"
-builddir="$srcdir"/$_extname-$_pkgver
-provides="php7-msgpack=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-msgpack" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- rm -f tests/034.phpt # XFAIL https://github.com/msgpack/msgpack-php/issues/136
- rm -f tests/035.phpt # fails on ppc64le as of slow environment https://github.com/msgpack/msgpack-php/issues/123
- # Tests require session and sockets extensions which are not bundled
- local _depsdir=/usr/lib/php7/modules
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test PHP_TEST_SHARED_EXTENSIONS="
- -d extension=$_depsdir/session.so \
- -d extension=$_depsdir/sockets.so \
- -d extension=modules/$_extname.so" TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/50_$_extname.ini
-}
-
-sha512sums="
-11b7243e6abb7dc58a02e2289433a292e2b2a3298357e3a14468faa06c7d302c442891cdf944e31b22435b9ce449b2ab632e30c1c5ccdec8f6b6e5033a2cdbef php-pecl-msgpack-2.2.0RC2.tgz
-"
diff --git a/testing/php7-pecl-mustache/APKBUILD b/testing/php7-pecl-mustache/APKBUILD
deleted file mode 100644
index 81455c27b8fd..000000000000
--- a/testing/php7-pecl-mustache/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Renoir Boulanger <hello@renoirboulanger.com>
-pkgname=php7-pecl-mustache
-_extname=mustache
-pkgver=0.9.3
-pkgrel=0
-pkgdesc="PHP 7 extension: C++ implementation of Mustache - PECL"
-url="https://pecl.php.net/package/mustache"
-arch="all"
-license="MIT"
-depends="php7-common"
-makedepends="php7-dev libmustache"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-
-build() {
- phpize7
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --with-php-config=php-config7 \
- --enable-mustache
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname.so" > $_confdir/70_$_extname.ini
-}
-
-sha512sums="
-11b651f571368d5e745c299de90e48019425eb34c7ce7413645fb0d41744a9ce337e5484b4bb3933a6ab290cd7f2b5ab9b778afcd9b222bbc871b26a5fb0ba31 php-pecl-mustache-0.9.3.tgz
-"
diff --git a/testing/php7-pecl-oauth/APKBUILD b/testing/php7-pecl-oauth/APKBUILD
deleted file mode 100644
index 4e614440a145..000000000000
--- a/testing/php7-pecl-oauth/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-oauth
-_extname=oauth
-pkgver=2.0.7
-pkgrel=1
-pkgdesc="PHP 7 extension, OAuth is an authorization protocol built on top of HTTP - PECL"
-url="https://pecl.php.net/package/oauth"
-arch="all"
-license="BSD-3-Clause"
-depends="php7-common"
-makedepends="php7-dev curl-dev"
-checkdepends="php7-openssl php7-pcntl php7-posix"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
- pcre.patch"
-builddir="$srcdir"/$_extname-$pkgver
-provides="php7-oauth=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-oauth" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- local _modules="/usr/lib/php7/modules"
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
- PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=$_modules/openssl.so \
- -d extension=$_modules/pcntl.so \
- -d extension=$_modules/posix.so \
- -d extension=modules/$_extname.so" TESTS==--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/60_$_extname.ini
-}
-
-sha512sums="261bbe6d1c4299f44ce40030b3959e26f2535c70d01b7a4e870d14c84b0a01e68484e61907554d720667fa08a2ec00b7d43cf2f523800c832f02b093e7b6534a php-pecl-oauth-2.0.7.tgz
-68d636032d2f3cb2822ea3121a80256b87a04cc5998c4775174366c6a3392dfe3abc00c84cc50aca5745a32ddd2246af129fe5aa17cc415652c52214a84feef9 pcre.patch"
diff --git a/testing/php7-pecl-oauth/pcre.patch b/testing/php7-pecl-oauth/pcre.patch
deleted file mode 100644
index 7a47b989d375..000000000000
--- a/testing/php7-pecl-oauth/pcre.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config.m4 b/config.m4
-index e05ed68..48e2608 100644
---- a/config.m4
-+++ b/config.m4
-@@ -14,8 +14,6 @@ if test "$PHP_OAUTH" != "no"; then
- PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared)
- CFLAGS="$CFLAGS -Wall -g"
-
-- AC_CHECK_HEADER(pcre.h, , [AC_MSG_ERROR([Couldn't find pcre.h, try installing the libpcre development/headers package])])
--
- AS_IF([test "x$with_curl" != "xno"],
- [
- AC_MSG_CHECKING(for cURL in default path)
diff --git a/testing/php7-pecl-pcov/APKBUILD b/testing/php7-pecl-pcov/APKBUILD
deleted file mode 100644
index 996d50437d2d..000000000000
--- a/testing/php7-pecl-pcov/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-
-pkgname=php7-pecl-pcov
-_extname=pcov
-pkgver=1.0.11
-pkgrel=0
-pkgdesc="Code coverage driver for PHP 7 - PECL"
-url="https://pecl.php.net/package/pcov"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- php7 -dextension=modules/$_extname.so --ri $_extname
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local _confdir="$pkgdir"/etc/php7/conf.d
- mkdir -p $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-9d196d92ddfdcd22a69d94543202d861e8d54355991d528e7a5f5bb5423943d6bc04b1b9a117294b7337093765595e5be0ac95ab1619149ec6dc9d6a4a330d69 php-pecl-pcov-1.0.11.tgz
-"
diff --git a/testing/php7-pecl-protobuf/APKBUILD b/testing/php7-pecl-protobuf/APKBUILD
deleted file mode 100644
index 6e84cd409b43..000000000000
--- a/testing/php7-pecl-protobuf/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: TBK <alpine@jjtc.eu>
-# Maintainer: TBK <alpine@jjtc.eu>
-pkgname=php7-pecl-protobuf
-_extname=protobuf
-pkgver=3.22.1
-pkgrel=0
-pkgdesc="PHP 7.4 extension: Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data."
-url="https://pecl.php.net/package/protobuf"
-arch="all"
-license="BSD-3-Clause"
-_phpv=7
-_php=php$_phpv
-depends="$_php-common"
-makedepends="$_php-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-protobuf=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-protobuf" # for backward compatibility
-
-build() {
- phpize$_phpv
- ./configure --prefix=/usr --with-php-config=php-config$_phpv
- make
-}
-
-check() {
- # Test suite is not a part of pecl release.
- $_php -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/$_php/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-4b86f4c7884527e2c06ec1874cdc7e17827720b7d1a3b2fb38d7115f16d2ec0ee0ae835dbe0313c1e0d777be96764f9834a89e7d93341a78bbffd6f976661346 php-pecl-protobuf-3.22.1.tgz
-"
diff --git a/testing/php7-pecl-psr/APKBUILD b/testing/php7-pecl-psr/APKBUILD
deleted file mode 100644
index 8a0aeb859237..000000000000
--- a/testing/php7-pecl-psr/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-psr
-_extname=psr
-pkgver=1.2.0
-pkgrel=0
-pkgdesc="PHP 7 extension provides the accepted PSR interfaces, so they can be used in an extension - PECL"
-url="https://pecl.php.net/package/psr"
-arch="all"
-license="BSD-2-Clause"
-depends="php7-common"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-psr=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-psr" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-90d4bc1cd2364a15775024806ec5bc1b8f60ed44569162016a0a78fca89f4ad0f0e0b1f9f09ebdcfe6a803e888bddd1d8ce73100eec52ecc21c2e505a35ee5dd php-pecl-psr-1.2.0.tgz
-"
diff --git a/testing/php7-pecl-rdkafka/APKBUILD b/testing/php7-pecl-rdkafka/APKBUILD
deleted file mode 100644
index e07b314b7018..000000000000
--- a/testing/php7-pecl-rdkafka/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Gennady Feldman <gena01@gmail.com>
-# Maintainer: Gennady Feldman <gena01@gmail.com>
-pkgname=php7-pecl-rdkafka
-_extname=rdkafka
-pkgver=6.0.3
-pkgrel=1
-pkgdesc="A librdkafka bindings for PHP 7 providing a working client for Kafka - PECL"
-url="https://pecl.php.net/package/rdkafka"
-arch="all"
-license="MIT"
-depends="php7-common"
-makedepends="php7-dev file librdkafka-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-
-provides="php7-rdkafka=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-rdkafka" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-0a40cd24e68360f98c2ad941acae2ced55c13ebe6398274c7c127df18fa0181acb73be32d8eba4b0af3016ab7aead3cda516171ac388b10cd5d70fa3b22ed90d php-pecl-rdkafka-6.0.3.tgz
-"
diff --git a/testing/php7-pecl-redis/APKBUILD b/testing/php7-pecl-redis/APKBUILD
deleted file mode 100644
index a2c050d6400b..000000000000
--- a/testing/php7-pecl-redis/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-redis
-_extname=redis
-pkgver=5.3.7
-_pkgver=${pkgver/_rc/RC}
-pkgrel=0
-pkgdesc="PHP 7 extension for interfacing with Redis - PECL"
-url="https://pecl.php.net/package/redis"
-arch="all"
-license="PHP-3.01"
-depends="php7-common php7-pecl-igbinary php7-session php7-json"
-makedepends="php7-dev lz4-dev zstd-dev"
-source="php-pecl-$_extname-$_pkgver.tgz::https://pecl.php.net/get/$_extname-$_pkgver.tgz"
-builddir="$srcdir/$_extname-$_pkgver"
-provides="php7-redis=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-redis" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7 \
- --enable-redis-igbinary \
- --enable-redis-lz4 --with-liblz4 \
- --enable-redis-lzf \
- --enable-redis-zstd
- make
-}
-
-check() {
- # Need running redis server
- php7 -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local _confdir="$pkgdir"/etc/php7/conf.d
- mkdir -p $_confdir
- echo "extension=$_extname" > $_confdir/20_$_extname.ini
-}
-
-sha512sums="
-b945d5aa86d3f58e75094369b0f324e987202f104aca7d7b46ba23cfaed54d186bb66931e200dd16d2dbeea11732dd0311da4e3d7485c3b725027f7924652832 php-pecl-redis-5.3.7.tgz
-"
diff --git a/testing/php7-pecl-rrd/APKBUILD b/testing/php7-pecl-rrd/APKBUILD
deleted file mode 100644
index 857dc9054bcb..000000000000
--- a/testing/php7-pecl-rrd/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Pascal Hofmann <mail@pascalhofmann.de>
-# Contributor: Mickaël Remars <github@remars.com>
-# Maintainer: Mickaël Remars <github@remars.com>
-_pkgreal=rrd
-pkgname=php7-pecl-rrd
-pkgver=2.0.3
-pkgrel=0
-pkgdesc="PHP7 bindings to rrd tool system"
-url="https://pecl.php.net/package/rrd"
-arch="all"
-license="BSD-2-Clause" # just one word difference: "owner" in php-rrd's license, "holder" in bsd-2-clause
-depends="php7-common"
-makedepends="php7-dev re2c rrdtool-dev"
-checkdepends="rrdtool"
-source="$pkgname-$pkgver.tgz::http://pecl.php.net/get/$_pkgreal-$pkgver.tgz"
-builddir="$srcdir/$_pkgreal-$pkgver"
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- local confdir="$pkgdir/etc/php7/conf.d"
-
- make INSTALL_ROOT="$pkgdir" install
-
- mkdir -p "$confdir"
- echo "extension=$_pkgreal.so" > "$confdir"/20_$_pkgreal.ini
-}
-
-sha512sums="28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4 php7-pecl-rrd-2.0.3.tgz"
diff --git a/testing/php7-pecl-seaslog/APKBUILD b/testing/php7-pecl-seaslog/APKBUILD
deleted file mode 100644
index c0772dc55a3d..000000000000
--- a/testing/php7-pecl-seaslog/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: viest <dev@service.viest.me>
-# Maintainer: Chitao.Gao <neeke@php.net>
-pkgname=php7-pecl-seaslog
-_extname=seaslog
-pkgver=2.2.0
-pkgrel=0
-pkgdesc="An effective, fast, stable log extension for PHP 7."
-url="https://pecl.php.net/package/SeasLog"
-arch="all"
-license="PHP-3.01"
-depends="php7-json"
-makedepends="php7-dev re2c"
-source="php-pecl-$_extname-$pkgver.tar.gz::https://pecl.php.net/get/SeasLog-$pkgver.tgz"
-builddir="$srcdir"/SeasLog-$pkgver
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
- PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=/usr/lib/php7/modules/json.so \
- -d extension=modules/$_extname.so"
- php7 -dextension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="5c1d7dd6641bd8b8f3bf2c52f4b427103643fa1b7407a89769de7f450e882f9a1484b5b8b1aecf13c8060966b3bbcb52cbaf1536b93a8bceca5104bfda547629 php-pecl-seaslog-2.2.0.tar.gz"
diff --git a/testing/php7-pecl-simple-kafka-client/APKBUILD b/testing/php7-pecl-simple-kafka-client/APKBUILD
deleted file mode 100644
index 6f5d308c327e..000000000000
--- a/testing/php7-pecl-simple-kafka-client/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Nick Chiu <coding.nikazu@gmail.com>
-pkgname=php7-pecl-simple-kafka-client
-_extname=simple_kafka_client
-pkgver=0.1.4
-pkgrel=1
-pkgdesc="PHP 7 extension for Kafka based on librdkafka - PECL"
-url="https://pecl.php.net/package/simple_kafka_client"
-arch="all"
-license="BSD-3-Clause"
-depends="php7-common"
-makedepends="php7-dev file librdkafka-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-
-provides="php7-simple-kafka-client=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-simple-kafka-client" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-450055cfe1b5a4b966a4cfdffffc89a3d1ac737a9d0b24aa66126f925cdbb5d7b5287a8c7e9bea5fe859cd360ba4683564837f8abd93567b54e6284687c3f4fb php-pecl-simple_kafka_client-0.1.4.tgz
-"
diff --git a/testing/php7-pecl-smbclient/APKBUILD b/testing/php7-pecl-smbclient/APKBUILD
deleted file mode 100644
index dc2d5855a463..000000000000
--- a/testing/php7-pecl-smbclient/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-
-pkgname=php7-pecl-smbclient
-_extname=smbclient
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="PHP 7 extension that uses Samba's libsmbclient library to provide Samba related functions and 'smb' streams to PHP programs."
-url="https://pecl.php.net/package/smbclient"
-arch="all"
-license="BSD-2-Clause"
-depends="php7-common"
-makedepends="php7-dev samba-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Test suite require phpunit to run.
- php7 -d extension=modules/$_extname.so --ri smbclient
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-b1ca1c28c4c3671de2edb00d864f5ee62236a9bfc7f49d9e9aa17120ea1b57b710b0eb00b9f0a59f87f6354015b563e0ca4b02e03ef0809ed9ade6580f1313b7 php-pecl-smbclient-1.1.0.tgz
-"
diff --git a/testing/php7-pecl-solr/APKBUILD b/testing/php7-pecl-solr/APKBUILD
deleted file mode 100644
index 8f92e167eeb0..000000000000
--- a/testing/php7-pecl-solr/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-solr
-_pkgreal=solr
-pkgver=2.6.0
-pkgrel=0
-pkgdesc="Apache SOLR extension for PHP"
-url="https://pecl.php.net/package/solr"
-arch="all"
-license="PHP-3.01"
-depends="php7-json"
-makedepends="php7-dev curl-dev libxml2-dev"
-source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_pkgreal-$pkgver.tgz
- fix-tests.patch"
-builddir="$srcdir"/$_pkgreal-$pkgver
-provides="php7-solr=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-solr" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- php7 -d extension=modules/$_pkgreal.so --ri $_pkgreal
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 test \
- TESTS='--show-diff' \
- PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=/usr/lib/php7/modules/json.so \
- -d extension=modules/$_pkgreal.so"
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir"/ install
- local _confdir=/etc/php7/conf.d
- install -d "$pkgdir"$_confdir
- echo "extension=$_pkgreal.so" > "$pkgdir"$_confdir/40_$_pkgreal.ini
-}
-
-sha512sums="
-0b1254d69752759fbc4ca9962a238399a926a31820258790d55d020c9fbb116e8b6a5d7169f3db07c94e2a2f561ef779f542babdac2f16a2ebe29255c063cab2 php7-pecl-solr-2.6.0.tgz
-553503d194c8c8c4db065a4c21136e51d4ba8bb9a74327d312a6506e12d91b4d2b72c5082741e961df7f3852fecf2374333c8f00a173ca2e6e7e6f1049ecf6cb fix-tests.patch
-"
diff --git a/testing/php7-pecl-solr/fix-tests.patch b/testing/php7-pecl-solr/fix-tests.patch
deleted file mode 100644
index 58dd72ce4568..000000000000
--- a/testing/php7-pecl-solr/fix-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Summary: skip tests which require solr server
---- a/tests/test.config.inc
-+++ b/tests/test.config.inc
-@@ -1,6 +1,6 @@
- <?php
-
--define('SOLR_SERVER_CONFIGURED', true);
-+define('SOLR_SERVER_CONFIGURED', false);
-
- define('ROOT_DIRECTORY', dirname(__FILE__));
-
diff --git a/testing/php7-pecl-ssh2/APKBUILD b/testing/php7-pecl-ssh2/APKBUILD
deleted file mode 100644
index 5154b4bd3b6d..000000000000
--- a/testing/php7-pecl-ssh2/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-ssh2
-_extname=ssh2
-pkgver=1.3.1
-pkgrel=0
-pkgdesc="PHP 7 extension provide bindings for the libssh2 library - PECL"
-url="https://pecl.php.net/package/ssh2"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev libssh2-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-ssh2=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-ssh2" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
- # Check extension loading, testsuite skips tests if extension broken
- php7 -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76 php-pecl-ssh2-1.3.1.tgz"
diff --git a/testing/php7-pecl-stats/APKBUILD b/testing/php7-pecl-stats/APKBUILD
deleted file mode 100644
index 9445a1a2f0c0..000000000000
--- a/testing/php7-pecl-stats/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-stats
-_extname=stats
-pkgver=2.0.4
-pkgrel=0
-pkgdesc="PHP 7 extension that provides few dozens routines for statistical computation."
-url="https://pecl.php.net/package/stats"
-arch="all !s390x" # too many tests fails on s390x
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev"
-_commit="fac78cf926bb00c9974379c7131c58b7545e5b15"
-source="php-pecl-$_extname-$_commit.tar.gz::https://github.com/php/pecl-math-stats/archive/$_commit.tar.gz"
-builddir="$srcdir"/pecl-math-stats-$_commit
-#source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-#builddir="$srcdir"/$_pkgreal-$pkgver
-provides="php7-stats=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-stats" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- php7 -dextension=modules/$_extname.so --ri $_extname
- case "$CARCH" in
- # Remove test fail https://bugs.php.net/bug.php?id=76163
- aarch64 | ppc64le) rm tests/stats_stat_correlation.phpt
- esac
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/60_$_extname.ini
-}
-
-sha512sums="0f359761512aa3c11bad1aa4c812e9a6a35d8e659b9aab4a38e5218dab5d7a33ebe349d9a6f25c9bfa361989281c68988f22988d3d4a357a610700c99897881c php-pecl-stats-fac78cf926bb00c9974379c7131c58b7545e5b15.tar.gz"
diff --git a/testing/php7-pecl-swoole/APKBUILD b/testing/php7-pecl-swoole/APKBUILD
deleted file mode 100644
index 1e5982364c86..000000000000
--- a/testing/php7-pecl-swoole/APKBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-swoole
-_extname=swoole
-pkgver=4.8.13
-pkgrel=0
-pkgdesc="Event-driven asynchronous and concurrent networking engine with high performance for PHP 7.4 - PECL"
-url="https://pecl.php.net/package/swoole"
-arch="all"
-license="Apache-2.0"
-depends="php7-curl php7-json php7-mysqlnd php7-openssl php7-sockets"
-makedepends="php7-dev openssl-dev nghttp2-dev c-ares-dev curl-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-subpackages="$pkgname-dev"
-replaces="php7-pecl-openswoole"
-
-case "$CARCH" in
- ppc64le|s390x) makedepends="$makedepends libucontext-dev" ;;
-esac
-
-build() {
- case "$CARCH" in
- ppc64le|s390x) export LDFLAGS="$LDFLAGS -lucontext" ;;
- esac
- phpize7
- ./configure --prefix=/usr \
- --with-php-config=php-config7 \
- --enable-mysqlnd \
- --enable-openssl --with-openssl-dir=/usr \
- --enable-sockets \
- --enable-swoole-curl \
- --enable-swoole-json \
- --enable-cares \
- --enable-http2
- make
-}
-
-check() {
- # needs extra services to test all suite
- php7 -d extension=modules/swoole.so --ri swoole
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/50_$_extname.ini
-}
-
-sha512sums="
-c84e55ec39c0ce2594a22204c537bcaeb0b851531644f305dd4d9fc61bfaedd9a678825166b774e0f96aaa9c944128bd3dc6f3ea9557cafd227cb54b84fdc01d php-pecl-swoole-4.8.13.tgz
-"
diff --git a/testing/php7-pecl-timezonedb/APKBUILD b/testing/php7-pecl-timezonedb/APKBUILD
deleted file mode 100644
index cde2b495fd25..000000000000
--- a/testing/php7-pecl-timezonedb/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-timezonedb
-_extname=timezonedb
-pkgver=2023.3
-pkgrel=0
-pkgdesc="Timezone Database to be used with PHP's date and time functions."
-url="https://pecl.php.net/package/timezonedb"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-timezonedb=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-timezonedb" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # Test suite is not a part of pecl release.
- php7 -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname.so" > $_confdir/40_$_extname.ini
-}
-
-sha512sums="
-4114401c99a94f669a5c3023226c7565353c940f713792ef8a83cd2626dc051b344c6c66de1892c354090a33622cddf352f9b42e282c7d2d2fe5743f60473efd php-pecl-timezonedb-2023.3.tgz
-"
diff --git a/testing/php7-pecl-uploadprogress/APKBUILD b/testing/php7-pecl-uploadprogress/APKBUILD
deleted file mode 100644
index 726394af4f13..000000000000
--- a/testing/php7-pecl-uploadprogress/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-
-pkgname=php7-pecl-uploadprogress
-_extname=uploadprogress
-pkgver=2.0.2
-pkgrel=0
-pkgdesc="An extension to track progress of a file upload for PHP 7.4 - PECL"
-url="https://pecl.php.net/package/uploadprogress"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev"
-subpackages="$pkgname-doc::noarch"
-source="php-pecl-$_extname-$pkgver.tar.gz::https://pecl.php.net/get/uploadprogress-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-uploadprogress=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-uploadprogress" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- php7 -d extension="$builddir"/modules/$_extname.so --ri $_extname
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS='--show-diff '
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local confdir="$pkgdir/etc/php7/conf.d"
- mkdir -p "$confdir"
- echo "extension=$_extname" > "$confdir"/$_extname.ini
-
- local docdir="$pkgdir"/usr/share/doc/$pkgname
- install -Dm644 -t $docdir README.md
- cp -r examples/. $docdir/examples
-}
-
-sha512sums="
-b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd php-pecl-uploadprogress-2.0.2.tar.gz
-"
diff --git a/testing/php7-pecl-uuid/APKBUILD b/testing/php7-pecl-uuid/APKBUILD
deleted file mode 100644
index ee140da40093..000000000000
--- a/testing/php7-pecl-uuid/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-uuid
-_extname=uuid
-pkgver=1.2.0
-pkgrel=0
-pkgdesc="A wrapper around libuuid from the ext2utils project."
-url="https://pecl.php.net/package/uuid"
-arch="all"
-license="LGPL-2.1-or-later"
-depends="php7-common"
-makedepends="php7-dev util-linux-dev"
-source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-uuid=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-uuid" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname.so" > $_confdir/50_$_extname.ini
-}
-
-sha512sums="bd557823a8c2b78f74675a2554445eafc69193c6fe5af1f9435cdd90a8efdec0d3974ae8af759fe7d30b2f805876fc2ef55058dea245c9d89a792f634fdb0a10 php7-pecl-uuid-1.2.0.tgz"
diff --git a/testing/php7-pecl-varnish/APKBUILD b/testing/php7-pecl-varnish/APKBUILD
deleted file mode 100644
index 237ef3409a04..000000000000
--- a/testing/php7-pecl-varnish/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-varnish
-_extname=varnish
-pkgver=1.2.6
-pkgrel=1
-pkgdesc="PHP 7 extension: makes it possible to interact with a running varnish instance through TCP socket or shared memory."
-url="https://pecl.php.net/package/varnish"
-arch="all"
-license="BSD-3-Clause"
-depends="php7-common"
-makedepends="php7-dev autoconf libtool varnish-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-varnish=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-varnish" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- php7 -dextension=modules/$_extname.so --ri $_extname
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="d17e285a134d2541ddea2bfc8627bc4926b3dbeeee1e9c729cd49c17608030764435662148b0dc43dc0eb1eab5d5dc8fd88c86aca40178afaf1ec85fa3e63aae php-pecl-varnish-1.2.6.tgz"
diff --git a/testing/php7-pecl-vips/APKBUILD b/testing/php7-pecl-vips/APKBUILD
deleted file mode 100644
index 74e154bddc29..000000000000
--- a/testing/php7-pecl-vips/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: TBK <alpine@jjtc.eu>
-# Maintainer: TBK <alpine@jjtc.eu>
-pkgname=php7-pecl-vips
-_pkgname=vips
-pkgver=1.0.13
-pkgrel=0
-pkgdesc="PHP extension for interfacing with vips - PECL"
-url="https://pecl.php.net/package/vips"
-arch="all !ppc64le" # Limited by vips aport
-license="MIT"
-depends="php7-common"
-makedepends="php7-dev autoconf vips-dev"
-source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_pkgname-$pkgver.tgz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- install -d "$pkgdir"/etc/php7/conf.d
- echo "extension=$_pkgname.so" > "$pkgdir"/etc/php7/conf.d/$_pkgname.ini
-}
-
-sha512sums="
-005660e3adb834e38a57b559411f4d33ec3efc5b2bc2e9afe182826618a7670530635ca684e73af2eb2c30ac4d3360653ba53fcfbcb835c712341bd6ed98bea3 php7-pecl-vips-1.0.13.tgz
-"
diff --git a/testing/php7-pecl-xdebug/APKBUILD b/testing/php7-pecl-xdebug/APKBUILD
deleted file mode 100644
index ff788612bd3e..000000000000
--- a/testing/php7-pecl-xdebug/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-xdebug
-_extname=xdebug
-pkgver=3.1.6
-pkgrel=0
-pkgdesc="PHP extension that provides functions for function traces and profiling - PECL"
-url="https://pecl.php.net/package/xdebug"
-arch="all"
-license="PHP-3.0"
-depends="php7-common"
-makedepends="php7-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-xdebug=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-xdebug" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- # PECL package has no test suite.
- php7 -d zend_extension="$builddir"/modules/xdebug.so -r 'xdebug_info();'
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local _confdir="$pkgdir"/etc/php7/conf.d
- mkdir -p $_confdir
- # should go after opcache
- cat > $_confdir/50_$_extname.ini <<-EOF
- ; Uncomment and configure mode https://xdebug.org/docs/all_settings#xdebug.mode
- ;zend_extension=$_extname.so
- ;xdebug.mode=off
- EOF
-
- install -D -m644 -t "$pkgdir"/usr/share/php8/xdebug/ contrib/tracefile-analyser.php
- install -D -m644 -t "$pkgdir"/usr/share/vim/vimfiles/syntax/ contrib/xt.vim
-}
-
-sha512sums="
-5e9c185ff742b31fb25516b88f298e6c24e3c8dcf3848c1b5f8ffa10075a3027f4d48dac5429177acdb833c13c63348977787eb718ef4b0c57d635dcb8d254c1 php-pecl-xdebug-3.1.6.tgz
-"
diff --git a/testing/php7-pecl-xhprof/APKBUILD b/testing/php7-pecl-xhprof/APKBUILD
deleted file mode 100644
index 15ae26cb02e4..000000000000
--- a/testing/php7-pecl-xhprof/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-
-pkgname=php7-pecl-xhprof
-_extname=xhprof
-pkgver=2.3.9
-pkgrel=0
-pkgdesc="A Hierarchical Profiler for PHP 7 - PECL"
-url="https://pecl.php.net/package/xhprof"
-arch="all"
-license="Apache-2.0"
-depends="php7-common"
-makedepends="php7-dev"
-_assetsdepends="php7-ctype graphviz ghostscript-fonts"
-subpackages="$pkgname-assets::noarch"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver/extension"
-provides="php7-xhprof=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-xhprof" # for backward compatibility
-
-build() {
- phpize7
- ./configure --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- cat > $_confdir/$_extname.ini <<-EOF
- extension=$_extname
- xhprof.output_dir=/tmp
- EOF
-}
-
-assets() {
- pkgdesc="A Hierarchical Profiler for PHP (UI assets)"
- depends="$_assetsdepends"
- provides="php7-xhprof-assets=$pkgver-r$pkgrel" # for backward compatibility
- replaces="php7-xhprof-assets" # for backward compatibility
-
- local _assetsdir="$subpkgdir"/usr/share/php7/xhprof
- install -d $_assetsdir
- cp -R "$builddir"/../xhprof_lib $_assetsdir
- cp -R "$builddir"/../xhprof_html $_assetsdir
- cp -R "$builddir"/../examples $_assetsdir
-}
-
-sha512sums="
-38a2609d961d908c6a4b5d1ff2085ffdad4a5f7d277705c826ae19e215660802528d606c5ee052f2e65255a7a85b2a9cb9038f4785c730ec468fc76dc7bcf5de php-pecl-xhprof-2.3.9.tgz
-"
diff --git a/testing/php7-pecl-xlswriter/APKBUILD b/testing/php7-pecl-xlswriter/APKBUILD
deleted file mode 100644
index d6373dc9a69d..000000000000
--- a/testing/php7-pecl-xlswriter/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: viest <dev@service.viest.me>
-# Maintainer: viest <dev@service.viest.me>
-pkgname=php7-pecl-xlswriter
-_extname=xlswriter
-pkgver=1.5.4
-pkgrel=0
-pkgdesc="A PHP 7 Extension for creating and reader XLSX files. "
-url="https://pecl.php.net/package/xlswriter"
-arch="all"
-license="BSD-2-Clause"
-depends="php7-common"
-makedepends="php7-dev zlib-dev"
-source="php-pecl-$_extname-$pkgver.tar.gz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir"/$_extname-$pkgver
-
-build() {
- phpize7
- ./configure \
- --enable-reader \
- --prefix=/usr \
- --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-e5406bd429a13e01c9e6c45781d91a81f47c30151c09c6bd26ba27299ef09d28d412226c732177e94dae469e78c8a875199256a11318cf0f1b282ab3ae72ff38 php-pecl-xlswriter-1.5.4.tar.gz
-"
diff --git a/testing/php7-pecl-yaml/APKBUILD b/testing/php7-pecl-yaml/APKBUILD
deleted file mode 100644
index 55b7218ecf2c..000000000000
--- a/testing/php7-pecl-yaml/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Renoir Boulanger <hello@renoirboulanger.com>
-pkgname=php7-pecl-yaml
-_extname=yaml
-pkgver=2.2.3
-pkgrel=0
-pkgdesc="YAML syntax bindings for PHP 7 - PECL"
-url="https://pecl.php.net/package/yaml"
-arch="all"
-license="MIT"
-depends="php7-common"
-makedepends="php7-dev yaml-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-yaml=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-yaml" # for backward compatibility
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --with-php-config=php-config7
- make
-}
-
-# Thanks to @TBK for https://github.com/php/pecl-file_formats-yaml/pull/29
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/70_$_extname.ini
-}
-
-sha512sums="
-99d63d430dd2fa9767ecb3f70599d2ebd4c53b27770df72c00c4723816de422c581cea05e96c3cba5aaecbdc57cc482fad0f1fa300bdcf887daa7c2c034e6f4b php-pecl-yaml-2.2.3.tgz
-"
diff --git a/testing/php7-pecl-zmq/APKBUILD b/testing/php7-pecl-zmq/APKBUILD
deleted file mode 100644
index 181a62085ca1..000000000000
--- a/testing/php7-pecl-zmq/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
-# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
-pkgname=php7-pecl-zmq
-_pkgreal=zmq
-pkgver=1.1.3
-pkgrel=8
-pkgdesc="PHP extension for ZeroMQ - PECL"
-url="https://pecl.php.net/package/zmq"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev zeromq-dev"
-source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_pkgreal-$pkgver.tgz
- fix-php-7.3-compile.patch
- fix-php-7.4-compile.patch"
-builddir="$srcdir/$_pkgreal-$pkgver"
-provides="php7-zmq=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-zmq" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local confdir="$pkgdir/etc/php7/conf.d"
- mkdir -p "$confdir"
- echo "extension=$_pkgreal.so" > "$confdir"/50_$_pkgreal.ini
-}
-
-sha512sums="0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc php7-pecl-zmq-1.1.3.tgz
-3fda312b76106a1b78e35ffce3199bf52d040008e5fc9c134dd0b3f4a41ceef8857e8cae10b208dfd9b7394dfea652533a258f523da9b5f870d381bddd780797 fix-php-7.3-compile.patch
-58288af1fd1441491c7f5cc7be967ba8e806a8d80141d4c3699af9a977ede57f3f464922bc218f3aabdce965699fea5a016954ca538f98559553625d33ff2d4f fix-php-7.4-compile.patch"
diff --git a/testing/php7-pecl-zmq/fix-php-7.3-compile.patch b/testing/php7-pecl-zmq/fix-php-7.3-compile.patch
deleted file mode 100644
index dcf899bba7f8..000000000000
--- a/testing/php7-pecl-zmq/fix-php-7.3-compile.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From af02bde61c2a5af1ae64cac09ffe2b25237aa58e Mon Sep 17 00:00:00 2001
-Patch-Origin: https://github.com/mkoppanen/php-zmq/commit/af02bde61c2a5af1ae64cac09ffe2b25237aa58e
-From: Alex/AT <alex@alex-at.net>
-Date: Mon, 10 Dec 2018 06:02:27 +0300
-Subject: [PATCH] PHP 7.3 compatibility and bugfixes
-
-- Define new GC_ADDREF/DELREF/SET_REFCOUNT macros for older PHP versions and use them instead of direct GC reference counter access
-
-- Fixup all necessary 'long' type parameters to 'zend_long', PHP 7.3 makes it mandatory, also fixup some direct function implementations to accept the same
-
-- In php_zmq_recv(), zend_string_init() was wrongly called with third parameter as '1', marking new string with IS_STR_PERSISTENT, this caused heap corruption and/or segfaults with PHP 7.3 and could possibly cause other sorts of bugs under any 7.x version
- With ZVAL_STRINGL macro, this last '1' parameter meant to copy the string and was seemingly erroneously moved to zend_string_init(). zend_string_init() copies string by default, and last parameter has totally different meaning here
-
-- In poll(), flag ZVAL separation on passed arrays (PHP 7.3 makes it mandatory)
-
-- Test 19 (exception on connect callback with forced reference parameter): skip on PHP 7.1 and higher, PHP >= 7.1 started to fallback to passing argument by value instead of failing
-
-- Test 21 (warning generation from callback): it is ok, but PHP 7.3 uses 'int' instead of 'integer' for constants, so allow any word in place of the word 'integer'
----
- php_zmq.h | 6 ++++
- tests/019-callbackinvalidsignature.phpt | 3 +-
- tests/021-callbackwarning.phpt | 2 +-
- zmq.c | 40 ++++++++++++-------------
- zmq_sockopt.c | 4 +--
- 5 files changed, 30 insertions(+), 25 deletions(-)
-
-diff --git a/php_zmq.h b/php_zmq.h
-index ef50bfb..3833967 100644
---- a/php_zmq.h
-+++ b/php_zmq.h
-@@ -44,6 +44,12 @@
-
- #include "php.h"
-
-+#if PHP_VERSION_ID < 70300
-+#define GC_ADDREF(p) ++GC_REFCOUNT(p)
-+#define GC_DELREF(p) --GC_REFCOUNT(p)
-+#define GC_SET_REFCOUNT(p, rc) GC_REFCOUNT(p) = rc
-+#endif
-+
- extern zend_module_entry zmq_module_entry;
- #define phpext_zmq_ptr &zmq_module_entry
-
-diff --git a/tests/019-callbackinvalidsignature.phpt b/tests/019-callbackinvalidsignature.phpt
-index 753de31..b5bb20c 100644
---- a/tests/019-callbackinvalidsignature.phpt
-+++ b/tests/019-callbackinvalidsignature.phpt
-@@ -1,7 +1,8 @@
- --TEST--
- Test callback edge-cases
- --SKIPIF--
--<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
-+<?php require_once(dirname(__FILE__) . '/skipif.inc');
-+if (PHP_VERSION_ID >= 70100) die("skip PHP 7.1 and higher fallback to passing argument by value even when forced to reference"); ?>
- --FILE--
- <?php
-
-diff --git a/tests/021-callbackwarning.phpt b/tests/021-callbackwarning.phpt
-index 435743e..eba2ecf 100644
---- a/tests/021-callbackwarning.phpt
-+++ b/tests/021-callbackwarning.phpt
-@@ -13,5 +13,5 @@ function generate_warning($a, $b)
- $socket = new ZMQSocket(new ZMQContext(), ZMQ::SOCKET_REQ, 'persistent_socket', 'generate_warning');
-
- --EXPECTF--
--Warning: in_array() expects parameter 2 to be array, integer given in %s on line %d
-+Warning: in_array() expects parameter 2 to be array, %s given in %s on line %d
-
-diff --git a/zmq.c b/zmq.c
-index 942e69b..57ebd11 100644
---- a/zmq.c
-+++ b/zmq.c
-@@ -235,7 +235,7 @@ php_zmq_context *php_zmq_context_get(zend_long io_threads, zend_bool is_persiste
- le.type = php_zmq_context_list_entry();
- le.ptr = context;
-
-- GC_REFCOUNT(&le) = 1;
-+ GC_SET_REFCOUNT(&le, 1);
-
- /* plist_key is not a persistent allocated key, thus we use str_update here */
- if (zend_hash_str_update_mem(&EG(persistent_list), plist_key->val, plist_key->len, &le, sizeof(le)) == NULL) {
-@@ -369,7 +369,7 @@ PHP_METHOD(zmq, curvekeypair)
- PHP_METHOD(zmqcontext, __construct)
- {
- php_zmq_context_object *intern;
-- long io_threads = 1;
-+ zend_long io_threads = 1;
- zend_bool is_persistent = 1;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lb", &io_threads, &is_persistent) == FAILURE) {
-@@ -495,7 +495,7 @@ PHP_METHOD(zmqcontext, getOpt)
- Create a new zmq socket
- */
- static
--php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool is_persistent)
-+php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, zend_long type, zend_bool is_persistent)
- {
- php_zmq_socket *zmq_sock;
-
-@@ -503,7 +503,7 @@ php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool
- zmq_sock->z_socket = zmq_socket(context->z_ctx, type);
- zmq_sock->pid = getpid();
- zmq_sock->ctx = context;
-- zmq_sock->socket_type = type;
-+ zmq_sock->socket_type = type;
-
- if (!zmq_sock->z_socket) {
- pefree(zmq_sock, is_persistent);
-@@ -535,7 +535,7 @@ void php_zmq_socket_store(php_zmq_socket *zmq_sock_p, zend_long type, zend_strin
- le.type = php_zmq_socket_list_entry();
- le.ptr = zmq_sock_p;
-
-- GC_REFCOUNT(&le) = 1;
-+ GC_SET_REFCOUNT(&le, 1);
-
- plist_key = php_zmq_socket_plist_key(type, persistent_id, use_shared_ctx);
-
-@@ -796,7 +796,7 @@ PHP_METHOD(zmqsocket, __construct)
-
- /* {{{ static zend_bool php_zmq_send(php_zmq_socket_object *intern, char *message_param, long flags)
- */
--static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, long flags)
-+static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, zend_long flags)
- {
- int rc, errno_;
- zmq_msg_t message;
-@@ -828,7 +828,7 @@ static void php_zmq_sendmsg_impl(INTERNAL_FUNCTION_PARAMETERS)
- {
- php_zmq_socket_object *intern;
- zend_string *message_param;
-- long flags = 0;
-+ zend_long flags = 0;
- zend_bool ret;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &message_param, &flags) == FAILURE) {
-@@ -890,7 +890,7 @@ PHP_METHOD(zmqsocket, sendmulti)
- zval *messages;
- php_zmq_socket_object *intern;
- int to_send, ret = 0;
-- long flags = 0;
-+ zend_long flags = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|l", &messages, &flags) == FAILURE) {
- return;
-@@ -910,7 +910,7 @@ PHP_METHOD(zmqsocket, sendmulti)
- /* {{{ static zend_bool php_zmq_recv(php_zmq_socket_object *intern, long flags, zval *return_value)
- */
- static
--zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags)
-+zend_string *php_zmq_recv(php_zmq_socket_object *intern, zend_long flags)
- {
- int rc, errno_;
- zmq_msg_t message;
-@@ -933,7 +933,7 @@ zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags)
- return NULL;
- }
-
-- str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 1);
-+ str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 0);
- zmq_msg_close(&message);
- return str;
- }
-@@ -943,7 +943,7 @@ static void php_zmq_recvmsg_impl(INTERNAL_FUNCTION_PARAMETERS)
- {
- zend_string *str = NULL;
- php_zmq_socket_object *intern;
-- long flags = 0;
-+ zend_long flags = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags) == FAILURE) {
- return;
-@@ -974,7 +974,7 @@ PHP_METHOD(zmqsocket, recvmulti)
- {
- php_zmq_socket_object *intern;
- size_t value_len;
-- long flags = 0;
-+ zend_long flags = 0;
- #if ZMQ_VERSION_MAJOR < 3
- int64_t value;
- #else
-@@ -1303,7 +1303,7 @@ PHP_METHOD(zmqpoll, add)
- {
- php_zmq_poll_object *intern;
- zval *object;
-- long events;
-+ zend_long events;
- int error;
- zend_string *key;
-
-@@ -1423,10 +1423,10 @@ PHP_METHOD(zmqpoll, poll)
- php_zmq_poll_object *intern;
- zval *r_array, *w_array;
-
-- long timeout = -1;
-+ zend_long timeout = -1;
- int rc;
-
-- if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!|l", &r_array, &w_array, &timeout) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!/a!/|l", &r_array, &w_array, &timeout) == FAILURE) {
- return;
- }
-
-@@ -1592,7 +1592,7 @@ void s_clear_device_callback (php_zmq_device_cb_t *cb)
- }
-
- static
--void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, long timeout, zval *user_data)
-+void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, zend_long timeout, zval *user_data)
- {
- memcpy (&cb->fci, fci, sizeof (zend_fcall_info));
- memcpy (&cb->fci_cache, fci_cache, sizeof (zend_fcall_info_cache));
-@@ -1615,7 +1615,7 @@ void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend
- PHP_METHOD(zmqdevice, setidletimeout)
- {
- php_zmq_device_object *intern;
-- long timeout;
-+ zend_long timeout;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) {
- return;
-@@ -1644,7 +1644,7 @@ PHP_METHOD(zmqdevice, getidletimeout)
- PHP_METHOD(zmqdevice, settimertimeout)
- {
- php_zmq_device_object *intern;
-- long timeout;
-+ zend_long timeout;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) {
- return;
-@@ -1676,7 +1676,7 @@ PHP_METHOD(zmqdevice, setidlecallback)
- zval *user_data = NULL;
- zend_fcall_info fci;
- zend_fcall_info_cache fci_cache;
-- long timeout = 0;
-+ zend_long timeout = 0;
-
- if (ZEND_NUM_ARGS() == 2) {
- php_error_docref(NULL, E_DEPRECATED, "The signature for setIdleCallback has changed, please update your code");
-@@ -1718,7 +1718,7 @@ PHP_METHOD(zmqdevice, settimercallback)
- zval *user_data = NULL;
- zend_fcall_info fci;
- zend_fcall_info_cache fci_cache;
-- long timeout;
-+ zend_long timeout;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "fl|z!", &fci, &fci_cache, &timeout, &user_data) == FAILURE) {
- return;
-diff --git a/zmq_sockopt.c b/zmq_sockopt.c
-index 1357032..3a00421 100644
---- a/zmq_sockopt.c
-+++ b/zmq_sockopt.c
-@@ -1,5 +1,3 @@
--
--
- /*
- +-----------------------------------------------------------------------------------+
- | ZMQ extension for PHP |
-@@ -2033,7 +2031,7 @@ PHP_METHOD(zmqsocket, getsockopt)
- PHP_METHOD(zmqsocket, setsockopt)
- {
- php_zmq_socket_object *intern;
-- long key;
-+ zend_long key;
- zval *zv;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz/", &key, &zv) == FAILURE) {
diff --git a/testing/php7-pecl-zmq/fix-php-7.4-compile.patch b/testing/php7-pecl-zmq/fix-php-7.4-compile.patch
deleted file mode 100644
index 965f32a7a728..000000000000
--- a/testing/php7-pecl-zmq/fix-php-7.4-compile.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From 4ad1b33e095924bd4ccf79295999dd54edaaac37 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <luca.boccassi@gmail.com>
-Date: Thu, 5 Mar 2020 22:51:22 +0000
-Subject: [PATCH] updates for php7.4 and php8.0 (#212)
-
-* travisci: enabled php7.4 and php8.0
-
-* updates for php7.4 and php8.0
-
-- travisci enabled php7.4 and php8.0
-- removed now unused references to TSRMLS_*
- These flags were mostly already removed from the
- php7 codebase but some instances were still present.
- With php8 these produce compile errors.
-- fix tests for php8 and php7.4
- New TypeErrors now get handled correctly in the test cases.
-- fix memory corruption in zmq.c
- The conflicting line causes memory leaks on other php
- version and causes a segfault on php8 and php7.4
- The error was provocable with test case
- 021-callbackwarning.phpt. After removing of the line
- valgrind showed no memory leak, so this line was probably
- redundant. Also if you compare with zmqsocket constructor
- this line is also not present.
----
- .travis.yml | 6 +++---
- options/sockopts_set.gsl | 2 +-
- php_zmq_private.h | 4 ++--
- tests/016-callbackinvalidargs.phpt | 4 ++++
- tests/021-callbackwarning.phpt | 22 +++++++++++++++++-----
- tests/022-highwatermark.phpt | 6 +++---
- tests/055-socks-proxy.phpt | 2 +-
- tests/bug_gh_43.phpt | 25 +++++++++++++++++--------
- zmq.c | 1 -
- zmq_device.c | 14 +++++++-------
- zmq_sockopt.c | 2 +-
- 11 files changed, 56 insertions(+), 32 deletions(-)
-
-diff --git a/php_zmq_private.h b/php_zmq_private.h
-index 49630e9..2e5cd3b 100644
---- a/php_zmq_private.h
-+++ b/php_zmq_private.h
-@@ -156,9 +156,9 @@ typedef struct _php_zmq_device_object {
-
- #define PHP_ZMQ_ERROR_HANDLING_INIT() zend_error_handling error_handling;
-
--#define PHP_ZMQ_ERROR_HANDLING_THROW() zend_replace_error_handling(EH_THROW, php_zmq_socket_exception_sc_entry, &error_handling TSRMLS_CC);
-+#define PHP_ZMQ_ERROR_HANDLING_THROW() zend_replace_error_handling(EH_THROW, php_zmq_socket_exception_sc_entry, &error_handling);
-
--#define PHP_ZMQ_ERROR_HANDLING_RESTORE() zend_restore_error_handling(&error_handling TSRMLS_CC);
-+#define PHP_ZMQ_ERROR_HANDLING_RESTORE() zend_restore_error_handling(&error_handling);
-
- /* Compatibility macros between zeromq 2.x and 3.x */
- #ifndef ZMQ_DONTWAIT
-diff --git a/tests/016-callbackinvalidargs.phpt b/tests/016-callbackinvalidargs.phpt
-index a940e41..6bd0e75 100644
---- a/tests/016-callbackinvalidargs.phpt
-+++ b/tests/016-callbackinvalidargs.phpt
-@@ -10,6 +10,8 @@ try {
- echo "Fail\n";
- } catch (ZMQSocketException $e) {
- echo "OK\n";
-+} catch (TypeError $e) {
-+ echo "OK\n"; // on PHP8
- }
-
- try {
-@@ -18,6 +20,8 @@ try {
- echo "Fail\n";
- } catch (ZMQSocketException $e) {
- echo "OK\n";
-+} catch (TypeError $e) {
-+ echo "OK\n"; // on PHP8
- }
-
- --EXPECT--
-diff --git a/tests/021-callbackwarning.phpt b/tests/021-callbackwarning.phpt
-index eba2ecf..9e1689f 100644
---- a/tests/021-callbackwarning.phpt
-+++ b/tests/021-callbackwarning.phpt
-@@ -5,13 +5,25 @@ Test warning in callback
- --FILE--
- <?php
-
-+error_reporting(0);
-+
- function generate_warning($a, $b)
- {
- in_array(1, 1);
- }
-
--$socket = new ZMQSocket(new ZMQContext(), ZMQ::SOCKET_REQ, 'persistent_socket', 'generate_warning');
--
----EXPECTF--
--Warning: in_array() expects parameter 2 to be array, %s given in %s on line %d
--
-+try {
-+ $socket = new ZMQSocket(new ZMQContext(), ZMQ::SOCKET_REQ, 'persistent_socket', 'generate_warning');
-+ // on PHP7 and lower
-+ $lastError = error_get_last();
-+ if(strpos($lastError['message'], 'in_array() expects parameter 2 to be array') !== false)
-+ echo "OK\n";
-+ else{
-+ echo "FAIL\n";
-+ print_r($lastError);
-+ }
-+}catch(TypeError $e){
-+ echo "OK\n"; // on PHP8
-+}
-+--EXPECT--
-+OK
-diff --git a/tests/022-highwatermark.phpt b/tests/022-highwatermark.phpt
-index 84be509..c1ff703 100644
---- a/tests/022-highwatermark.phpt
-+++ b/tests/022-highwatermark.phpt
-@@ -1,11 +1,11 @@
- --TEST--
- Test that high-watermark works
- --SKIPIF--
--<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
--
-+<?php
-+require_once(dirname(__FILE__) . '/skipif.inc');
- if (!defined('ZMQ::SOCKOPT_LINGER'))
- die ("Skip Not compiled against new enough version");
--
-+?>
- --FILE--
- <?php
-
-diff --git a/tests/bug_gh_43.phpt b/tests/bug_gh_43.phpt
-index bdc274a..923d074 100644
---- a/tests/bug_gh_43.phpt
-+++ b/tests/bug_gh_43.phpt
-@@ -7,16 +7,25 @@ Test for Github issue #43
- --FILE--
- <?php
-
-+error_reporting(0);
-+
- $context = new ZMQContext (1, false);
-
- $sock1 = new ZMQSocket ($context, ZMQ::SOCKET_PUB);
- $sock2 = new ZMQSocket ($context, ZMQ::SOCKET_SUB);
-
--$device = new ZMQDevice ($sock1, $sock1, $sock1, $sock1);
--
--echo "OK";
--?>
--
----EXPECTF--
--Warning: ZMQDevice::__construct() expects at most 3 parameters, 4 given in %s/bug_gh_43.php on line %d
--OK
-\ No newline at end of file
-+try {
-+ $device = new ZMQDevice ($sock1, $sock1, $sock1, $sock1);
-+ // on PHP7 and lower
-+ $lastError = error_get_last();
-+ if(strpos($lastError['message'], 'ZMQDevice::__construct() expects at most 3 parameters, 4 given') !== false)
-+ echo "OK\n";
-+ else{
-+ echo "FAIL\n";
-+ print_r($lastError);
-+ }
-+}catch(TypeError $e){
-+ echo "OK\n"; // on PHP8
-+}
-+--EXPECT--
-+OK
-diff --git a/zmq.c b/zmq.c
-index 57ebd11..db9c8f2 100644
---- a/zmq.c
-+++ b/zmq.c
-@@ -687,7 +687,6 @@ PHP_METHOD(zmqcontext, getsocket)
- if (!php_zmq_connect_callback(return_value, &fci, &fci_cache, persistent_id)) {
- php_zmq_socket_destroy(socket);
- interns->socket = NULL;
-- zval_dtor(return_value);
- return;
- }
- }
-diff --git a/zmq_device.c b/zmq_device.c
-index c7415c1..534f966 100644
---- a/zmq_device.c
-+++ b/zmq_device.c
-@@ -41,7 +41,7 @@
- ZEND_EXTERN_MODULE_GLOBALS(php_zmq)
-
- static
--zend_bool s_invoke_device_cb (php_zmq_device_cb_t *cb, uint64_t current_ts TSRMLS_DC)
-+zend_bool s_invoke_device_cb (php_zmq_device_cb_t *cb, uint64_t current_ts)
- {
- zend_bool retval = 0;
- zval params[1];
-@@ -59,7 +59,7 @@ zend_bool s_invoke_device_cb (php_zmq_device_cb_t *cb, uint64_t current_ts TSRML
- if (zend_call_function(&(cb->fci), &(cb->fci_cache)) == FAILURE) {
- if (!EG(exception)) {
- char *func_name = php_zmq_printable_func(&cb->fci, &cb->fci_cache);
-- zend_throw_exception_ex(php_zmq_device_exception_sc_entry_get (), 0 TSRMLS_CC, "Failed to invoke device callback %s()", func_name);
-+ zend_throw_exception_ex(php_zmq_device_exception_sc_entry_get (), 0, "Failed to invoke device callback %s()", func_name);
- zval_ptr_dtor(¶ms[0]);
- efree(func_name);
- }
-@@ -94,7 +94,7 @@ int s_capture_message (void *socket, zmq_msg_t *msg, int more)
- }
-
- static
--int s_calculate_timeout (php_zmq_device_object *intern TSRMLS_DC)
-+int s_calculate_timeout (php_zmq_device_object *intern)
- {
- int timeout = -1;
- uint64_t current = php_zmq_clock (ZMQ_G (clock_ctx));
-@@ -131,7 +131,7 @@ int s_calculate_timeout (php_zmq_device_object *intern TSRMLS_DC)
- }
-
-
--zend_bool php_zmq_device (php_zmq_device_object *intern TSRMLS_DC)
-+zend_bool php_zmq_device (php_zmq_device_object *intern)
- {
- int errno_;
- uint64_t last_message_received;
-@@ -186,7 +186,7 @@ zend_bool php_zmq_device (php_zmq_device_object *intern TSRMLS_DC)
- uint64_t current_ts = 0;
-
- /* Calculate poll_timeout based on idle / timer cb */
-- int timeout = s_calculate_timeout (intern TSRMLS_CC);
-+ int timeout = s_calculate_timeout (intern);
-
- rc = zmq_poll(&items [0], 2, timeout);
- if (rc < 0) {
-@@ -205,7 +205,7 @@ zend_bool php_zmq_device (php_zmq_device_object *intern TSRMLS_DC)
- if (intern->timer_cb.initialized && intern->timer_cb.timeout > 0) {
- /* Is it timer to call the timer ? */
- if (intern->timer_cb.scheduled_at <= current_ts) {
-- if (!s_invoke_device_cb (&intern->timer_cb, current_ts TSRMLS_CC)) {
-+ if (!s_invoke_device_cb (&intern->timer_cb, current_ts)) {
- zmq_msg_close (&msg);
- return 1;
- }
-@@ -217,7 +217,7 @@ zend_bool php_zmq_device (php_zmq_device_object *intern TSRMLS_DC)
- /* Is it timer to call the idle callback ? */
- if ((current_ts - last_message_received) >= intern->idle_cb.timeout &&
- intern->idle_cb.scheduled_at <= current_ts) {
-- if (!s_invoke_device_cb (&intern->idle_cb, current_ts TSRMLS_CC)) {
-+ if (!s_invoke_device_cb (&intern->idle_cb, current_ts)) {
- zmq_msg_close (&msg);
- return 1;
- }
-diff --git a/zmq_sockopt.c b/zmq_sockopt.c
-index 02cd76d..b0f18cd 100644
---- a/zmq_sockopt.c
-+++ b/zmq_sockopt.c
-@@ -1476,7 +1476,7 @@ PHP_METHOD(zmqsocket, setsockopt)
- zend_long key;
- zval *zv;
-
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz/", &key, &zv) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lz/", &key, &zv) == FAILURE) {
- return;
- }
-
diff --git a/testing/php7-pecl-zstd/APKBUILD b/testing/php7-pecl-zstd/APKBUILD
deleted file mode 100644
index 3bdab853860b..000000000000
--- a/testing/php7-pecl-zstd/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-pecl-zstd
-_extname=zstd
-pkgver=0.12.0
-pkgrel=0
-pkgdesc="PHP 7 Zstandard extension - PECL"
-url="https://pecl.php.net/package/zstd"
-arch="all"
-license="MIT"
-depends="php7-common"
-makedepends="php7-dev php7-pecl-apcu zstd-dev"
-checkdepends="php7-openssl"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
-builddir="$srcdir/$_extname-$pkgver"
-provides="php7-zstd=$pkgver-r$pkgrel" # for backward compatibility
-replaces="php7-zstd" # for backward compatibility
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7 --with-libzstd
- make
-}
-
-check() {
- local _modules=/usr/lib/php7/modules
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=$_modules/apcu.so \
- -d extension=$_modules/openssl.so \
- -d extension=modules/$_extname.so" TESTS=--show-diff
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-66460a6f56f1782cfef19b2f8507f3322316de352285d7e3dc24afcee73f6d4d8c6589fda3fe07d45b3572c5bfa08cf45298538aa7ad49560c98fab3fba9377d php-pecl-zstd-0.12.0.tgz
-"
diff --git a/testing/php7-snappy/APKBUILD b/testing/php7-snappy/APKBUILD
deleted file mode 100644
index a1924858dc4f..000000000000
--- a/testing/php7-snappy/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-snappy
-_extname=snappy
-pkgver=0.2.1
-pkgrel=0
-pkgdesc="Snappy Extension for PHP"
-url="https://github.com/kjdev/php-ext-snappy"
-arch="all"
-license="PHP-3.01"
-depends="php7-common"
-makedepends="php7-dev php7-pecl-apcu snappy-dev"
-source="php-$_extname-$pkgver.tar.gz::https://github.com/kjdev/php-ext-snappy/archive/$pkgver.tar.gz"
-builddir="$srcdir/php-ext-snappy-$pkgver"
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --with-php-config=php-config7 \
- --with-snappy-includedir
- make
-}
-
-check() {
- local _modules=/usr/lib/php7/modules
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test \
- SKIP_ONLINE_TESTS=1 PHP_TEST_SHARED_EXTENSIONS=" \
- -d extension=$_modules/apcu.so \
- -d extension=modules/$_extname.so" TESTS=--show-diff
- php7 -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir"/ install
- local confdir="$pkgdir"/etc/php7/conf.d
- install -d $confdir
- echo "extension=$_extname" > $confdir/50_$_extname.ini
-}
-
-sha512sums="51cdfe7c5d020cb954cbf555038aca8398867584a587eb838f07089612d3978a182d0bc04015608a2aaf71bf9a5b5896e5d92b56f3b2d5fe9e1116f9509acb1e php-snappy-0.2.1.tar.gz"
diff --git a/testing/php7-snuffleupagus/APKBUILD b/testing/php7-snuffleupagus/APKBUILD
deleted file mode 100644
index 8d2105e43181..000000000000
--- a/testing/php7-snuffleupagus/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Julien (jvoisin) Voisin <julien.voisin+snuffleupagus@dustri.org>
-
-pkgname=php7-snuffleupagus
-_extname=snuffleupagus
-pkgver=0.7.1
-pkgrel=0
-pkgdesc="Security module for PHP 7"
-url="https://snuffleupagus.readthedocs.io"
-arch="all"
-license="LGPL-3.0-only"
-depends="php7-common"
-builddir="$srcdir/$_extname-$pkgver/src"
-makedepends="php7-dev php7-cgi"
-source="php-$_extname-$pkgver.tar.gz::https://github.com/jvoisin/snuffleupagus/archive/v$pkgver.tar.gz"
-
-build() {
- phpize7
- ./configure \
- --prefix=/usr \
- --enable-snuffleupagus \
- --with-php-config=php-config7
- make
-}
-
-check() {
- TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test TESTS="tests/cookies_encryption tests/deny_writable"
- TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test TESTS="tests/global_strict"
- TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test TESTS="tests/harden_rand tests/sloppy_comparison tests/unserialize"
-
- # TODO re-enable these tests
- #TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test TESTS="tests/disable_function"
- #TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test TESTS="tests/xxe"
- #TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test TESTS="tests/eval_blacklist"
- #TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make test TESTS="tests/dump_request"
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- install -m644 ../config/$_extname.ini $_confdir/$pkgname.ini
- install -m644 ../config/default.rules $_confdir/$_extname.rules
-}
-
-sha512sums="21510e214f94dd50a4aa05226188c9433a6a261c0bd3d58973ed4536754b3e12356e3f625480c370b66c570482694c25d336a771fbbbeb27e1d524b1f82c7869 php-snuffleupagus-0.7.1.tar.gz"
diff --git a/testing/php7-spx/APKBUILD b/testing/php7-spx/APKBUILD
deleted file mode 100644
index 570914072f08..000000000000
--- a/testing/php7-spx/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-spx
-_extname=spx
-pkgver=0.4.13
-pkgrel=0
-pkgdesc="A simple & straight-to-the-point PHP 7 profiling extension with its built-in web UI"
-url="https://github.com/NoiseByNorthwest/php-spx"
-arch="x86_64 aarch64"
-license="GPL-3.0-or-later"
-depends="php7-common"
-makedepends="php7-dev zlib-dev"
-source="php-$_extname-$pkgver.tar.gz::https://github.com/NoiseByNorthwest/php-spx/archive/v$pkgver.tar.gz"
-builddir="$srcdir/php-$_extname-$pkgver"
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test TESTS=--show-diff
- php7 -d extension=modules/$_extname.so --ri $_extname
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="
-9b59da53109db008ca3c09e9d07d0a648a866f5b525c913182360854c3d5dad58b948d111c2eee57683dc83f5563a4934cff52e6b62d9bbf7c6e1de1bc1f922f php-spx-0.4.13.tar.gz
-"
diff --git a/testing/php7-tideways_xhprof/APKBUILD b/testing/php7-tideways_xhprof/APKBUILD
deleted file mode 100644
index 1fd661acecfe..000000000000
--- a/testing/php7-tideways_xhprof/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Andy Postnikov <apostnikov@gmail.com>
-# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php7-tideways_xhprof
-_extname=tideways_xhprof
-pkgver=5.0.4
-pkgrel=1
-pkgdesc="Modern XHProf compatible Profiler for PHP 7"
-url="https://tideways.com"
-arch="all !s390x" # fails to build https://github.com/tideways/php-xhprof-extension/issues/72
-license="Apache-2.0"
-depends="php7-common"
-makedepends="php7-dev"
-source="php-$_extname-$pkgver.tar.gz::https://github.com/tideways/php-xhprof-extension/archive/v$pkgver.tar.gz"
-builddir="$srcdir/php-xhprof-extension-$pkgver"
-
-build() {
- phpize7
- ./configure --prefix=/usr --with-php-config=/usr/bin/php-config7
- make
-}
-
-check() {
- make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
-}
-
-package() {
- make INSTALL_ROOT="$pkgdir" install
-
- local _confdir="$pkgdir"/etc/php7/conf.d
- install -d $_confdir
- echo "extension=$_extname" > $_confdir/$_extname.ini
-}
-
-sha512sums="bc7689060e33100ed43ed4ec0a251f6b4d9b7fcd3420e3c1208f400fc68d302a2fced90641016e55b8ee434e4d0de91703a2253c2515f16200fc0e330e4f60c2 php-tideways_xhprof-5.0.4.tar.gz"
diff --git a/testing/php7/APKBUILD b/testing/php7/APKBUILD
deleted file mode 100644
index a30185c1e467..000000000000
--- a/testing/php7/APKBUILD
+++ /dev/null
@@ -1,737 +0,0 @@
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Valery Kartel <valery.kartel@gmail.com>
-
-# Bundled libraries
-#
-# Name | License | Location | State
-# ----------+---------------------+------------------------+---------
-# bcmath | LGPL-2.1-or-later | ext/bcmath/libbcmath | used
-# date | MIT | ext/date/lib | used
-# fileinfo | BSD-2-Clause | ext/fileinfo/libmagic | used
-# gd | BSD | ext/gd/libgd | used
-# hash | CC0-1.0 | ext/hash/sha3 | used
-# libmbfl | LGPL-2.1-only | ext/mbstring/libmbfl | used
-# pcre | BSD-3-Clause | ext/pcre/pcrelib | not used
-# sqlite3 | Public | ext/sqlite3/libsqlite | not used
-# libXMLRPC | BSD-3-Clause | ext/xmlrpc/libxmlrpc | used
-# libzip | BSD-3-Clause | ext/zip/lib | not used
-
-# Static extensions
-#
-# Name | Reason
-# ----------+--------------------------------------------
-# zlib | https://bugs.alpinelinux.org/issues/8299
-
-pkgname=php7
-_pkgreal=php
-pkgver=7.4.33
-pkgrel=1
-_apiver=20190902
-_suffix=${pkgname#php}
-# Is this package the default (latest) PHP version?
-_default_php="no"
-pkgdesc="The PHP$_suffix language runtime engine"
-# priority of community/php81 is 100
-provider_priority=0
-url="https://www.php.net/"
-arch="all"
-license="PHP-3.01 BSD-3-Clause LGPL-2.0-or-later MIT Zend-2.0"
-depends="$pkgname-common"
-depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre2-dev re2c"
-# Most dependencies between extensions is auto-discovered (see _extension()).
-_depends_mysqlnd="$pkgname-openssl"
-_depends_pdo_mysql="$pkgname-pdo $pkgname-mysqlnd"
-_depends_phar="$pkgname"
-# openssl is actually transitive dependency here, but we need to because of
-# load index based on number of dependencies.
-_depends_mysqli="$pkgname-mysqlnd $pkgname-openssl"
-makedepends="
- $depends_dev
- apache2-dev
- argon2-dev
- aspell-dev
- bison
- bzip2-dev
- curl-dev
- enchant2-dev
- freetds-dev
- freetype-dev
- gdbm-dev
- gettext-dev
- gmp-dev
- icu-dev
- imap-dev
- krb5-dev
- libedit-dev
- libical-dev
- libjpeg-turbo-dev
- libpng-dev
- libpq-dev
- lmdb-dev
- oniguruma-dev
- libsodium-dev
- libwebp-dev
- libxml2-dev
- libxpm-dev
- libxslt-dev
- libzip-dev
- net-snmp-dev
- openldap-dev
- sqlite-dev
- tidyhtml-dev
- unixodbc-dev
- zlib-dev
- "
-checkdepends="icu-data-full"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc
- $pkgname-phpdbg $pkgname-apache2
- $pkgname-embed $pkgname-cgi $pkgname-fpm
- $pkgname-pear::noarch
- "
-source="https://php.net/distributions/$_pkgreal-$pkgver.tar.xz
- $pkgname-fpm.initd
- $pkgname-fpm.logrotate
- $pkgname-module.conf
- disabled-tests.list
- install-pear.patch
- includedir.patch
- sharedir.patch
- php7-fpm-version-suffix.patch
- fix-tests-devserver.patch
- enchant-2.patch
- xfail-openssl-1.1-test.patch
- atomic-lsapi.patch
- fix-curl-7.83-test.patch
- openssl3.patch
- fix-icu72.patch
- CVE-2023-0567-1.patch
- CVE-2023-0567-2.patch
- CVE-2023-0568.patch
- CVE-2023-0662-1.patch
- CVE-2023-0662-2.patch
- fix-fpm-tests.patch
- fix-fpm-syntax.patch
- "
-builddir="$srcdir/$_pkgreal-$pkgver"
-
-_libdir="/usr/lib/$pkgname"
-_extension_dir="$_libdir/modules"
-_extension_confd="/etc/$pkgname/conf.d"
-
-_extensions="
- bcmath
- bz2
- calendar
- ctype
- curl
- dba
- dom
- enchant
- exif
- ffi
- fileinfo
- ftp
- gd
- gettext
- gmp
- iconv
- imap
- intl
- json
- ldap
- mbstring
- mysqli
- mysqlnd
- odbc
- opcache
- openssl
- pcntl
- pdo
- pdo_dblib
- pdo_mysql
- pdo_odbc
- pdo_pgsql
- pdo_sqlite
- pgsql
- phar
- posix
- pspell
- session
- shmop
- simplexml
- snmp
- soap
- sodium
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tidy
- tokenizer
- xml
- xmlreader
- xmlrpc
- xmlwriter
- xsl
- zip
- "
-for _ext in $_extensions; do
- case "$_ext" in
- phar) subpackages="$subpackages $pkgname-$_ext:$_ext";;
- *) subpackages="$subpackages $pkgname-$_ext:_extension";;
- esac
-done
-subpackages="$subpackages $pkgname-common::noarch"
-
-subpackages="$subpackages $pkgname-litespeed"
-
-# secfixes:
-# 7.4.33-r1:
-# - CVE-2023-0567
-# - CVE-2023-0568
-# - CVE-2023-0662
-# 7.4.33-r0:
-# - CVE-2022-31630
-# - CVE-2022-37454
-# 7.4.32-r0:
-# - CVE-2022-31628
-# - CVE-2022-31629
-# 7.4.29-r3:
-# - CVE-2022-31625
-# - CVE-2022-31626
-# 7.4.28-r0:
-# - CVE-2021-21708
-# 7.4.26-r0:
-# - CVE-2021-21707
-# 7.4.25-r0:
-# - CVE-2021-21703
-# 7.4.24-r0:
-# - CVE-2021-21706
-# 7.4.21-r0:
-# - CVE-2021-21705
-# 7.4.15-r0:
-# - CVE-2021-21702
-# 7.4.14-r0:
-# - CVE-2020-7071
-# 7.4.11-r0:
-# - CVE-2020-7069
-# - CVE-2020-7070
-# 7.3.18-r0:
-# - CVE-2019-11048
-# 7.3.17-r0:
-# - CVE-2020-7067
-# 7.3.16-r0:
-# - CVE-2020-7064
-# - CVE-2020-7065
-# - CVE-2020-7066
-# 7.3.15-r0:
-# - CVE-2020-7061
-# - CVE-2020-7062
-# - CVE-2020-7063
-# 7.3.14-r0:
-# - CVE-2020-7059
-# - CVE-2020-7060
-# 7.3.13-r0:
-# - CVE-2019-11045
-# - CVE-2019-11047
-# - CVE-2019-11050
-# 7.3.11-r0:
-# - CVE-2019-11043
-# 7.3.9-r0:
-# - CVE-2019-13224
-# 7.3.8-r0:
-# - CVE-2019-11041
-# - CVE-2019-11042
-# 7.2.19-r0:
-# - CVE-2019-11039
-# - CVE-2019-11040
-# 7.2.18-r0:
-# - CVE-2019-11036
-# 7.2.17-r0:
-# - CVE-2019-11034
-# - CVE-2019-11035
-# 7.2.16-r0:
-# - CVE-2019-9641
-# - CVE-2019-9640
-# - CVE-2019-9639
-# - CVE-2019-9638
-# - CVE-2019-9637
-# 7.2.14-r0:
-# - CVE-2019-9024
-# - CVE-2019-9023
-# - CVE-2019-9022
-# - CVE-2019-9021
-# - CVE-2019-9020
-# 7.2.13-r0:
-# - CVE-2018-20783
-# 7.2.8-r0:
-# - CVE-2015-9253
-# - CVE-2018-12882
-# - CVE-2018-12883
-# - CVE-2018-14851
-# 7.2.5-r0:
-# - CVE-2018-5712
-# - CVE-2018-10546
-# - CVE-2018-10547
-# - CVE-2018-10548
-# - CVE-2018-10549
-
-prepare() {
- default_prepare
-
- local vapi=$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)
- if [ "$vapi" != "$_apiver" ]; then
- error "Upstream API version is now $vapi. Expecting $_apiver"
- error "After updating _apiver, all 3rd-party extensions must be rebuilt."
- return 1
- fi
-
- # https://bugs.php.net/63362 - Not needed but installed headers.
- # Drop some Windows specific headers to avoid installation,
- # before build to ensure they are really not needed.
- rm -f TSRM/tsrm_win32.h \
- TSRM/tsrm_config.w32.h \
- Zend/zend_config.w32.h \
- ext/mysqlnd/config-win.h \
- ext/standard/winver.h
-
- # Fix some bogus permissions.
- find . -name '*.[ch]' -exec chmod 644 {} \;
-
- # XXX: Delete failing tests.
- sed -n '/^[^#]/p' "$srcdir"/disabled-tests.list | while read -r item; do
- rm -r $item # do it in this way to apply globbing...
- done
-
- autoconf
-}
-
-# Notes:
-# * gd-jis-conv breaks any non-latin font rendering (vakartel).
-# * libxml cannot be build as shared.
-# * -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php andypost)
-# * -O2 optimize for apps usage (andypost)
-_build() {
- local common_flags="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
- export CFLAGS="${CFLAGS/-Os/-O2} $common_flags"
- export CXXFLAGS="${CXXFLAGS/-Os/-O2} $common_flags"
-
- local without_pcre_jit
- [ "$CARCH" = "s390x" ] && without_pcre_jit="--without-pcre-jit"
-
- EXTENSION_DIR=$_extension_dir ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --program-suffix=$_suffix \
- --libdir=$_libdir \
- --datadir=/usr/share/$pkgname \
- --sysconfdir=/etc/$pkgname \
- --localstatedir=/var \
- --with-layout=GNU \
- --with-pic \
- --with-config-file-path=/etc/$pkgname \
- --with-config-file-scan-dir=$_extension_confd \
- --disable-short-tags \
- \
- --enable-bcmath=shared \
- --with-bz2=shared \
- --enable-calendar=shared \
- --enable-ctype=shared \
- --with-curl=shared \
- --enable-dba=shared \
- --with-dbmaker=shared \
- --with-gdbm \
- --with-lmdb \
- --enable-dom=shared \
- --with-enchant=shared \
- --enable-exif=shared \
- --with-ffi=shared \
- --enable-fileinfo=shared \
- --enable-ftp=shared \
- --enable-gd=shared \
- --with-freetype \
- --with-jpeg \
- --with-webp \
- --with-xpm \
- --disable-gd-jis-conv \
- --with-gettext=shared \
- --with-gmp=shared \
- --with-iconv=shared \
- --with-imap=shared \
- --with-imap-ssl \
- --enable-intl=shared \
- --enable-json=shared \
- --with-ldap=shared \
- --with-ldap-sasl \
- --with-libedit \
- --with-libxml \
- --enable-mbstring=shared \
- --with-mysqli=shared,mysqlnd \
- --with-mysql-sock=/run/mysqld/mysqld.sock \
- --enable-mysqlnd=shared \
- --enable-opcache=shared \
- --with-openssl=shared \
- --with-kerberos \
- --with-system-ciphers \
- --with-password-argon2 \
- --enable-pcntl=shared \
- --with-external-pcre \
- $without_pcre_jit \
- --enable-pdo=shared \
- --with-pdo-dblib=shared \
- --with-pdo-mysql=shared,mysqlnd \
- --with-pdo-odbc=shared,unixODBC,/usr \
- --with-pdo-pgsql=shared \
- --with-pdo-sqlite=shared \
- --with-pgsql=shared \
- --enable-phar=shared \
- --enable-posix=shared \
- --with-pspell=shared \
- --without-readline \
- --enable-session=shared \
- --enable-shmop=shared \
- --enable-simplexml=shared \
- --with-snmp=shared \
- --enable-soap=shared \
- --with-sodium=shared \
- --enable-sockets=shared \
- --with-sqlite3=shared \
- --enable-sysvmsg=shared \
- --enable-sysvsem=shared \
- --enable-sysvshm=shared \
- --with-tidy=shared \
- --enable-tokenizer=shared \
- --with-unixODBC=shared,/usr \
- --enable-xml=shared \
- --enable-xmlreader=shared \
- --with-xmlrpc=shared \
- --enable-xmlwriter=shared \
- --with-xsl=shared \
- --with-zip=shared \
- --with-zlib \
- "$@"
- make
-}
-
-build() {
- # apache2 SAPIs because not fixed https://bugs.php.net/bug.php?id=52419
- _build --disable-phpdbg \
- --disable-cli \
- --with-apxs2
- mv libs/libphp$_suffix.so sapi/apache2handler/mod_php$_suffix.so
-
- local enable_litespeed
- [ -z ${subpackages##*-litespeed*} ] && enable_litespeed=--enable-litespeed
- # cgi, cli, fpm, embed, pear, litespeed
- _build --enable-phpdbg \
- --enable-phpdbg-webhelper \
- --with-pear=/usr/share/$pkgname \
- --enable-fpm \
- $enable_litespeed \
- --enable-embed
-}
-
-check() {
- # PHP is so stupid that it's not able to resolve dependencies
- # between extensions and load them in correct order, so we must
- # help it...
- # opcache is Zend extension, it's handled specially in Makefile
- local php_modules=$(_extensions_by_load_order \
- | grep -vx opcache \
- | xargs -n 1 printf "'$builddir/modules/%s.la' ")
- sed -i "/^PHP_TEST_SHARED_EXTENSIONS/,/extension=/ \
- s|in \$(PHP_MODULES)\"*|in $php_modules|" Makefile
-
- # XXX: Few tests fail on the named platforms.
- # Ignore it for now and continue build even on test failures.
- local allow_fail='no'
- case "$CARCH" in
- x86 | s390x) allow_fail='yes'
- esac
-
- TESTS="${TESTS:- --show-diff}" NO_INTERACTION=1 REPORT_EXIT_STATUS=1 \
- SKIP_SLOW_TESTS=1 SKIP_ONLINE_TESTS=1 TEST_TIMEOUT=10 \
- TZ='' LANG='' LC_ALL='' \
- TRAVIS=true SKIP_IO_CAPTURE_TESTS=1 \
- make test || [ "$allow_fail" = yes ]
-
- echo 'NOTE: We have skipped quite a lot tests, see disabled-tests.list.'
-}
-
-package() {
- make -j1 INSTALL_ROOT="$pkgdir" install
-
- install -Dm644 php.ini-production "$pkgdir"/etc/$pkgname/php.ini
-
- local file; for file in pear peardev pecl; do
- sed -i -e "s|/usr/bin/php|/usr/bin/php$_suffix|g" \
- -e "s|PHP=php|PHP=php$_suffix|" \
- "$pkgdir"/usr/bin/$file
- done
-
- find "$pkgdir" -name '.*' -print0 | xargs -0 rm -rf
- rmdir "$pkgdir"/var/run
-
- if [ "$_default_php" = yes ]; then
- ln -s php$_suffix "$pkgdir"/usr/bin/php
- fi
-}
-
-dev() {
- default_dev
- replaces="php-dev"
-
- cd "$pkgdir"
-
- _mv usr/bin/php-config$_suffix \
- usr/bin/phpize$_suffix \
- "$subpkgdir"/usr/bin/
-
- _mv ./$_libdir/build "$subpkgdir"/$_libdir/
-
- if [ "$_default_php" = yes ]; then
- ln -s phpize$_suffix "$subpkgdir"/usr/bin/phpize
- ln -s php-config$_suffix "$subpkgdir"/usr/bin/php-config
- fi
-}
-
-doc() {
- default_doc
-
- cd "$builddir"
-
- mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
- cp CODING_STANDARDS.md EXTENSIONS LICENSE NEWS \
- README* UPGRADING* \
- "$subpkgdir"/usr/share/doc/$pkgname/
-}
-
-apache2() {
- pkgdesc="PHP$_suffix Module for Apache2"
- depends="$depends apache2"
- provides="php-apache2"
-
- install -D -m 755 "$builddir"/sapi/apache2handler/mod_php$_suffix.so \
- "$subpkgdir"/usr/lib/apache2/mod_php$_suffix.so
-
- install -D -m 644 "$srcdir"/php$_suffix-module.conf \
- "$subpkgdir"/etc/apache2/conf.d/php$_suffix-module.conf
-}
-
-phpdbg() {
- pkgdesc="Interactive PHP$_suffix debugger"
- provides="php-phpdbg"
-
- amove usr/bin/phpdbg$_suffix
-
- if [ "$_default_php" = yes ]; then
- ln -s phpdbg$_suffix "$subpkgdir"/usr/bin/phpdbg
- fi
-}
-
-embed() {
- pkgdesc="PHP$_suffix Embedded Library"
- provides="php-embed"
-
- _mv "$pkgdir"/usr/lib/libphp*.so "$subpkgdir"/usr/lib/
-}
-
-litespeed() {
- pkgdesc="PHP$_suffix LiteSpeed SAPI"
- provides="php-lightspeed"
-
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/lsphp$_suffix "$subpkgdir"/usr/bin
-
- if [ "$_default_php" = yes ]; then
- ln -s lsphp$_suffix "$subpkgdir"/usr/bin/lsphp
- fi
-}
-
-cgi() {
- pkgdesc="PHP$_suffix Common Gateway Interface"
- provides="php-cgi"
-
- _mv "$pkgdir"/usr/bin/php-cgi$_suffix "$subpkgdir"/usr/bin/
-
- if [ "$_default_php" = yes ]; then
- ln -s php-cgi$_suffix "$subpkgdir"/usr/bin/php-cgi
- fi
-}
-
-fpm() {
- pkgdesc="PHP$_suffix FastCGI Process Manager"
- provides="php-fpm"
-
- cd "$pkgdir"
-
- _mv var "$subpkgdir"/
- _mv usr/share/$pkgname/fpm "$subpkgdir"/var/lib/$pkgname/
- _mv usr/sbin "$subpkgdir"/usr/
- _mv etc/$pkgname/php-fpm* "$subpkgdir"/etc/$pkgname/
-
- local file; for file in php-fpm.conf php-fpm.d/www.conf; do
- mv "$subpkgdir"/etc/$pkgname/$file.default \
- "$subpkgdir"/etc/$pkgname/$file
- done
-
- install -D -m 755 "$srcdir"/$pkgname-fpm.initd \
- "$subpkgdir"/etc/init.d/php-fpm$_suffix
-
- install -D -m 644 "$srcdir"/$pkgname-fpm.logrotate \
- "$subpkgdir"/etc/logrotate.d/php-fpm$_suffix
-
- mkdir -p "$subpkgdir"/var/log/$pkgname
-}
-
-pear() {
- pkgdesc="PHP$_suffix Extension and Application Repository"
- depends="$pkgname $pkgname-xml"
- provides="php-pear"
-
- cd "$pkgdir"
-
- mkdir -p "$subpkgdir"/usr/bin
- local file; for file in pecl pear peardev; do
- mv usr/bin/$file "$subpkgdir"/usr/bin/$file$_suffix
- if [ "$_default_php" = yes ]; then
- ln -s $file$_suffix "$subpkgdir"/usr/bin/$file
- fi
- done
-
- _mv etc/$pkgname/pear.conf "$subpkgdir"/etc/$pkgname/
- _mv usr/share "$subpkgdir"/usr/
-}
-
-common() {
- pkgdesc="$pkgdesc (common config)"
- provides="php-common $pkgname-zlib php-zlib" # for backward compatibility
- depends=""
-
- cd "$pkgdir"
-
- _mv usr/lib "$subpkgdir"/usr/
- _mv etc "$subpkgdir"/
- mkdir -p "$subpkgdir"/$_extension_confd
-}
-
-phar() {
- _extension
-
- cd "$pkgdir"
-
- mkdir -p "$subpkgdir"/usr/bin
- rm usr/bin/phar$_suffix
- mv usr/bin/phar$_suffix.phar "$subpkgdir"/usr/bin/phar$_suffix.phar
- ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar$_suffix
- ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar.phar$_suffix
-
- if [ "$_default_php" = yes ]; then
- ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar.phar
- ln -s phar$_suffix.phar "$subpkgdir"/usr/bin/phar
- fi
-}
-
-_extension() {
- local extname="${subpkgname#$pkgname-}"
- local extdepends="$(eval "echo \$_depends_$extname")"
- local extdesc="$(head -n1 "$builddir"/ext/$extname/CREDITS 2>/dev/null ||:)"
- pkgdesc="PHP$_suffix extension: ${extdesc:-$extname}"
- provides="php-$extname"
-
- : ${extdepends:=$(_resolve_extension_deps "$extname")}
- depends="$depends $extdepends"
-
- local load_order=$(_extension_load_order "$extname")
-
- # extension prefix
- local prefix=
- [ "$extname" != "opcache" ] || prefix="zend_"
-
- _mv "$pkgdir"/$_extension_dir/$extname.so \
- "$subpkgdir"/$_extension_dir/
-
- mkdir -p "$subpkgdir"/$_extension_confd
- echo "${prefix}extension=$extname.so" \
- > "$subpkgdir"/$_extension_confd/"$(printf %02d $load_order)"_$extname.ini
-}
-
-# Resolves dependencies of the given extension name (without $pkgname- prefix)
-# on other extensions in $_extensions and prints them with $pkgname- prefix.
-_resolve_extension_deps() {
- local name="$1"
-
- # We use config.w32 just because it's more accurate than config.m4.
- local config="$builddir/ext/$name/config.w32"
- [ -f "$config" ] || return 0
-
- cat "$config" \
- | sed -En "s/.*ADD_EXTENSION_DEP\('$name', ([^)]+)\).*/\1/p" \
- | tr -d "'," | tr ' ' '\n' \
- | sort -u \
- | while read -r dep; do
- if echo "$_extensions" | grep -qw "$dep"; then
- echo "$pkgname-$dep"
- fi
- done
-}
-
-# Prints a load order (0-based integer) for the given extension name. Extension
-# with lower load order should be loaded before exts with higher load order.
-# It's based on number of dependencies of the extension (with exception for
-# "imap"), which is flawed, but simple and good enough for now.
-_extension_load_order() {
- local name="$1"
- local deps=$(eval "echo \$_depends_$name")
-
- case "$name" in
- # XXX: This must be loaded after recode, even though it does
- # not depend on it. So we must use this hack...
- *) echo "${deps:=$(_resolve_extension_deps $name)}" | wc -w;;
- esac
-}
-
-# Prints $_extensions sorted by load order and name.
-_extensions_by_load_order() {
- local deps list name
-
- for name in $_extensions; do
- list="$list $(_extension_load_order $name);$name"
- done
- printf '%s\n' $list | sort -t ';' -k 1 | sed -E 's/\d+;//'
-}
-
-_mv() {
- local dest; for dest; do true; done # get last argument
- mkdir -p "$dest"
- mv "$@"
-}
-
-sha512sums="
-499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d php-7.4.33.tar.xz
-1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f php7-fpm.initd
-cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate
-274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198 php7-module.conf
-830ec2d0ab920604072eb3751e36783dfc2abf72caa70a7a7a1dd4de739a38003f1747524c28b8d0b0dc08825823b1d26587e58093c4088b19f0746808b2604c disabled-tests.list
-a4130d29c7fee2b8cb561b116baf603bdc3a7b5b4985ec3c9918f253d1851197539dfad72c6b36d9f7008f85982904731184c79e4cee4415c1a1b88016639225 install-pear.patch
-ebf571c5e595221b9944d7e840807ebb68c1be38bf117186e19a3bd1070310ece5918bcaa5f941679f3371a2108ad57bf179c3f90e612a5a2b982db941172859 includedir.patch
-965b52893affb666af64e00d09e0208dcd41b17ce2864cf05616c6d05a05c0121694c0b209d403b8c0c55d18e6f1528c4aba1a4fcdce7b282a13304d12cd0f9d sharedir.patch
-16399fbf6a966f9beffe00f659f9551ef8e52285bca116da5bd5b15ec99a2b0bd5fa03be0faa6c893802aa44c100d634083343a9ac0cd2467812865df66dd572 php7-fpm-version-suffix.patch
-3bfeea79f9acfaa7be5bab85cd3d02713abb569e54024a22bb2c747c06d97f83ac2c63dcd75c7c409426ac03f8bc2ccc01bcd66bc39a767930d32542349123f9 fix-tests-devserver.patch
-7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch
-996b9a542858b0385a300265194afc57eddb72b9d7e4dcdf63b4f1ba7d3588e67309030acc73f00af1717168becd50b1d3582fcb88605e9892fd683a33cae023 xfail-openssl-1.1-test.patch
-465b38c089d938a4a072b2eff3edaf928455bf873f5eeb65ff3bee9614f5f45c70f285abb50809c2e2d9d259395acae38bd649860ca3b8d65e43447082a51552 atomic-lsapi.patch
-be6a57063414bd255def54d5f6e42cbdc3baec55c8eaf9c8ca6e96d0cb3fec942ebb1868806850859d34c5c45d03a2abfec3fecd1aef04524da8eda01d9041ed fix-curl-7.83-test.patch
-6520df6c5339d29aded942c89b0d0424a521d6b4248526b0f63f54194be05992e49b46688615d032c28ce57f484b6defc085da33239d460f67f88dc10c7a4fba openssl3.patch
-0ec10fa60a8aac63791ee8315641d6063230c15dd44d6b48416736e414886e33350535c7eb61b4d256cef22e32f7a02eaba07e314e592cdb19c55dbfa097dbaf fix-icu72.patch
-8dd578f264edaf372a6e787d65e2f8d45ea1af88036cc0d62251b6796aef327b8bd0a4df90eecdbd9e8a8c0e7501f90813a3af745e262151b7f7fe995c7a8c1b CVE-2023-0567-1.patch
-35c9c4bdc8b4091d68ad65732c016dd33a0e3e92b3669dfbda7a107ca7c22d72955fecd73add0338873faf8344721838d72c0aa637fefdb6cdae7a1d310d570b CVE-2023-0567-2.patch
-5fe3a0e9e1cf2e069d3b97c74a12d6f1c05faf694be7527a40a358afc1ee2dd6004f6ce0027c483eda7f6e835dc384258760b098c03d2af04950b58ac0e83cc8 CVE-2023-0568.patch
-f7e87369658e333247896cb3cc6d56a54e2041453c0dc78180d7d31ac5008f98837039c215beda24e12b78ac183d70b7488e3d2978b159e565fc6517ed023cb1 CVE-2023-0662-1.patch
-22c8f8b31b76832a0ccd45e0df808ba07e2cab67c7e6ca94d5cc124ad185fd0494a11ed1573b4ac03094c21979de40ecb4ee76cf8e63cd27f716aff189e9b28d CVE-2023-0662-2.patch
-81fe1bc37129c8902c572d63f9c4c266cabf61c1217d8b079b020dd60ad49e725426dc201b4c0d044d8a6793b15a2a58eac6595ceb1f8a91aa9b2ea9728adfd6 fix-fpm-tests.patch
-5582cbf13dcc9c536c6a9881183fedd40d35497c527e20e9e8e3288ce6219d9218dd16d9f43cc4412fd471b84df786076141f8409f950578b50d1540244f29f2 fix-fpm-syntax.patch
-"
diff --git a/testing/php7/CVE-2023-0567-1.patch b/testing/php7/CVE-2023-0567-1.patch
deleted file mode 100644
index 28638407af91..000000000000
--- a/testing/php7/CVE-2023-0567-1.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Patch-Source: https://github.com/php/php-src/commit/c840f71524067aa474c00c3eacfb83bd860bfc8a
-
-From c840f71524067aa474c00c3eacfb83bd860bfc8a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@bastelstu.be>
-Date: Mon, 23 Jan 2023 21:15:24 +0100
-Subject: [PATCH] crypt: Fix validation of malformed BCrypt hashes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-PHP’s implementation of crypt_blowfish differs from the upstream Openwall
-version by adding a “PHP Hackâ€, which allows one to cut short the BCrypt salt
-by including a `$` character within the characters that represent the salt.
-
-Hashes that are affected by the “PHP Hack†may erroneously validate any
-password as valid when used with `password_verify` and when comparing the
-return value of `crypt()` against the input.
-
-The PHP Hack exists since the first version of PHP’s own crypt_blowfish
-implementation that was added in 1e820eca02dcf322b41fd2fe4ed2a6b8309f8ab5.
-
-No clear reason is given for the PHP Hack’s existence. This commit removes it,
-because BCrypt hashes containing a `$` character in their salt are not valid
-BCrypt hashes.
----
- ext/standard/crypt_blowfish.c | 8 --
- .../tests/crypt/bcrypt_salt_dollar.phpt | 82 +++++++++++++++++++
- 2 files changed, 82 insertions(+), 8 deletions(-)
- create mode 100644 ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
-
-diff --git a/ext/standard/crypt_blowfish.c b/ext/standard/crypt_blowfish.c
-index 3806a290aee4..351d40308089 100644
---- a/ext/standard/crypt_blowfish.c
-+++ b/ext/standard/crypt_blowfish.c
-@@ -371,7 +371,6 @@ static const unsigned char BF_atoi64[0x60] = {
- #define BF_safe_atoi64(dst, src) \
- { \
- tmp = (unsigned char)(src); \
-- if (tmp == '$') break; /* PHP hack */ \
- if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
- tmp = BF_atoi64[tmp]; \
- if (tmp > 63) return -1; \
-@@ -399,13 +398,6 @@ static int BF_decode(BF_word *dst, const char *src, int size)
- *dptr++ = ((c3 & 0x03) << 6) | c4;
- } while (dptr < end);
-
-- if (end - dptr == size) {
-- return -1;
-- }
--
-- while (dptr < end) /* PHP hack */
-- *dptr++ = 0;
--
- return 0;
- }
-
-diff --git a/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
-new file mode 100644
-index 000000000000..32e335f4b087
---- /dev/null
-+++ b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
-@@ -0,0 +1,82 @@
-+--TEST--
-+bcrypt correctly rejects salts containing $
-+--FILE--
-+<?php
-+for ($i = 0; $i < 23; $i++) {
-+ $salt = '$2y$04$' . str_repeat('0', $i) . '$';
-+ $result = crypt("foo", $salt);
-+ var_dump($salt);
-+ var_dump($result);
-+ var_dump($result === $salt);
-+}
-+?>
-+--EXPECT--
-+string(8) "$2y$04$$"
-+string(1) "*"
-+bool(false)
-+string(9) "$2y$04$0$"
-+string(1) "*"
-+bool(false)
-+string(10) "$2y$04$00$"
-+string(1) "*"
-+bool(false)
-+string(11) "$2y$04$000$"
-+string(1) "*"
-+bool(false)
-+string(12) "$2y$04$0000$"
-+string(1) "*"
-+bool(false)
-+string(13) "$2y$04$00000$"
-+string(1) "*"
-+bool(false)
-+string(14) "$2y$04$000000$"
-+string(1) "*"
-+bool(false)
-+string(15) "$2y$04$0000000$"
-+string(1) "*"
-+bool(false)
-+string(16) "$2y$04$00000000$"
-+string(1) "*"
-+bool(false)
-+string(17) "$2y$04$000000000$"
-+string(1) "*"
-+bool(false)
-+string(18) "$2y$04$0000000000$"
-+string(1) "*"
-+bool(false)
-+string(19) "$2y$04$00000000000$"
-+string(1) "*"
-+bool(false)
-+string(20) "$2y$04$000000000000$"
-+string(1) "*"
-+bool(false)
-+string(21) "$2y$04$0000000000000$"
-+string(1) "*"
-+bool(false)
-+string(22) "$2y$04$00000000000000$"
-+string(1) "*"
-+bool(false)
-+string(23) "$2y$04$000000000000000$"
-+string(1) "*"
-+bool(false)
-+string(24) "$2y$04$0000000000000000$"
-+string(1) "*"
-+bool(false)
-+string(25) "$2y$04$00000000000000000$"
-+string(1) "*"
-+bool(false)
-+string(26) "$2y$04$000000000000000000$"
-+string(1) "*"
-+bool(false)
-+string(27) "$2y$04$0000000000000000000$"
-+string(1) "*"
-+bool(false)
-+string(28) "$2y$04$00000000000000000000$"
-+string(1) "*"
-+bool(false)
-+string(29) "$2y$04$000000000000000000000$"
-+string(1) "*"
-+bool(false)
-+string(30) "$2y$04$0000000000000000000000$"
-+string(60) "$2y$04$000000000000000000000u2a2UpVexIt9k3FMJeAVr3c04F5tcI8K"
-+bool(false)
diff --git a/testing/php7/CVE-2023-0567-2.patch b/testing/php7/CVE-2023-0567-2.patch
deleted file mode 100644
index 9141a9a8a0d2..000000000000
--- a/testing/php7/CVE-2023-0567-2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch-Source: https://github.com/php/php-src/commit/a92acbad873a05470af1a47cb785a18eadd827b5
-
-From a92acbad873a05470af1a47cb785a18eadd827b5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@bastelstu.be>
-Date: Mon, 23 Jan 2023 22:13:57 +0100
-Subject: [PATCH] crypt: Fix possible buffer overread in php_crypt()
-
----
- ext/standard/crypt.c | 1 +
- ext/standard/tests/password/password_bcrypt_short.phpt | 8 ++++++++
- 2 files changed, 9 insertions(+)
- create mode 100644 ext/standard/tests/password/password_bcrypt_short.phpt
-
-diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
-index 8c105cf910e8..8316c8b96063 100644
---- a/ext/standard/crypt.c
-+++ b/ext/standard/crypt.c
-@@ -135,6 +135,7 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch
- } else if (
- salt[0] == '$' &&
- salt[1] == '2' &&
-+ salt[2] != 0 &&
- salt[3] == '$') {
- char output[PHP_MAX_SALT_LEN + 1];
-
-diff --git a/ext/standard/tests/password/password_bcrypt_short.phpt b/ext/standard/tests/password/password_bcrypt_short.phpt
-new file mode 100644
-index 000000000000..085bc8a23904
---- /dev/null
-+++ b/ext/standard/tests/password/password_bcrypt_short.phpt
-@@ -0,0 +1,8 @@
-+--TEST--
-+Test that password_hash() does not overread buffers when a short hash is passed
-+--FILE--
-+<?php
-+var_dump(password_verify("foo", '$2'));
-+?>
-+--EXPECT--
-+bool(false)
diff --git a/testing/php7/CVE-2023-0568.patch b/testing/php7/CVE-2023-0568.patch
deleted file mode 100644
index 510fb6d4a777..000000000000
--- a/testing/php7/CVE-2023-0568.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Patch-Source: https://github.com/php/php-src/commit/ec10b28d64decbc54aa1e585dce580f0bd7a5953
-
-From ec10b28d64decbc54aa1e585dce580f0bd7a5953 Mon Sep 17 00:00:00 2001
-From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
-Date: Fri, 27 Jan 2023 19:28:27 +0100
-Subject: [PATCH] Fix array overrun when appending slash to paths
-
-Fix it by extending the array sizes by one character. As the input is
-limited to the maximum path length, there will always be place to append
-the slash. As the php_check_specific_open_basedir() simply uses the
-strings to compare against each other, no new failures related to too
-long paths are introduced.
-We'll let the DOM and XML case handle a potentially too long path in the
-library code.
----
- ext/dom/document.c | 2 +-
- ext/xmlreader/php_xmlreader.c | 2 +-
- main/fopen_wrappers.c | 6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ext/dom/document.c b/ext/dom/document.c
-index dbbabb8bffde..fa6a6377ad5c 100644
---- a/ext/dom/document.c
-+++ b/ext/dom/document.c
-@@ -1174,7 +1174,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
- int validate, recover, resolve_externals, keep_blanks, substitute_ent;
- int resolved_path_len;
- int old_error_reporting = 0;
-- char *directory=NULL, resolved_path[MAXPATHLEN];
-+ char *directory=NULL, resolved_path[MAXPATHLEN + 1];
-
- if (id != NULL) {
- intern = Z_DOMOBJ_P(id);
-diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
-index ecc52aa1d6f4..d8f8105010c7 100644
---- a/ext/xmlreader/php_xmlreader.c
-+++ b/ext/xmlreader/php_xmlreader.c
-@@ -1024,7 +1024,7 @@ PHP_METHOD(XMLReader, XML)
- xmlreader_object *intern = NULL;
- char *source, *uri = NULL, *encoding = NULL;
- int resolved_path_len, ret = 0;
-- char *directory=NULL, resolved_path[MAXPATHLEN];
-+ char *directory=NULL, resolved_path[MAXPATHLEN + 1];
- xmlParserInputBufferPtr inputbfr;
- xmlTextReaderPtr reader;
-
-diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
-index 39a9c82d5984..5e4a619c8fe7 100644
---- a/main/fopen_wrappers.c
-+++ b/main/fopen_wrappers.c
-@@ -129,10 +129,10 @@ PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
- */
- PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path)
- {
-- char resolved_name[MAXPATHLEN];
-- char resolved_basedir[MAXPATHLEN];
-+ char resolved_name[MAXPATHLEN + 1];
-+ char resolved_basedir[MAXPATHLEN + 1];
- char local_open_basedir[MAXPATHLEN];
-- char path_tmp[MAXPATHLEN];
-+ char path_tmp[MAXPATHLEN + 1];
- char *path_file;
- size_t resolved_basedir_len;
- size_t resolved_name_len;
diff --git a/testing/php7/CVE-2023-0662-1.patch b/testing/php7/CVE-2023-0662-1.patch
deleted file mode 100644
index df7cf2608930..000000000000
--- a/testing/php7/CVE-2023-0662-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch-Source: https://github.com/php/php-src/commit/e45850c195dcd5534394cf357a3f776d4916b655
-
-From e45850c195dcd5534394cf357a3f776d4916b655 Mon Sep 17 00:00:00 2001
-From: Jakub Zelenka <bukka@php.net>
-Date: Thu, 19 Jan 2023 14:11:18 +0000
-Subject: [PATCH] Fix repeated warning for file uploads limit exceeding
-
----
- main/rfc1867.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/main/rfc1867.c b/main/rfc1867.c
-index c2f606c64aa1..b43cfae5a1e2 100644
---- a/main/rfc1867.c
-+++ b/main/rfc1867.c
-@@ -911,7 +911,10 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
- skip_upload = 1;
- } else if (upload_cnt <= 0) {
- skip_upload = 1;
-- sapi_module.sapi_error(E_WARNING, "Maximum number of allowable file uploads has been exceeded");
-+ if (upload_cnt == 0) {
-+ --upload_cnt;
-+ sapi_module.sapi_error(E_WARNING, "Maximum number of allowable file uploads has been exceeded");
-+ }
- }
-
- /* Return with an error if the posted data is garbled */
diff --git a/testing/php7/CVE-2023-0662-2.patch b/testing/php7/CVE-2023-0662-2.patch
deleted file mode 100644
index 360f86ded717..000000000000
--- a/testing/php7/CVE-2023-0662-2.patch
+++ /dev/null
@@ -1,413 +0,0 @@
-Patch-Source: https://github.com/php/php-src/commit/716de0cff539f46294ef70fe75d548cd66766370
-
-From 716de0cff539f46294ef70fe75d548cd66766370 Mon Sep 17 00:00:00 2001
-From: Jakub Zelenka <bukka@php.net>
-Date: Thu, 19 Jan 2023 14:31:25 +0000
-Subject: [PATCH] Introduce max_multipart_body_parts INI
-
-This fixes GHSA-54hq-v5wp-fqgv DOS vulnerabality by limitting number of
-parsed multipart body parts as currently all parts were always parsed.
----
- main/main.c | 1 +
- main/rfc1867.c | 11 ++
- ...-54hq-v5wp-fqgv-max-body-parts-custom.phpt | 53 +++++++++
- ...54hq-v5wp-fqgv-max-body-parts-default.phpt | 54 +++++++++
- .../ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt | 52 +++++++++
- sapi/fpm/tests/tester.inc | 106 +++++++++++++++---
- 6 files changed, 262 insertions(+), 15 deletions(-)
- create mode 100644 sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
- create mode 100644 sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
- create mode 100644 sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-
-diff --git a/main/main.c b/main/main.c
-index 40684f32dc14..c58ea58bf5ac 100644
---- a/main/main.c
-+++ b/main/main.c
-@@ -751,6 +751,7 @@ PHP_INI_BEGIN()
- PHP_INI_ENTRY("disable_functions", "", PHP_INI_SYSTEM, NULL)
- PHP_INI_ENTRY("disable_classes", "", PHP_INI_SYSTEM, NULL)
- PHP_INI_ENTRY("max_file_uploads", "20", PHP_INI_SYSTEM|PHP_INI_PERDIR, NULL)
-+ PHP_INI_ENTRY("max_multipart_body_parts", "-1", PHP_INI_SYSTEM|PHP_INI_PERDIR, NULL)
-
- STD_PHP_INI_BOOLEAN("allow_url_fopen", "1", PHP_INI_SYSTEM, OnUpdateBool, allow_url_fopen, php_core_globals, core_globals)
- STD_PHP_INI_BOOLEAN("allow_url_include", "0", PHP_INI_SYSTEM, OnUpdateBool, allow_url_include, php_core_globals, core_globals)
-diff --git a/main/rfc1867.c b/main/rfc1867.c
-index b43cfae5a1e2..3086e8da3dbe 100644
---- a/main/rfc1867.c
-+++ b/main/rfc1867.c
-@@ -687,6 +687,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
- void *event_extra_data = NULL;
- unsigned int llen = 0;
- int upload_cnt = INI_INT("max_file_uploads");
-+ int body_parts_cnt = INI_INT("max_multipart_body_parts");
- const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding();
- php_rfc1867_getword_t getword;
- php_rfc1867_getword_conf_t getword_conf;
-@@ -708,6 +709,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
- return;
- }
-
-+ if (body_parts_cnt < 0) {
-+ body_parts_cnt = PG(max_input_vars) + upload_cnt;
-+ }
-+ int body_parts_limit = body_parts_cnt;
-+
- /* Get the boundary */
- boundary = strstr(content_type_dup, "boundary");
- if (!boundary) {
-@@ -792,6 +798,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
- char *pair = NULL;
- int end = 0;
-
-+ if (--body_parts_cnt < 0) {
-+ php_error_docref(NULL, E_WARNING, "Multipart body parts limit exceeded %d. To increase the limit change max_multipart_body_parts in php.ini.", body_parts_limit);
-+ goto fileupload_done;
-+ }
-+
- while (isspace(*cd)) {
- ++cd;
- }
-diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
-new file mode 100644
-index 000000000000..d2239ac3c410
---- /dev/null
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
-@@ -0,0 +1,53 @@
-+--TEST--
-+FPM: GHSA-54hq-v5wp-fqgv - max_multipart_body_parts ini custom value
-+--SKIPIF--
-+<?php include "skipif.inc"; ?>
-+--FILE--
-+<?php
-+
-+require_once "tester.inc";
-+
-+$cfg = <<<EOT
-+[global]
-+error_log = {{FILE:LOG}}
-+[unconfined]
-+listen = {{ADDR}}
-+pm = dynamic
-+pm.max_children = 5
-+pm.start_servers = 1
-+pm.min_spare_servers = 1
-+pm.max_spare_servers = 3
-+php_admin_value[html_errors] = false
-+php_admin_value[max_input_vars] = 20
-+php_admin_value[max_file_uploads] = 5
-+php_admin_value[max_multipart_body_parts] = 10
-+php_flag[display_errors] = On
-+EOT;
-+
-+$code = <<<EOT
-+<?php
-+var_dump(count(\$_POST));
-+EOT;
-+
-+$tester = new FPM\Tester($cfg, $code);
-+$tester->start();
-+$tester->expectLogStartNotices();
-+echo $tester
-+ ->request(stdin: [
-+ 'parts' => [
-+ 'count' => 30,
-+ ]
-+ ])
-+ ->getBody();
-+$tester->terminate();
-+$tester->close();
-+
-+?>
-+--EXPECT--
-+Warning: Unknown: Multipart body parts limit exceeded 10. To increase the limit change max_multipart_body_parts in php.ini. in Unknown on line 0
-+int(10)
-+--CLEAN--
-+<?php
-+require_once "tester.inc";
-+FPM\Tester::clean();
-+?>
-diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
-new file mode 100644
-index 000000000000..42b5afbf9ee7
---- /dev/null
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
-@@ -0,0 +1,54 @@
-+--TEST--
-+FPM: GHSA-54hq-v5wp-fqgv - max_multipart_body_parts ini default
-+--SKIPIF--
-+<?php include "skipif.inc"; ?>
-+--FILE--
-+<?php
-+
-+require_once "tester.inc";
-+
-+$cfg = <<<EOT
-+[global]
-+error_log = {{FILE:LOG}}
-+[unconfined]
-+listen = {{ADDR}}
-+pm = dynamic
-+pm.max_children = 5
-+pm.start_servers = 1
-+pm.min_spare_servers = 1
-+pm.max_spare_servers = 3
-+php_admin_value[html_errors] = false
-+php_admin_value[max_input_vars] = 20
-+php_admin_value[max_file_uploads] = 5
-+php_flag[display_errors] = On
-+EOT;
-+
-+$code = <<<EOT
-+<?php
-+var_dump(count(\$_POST));
-+EOT;
-+
-+$tester = new FPM\Tester($cfg, $code);
-+$tester->start();
-+$tester->expectLogStartNotices();
-+echo $tester
-+ ->request(stdin: [
-+ 'parts' => [
-+ 'count' => 30,
-+ ]
-+ ])
-+ ->getBody();
-+$tester->terminate();
-+$tester->close();
-+
-+?>
-+--EXPECT--
-+Warning: Unknown: Input variables exceeded 20. To increase the limit change max_input_vars in php.ini. in Unknown on line 0
-+
-+Warning: Unknown: Multipart body parts limit exceeded 25. To increase the limit change max_multipart_body_parts in php.ini. in Unknown on line 0
-+int(20)
-+--CLEAN--
-+<?php
-+require_once "tester.inc";
-+FPM\Tester::clean();
-+?>
-diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-new file mode 100644
-index 000000000000..da81174c7280
---- /dev/null
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-@@ -0,0 +1,52 @@
-+--TEST--
-+FPM: GHSA-54hq-v5wp-fqgv - exceeding max_file_uploads
-+--SKIPIF--
-+<?php include "skipif.inc"; ?>
-+--FILE--
-+<?php
-+
-+require_once "tester.inc";
-+
-+$cfg = <<<EOT
-+[global]
-+error_log = {{FILE:LOG}}
-+[unconfined]
-+listen = {{ADDR}}
-+pm = dynamic
-+pm.max_children = 5
-+pm.start_servers = 1
-+pm.min_spare_servers = 1
-+pm.max_spare_servers = 3
-+php_admin_value[html_errors] = false
-+php_admin_value[max_file_uploads] = 5
-+php_flag[display_errors] = On
-+EOT;
-+
-+$code = <<<EOT
-+<?php
-+var_dump(count(\$_FILES));
-+EOT;
-+
-+$tester = new FPM\Tester($cfg, $code);
-+$tester->start();
-+$tester->expectLogStartNotices();
-+echo $tester
-+ ->request(stdin: [
-+ 'parts' => [
-+ 'count' => 10,
-+ 'param' => 'filename'
-+ ]
-+ ])
-+ ->getBody();
-+$tester->terminate();
-+$tester->close();
-+
-+?>
-+--EXPECT--
-+Warning: Maximum number of allowable file uploads has been exceeded in Unknown on line 0
-+int(5)
-+--CLEAN--
-+<?php
-+require_once "tester.inc";
-+FPM\Tester::clean();
-+?>
-diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
-index 6197cdba53f5..e51aa0f69143 100644
---- a/sapi/fpm/tests/tester.inc
-+++ b/sapi/fpm/tests/tester.inc
-@@ -527,16 +527,16 @@
- * @param string $query
- * @param array $headers
- * @param string|null $uri
-- * @param string|null $address
-- * @param string|null $successMessage
-- * @param string|null $errorMessage
-- * @param bool $connKeepAlive
-+ * @param string|null $scriptFilename
-+ * @param string|null $stdin
- * @return array
- */
- private function getRequestParams(
- string $query = '',
- array $headers = [],
-- string $uri = null
-+ string $uri = null,
-+ string $scriptFilename = null,
-+ string $stdin = null
- ) {
- if (is_null($uri)) {
- $uri = $this->makeSourceFile();
-@@ -545,8 +545,8 @@
- $params = array_merge(
- [
- 'GATEWAY_INTERFACE' => 'FastCGI/1.0',
-- 'REQUEST_METHOD' => 'GET',
-- 'SCRIPT_FILENAME' => $uri,
-+ 'REQUEST_METHOD' => is_null($stdin) ? 'GET' : 'POST',
-+ 'SCRIPT_FILENAME' => $scriptFilename ?: $uri,
- 'SCRIPT_NAME' => $uri,
- 'QUERY_STRING' => $query,
- 'REQUEST_URI' => $uri . ($query ? '?'.$query : ""),
-@@ -560,7 +560,7 @@
- 'SERVER_PROTOCOL' => 'HTTP/1.1',
- 'DOCUMENT_ROOT' => __DIR__,
- 'CONTENT_TYPE' => '',
-- 'CONTENT_LENGTH' => 0
-+ 'CONTENT_LENGTH' => strlen($stdin ?? "") // Default to 0
- ],
- $headers
- );
-@@ -571,16 +571,85 @@
- }
-
- /**
-- * Execute request.
-+ * Parse stdin and generate data for multipart config.
- *
-- * @param string $query
-+ * @param array $stdin
- * @param array $headers
-- * @param string|null $uri
-- * @param string|null $address
-- * @param string|null $successMessage
-- * @param string|null $errorMessage
-- * @param bool $connKeepAlive
-+ *
-+ * @return void
-+ * @throws \Exception
-+ */
-+ private function parseStdin(array $stdin, array &$headers)
-+ {
-+ $parts = $stdin['parts'] ?? null;
-+ if (empty($parts)) {
-+ throw new \Exception('The stdin array needs to contain parts');
-+ }
-+ $boundary = $stdin['boundary'] ?? 'AaB03x';
-+ if ( ! isset($headers['CONTENT_TYPE'])) {
-+ $headers['CONTENT_TYPE'] = 'multipart/form-data; boundary=' . $boundary;
-+ }
-+ $count = $parts['count'] ?? null;
-+ if ( ! is_null($count)) {
-+ $dispositionType = $parts['disposition'] ?? 'form-data';
-+ $dispositionParam = $parts['param'] ?? 'name';
-+ $namePrefix = $parts['prefix'] ?? 'f';
-+ $nameSuffix = $parts['suffix'] ?? '';
-+ $value = $parts['value'] ?? 'test';
-+ $parts = [];
-+ for ($i = 0; $i < $count; $i++) {
-+ $parts[] = [
-+ 'disposition' => $dispositionType,
-+ 'param' => $dispositionParam,
-+ 'name' => "$namePrefix$i$nameSuffix",
-+ 'value' => $value
-+ ];
-+ }
-+ }
-+ $out = '';
-+ $nl = "\r\n";
-+ foreach ($parts as $part) {
-+ if (!is_array($part)) {
-+ $part = ['name' => $part];
-+ } elseif ( ! isset($part['name'])) {
-+ throw new \Exception('Each part has to have a name');
-+ }
-+ $name = $part['name'];
-+ $dispositionType = $part['disposition'] ?? 'form-data';
-+ $dispositionParam = $part['param'] ?? 'name';
-+ $value = $part['value'] ?? 'test';
-+ $partHeaders = $part['headers'] ?? [];
-+
-+ $out .= "--$boundary$nl";
-+ $out .= "Content-disposition: $dispositionType; $dispositionParam=\"$name\"$nl";
-+ foreach ($partHeaders as $headerName => $headerValue) {
-+ $out .= "$headerName: $headerValue$nl";
-+ }
-+ $out .= $nl;
-+ $out .= "$value$nl";
-+ }
-+ $out .= "--$boundary--$nl";
-+
-+ return $out;
-+ }
-+
-+ /**
-+ * Execute request.
-+ *
-+ * @param string $query
-+ * @param array $headers
-+ * @param string|null $uri
-+ * @param string|null $address
-+ * @param string|null $successMessage
-+ * @param string|null $errorMessage
-+ * @param bool $connKeepAlive
-+ * @param string|null $scriptFilename = null
-+ * @param string|array|null $stdin = null
-+ * @param bool $expectError
-+ * @param int $readLimit
-+ *
- * @return Response
-+ * @throws \Exception
- */
- public function request(
- string $query = '',
-@@ -589,17 +658,24 @@
- string $address = null,
- string $successMessage = null,
- string $errorMessage = null,
-- bool $connKeepAlive = false
-+ bool $connKeepAlive = false,
-+ string $scriptFilename = null,
-+ $stdin = null,
-+ bool $expectError = false,
-+ int $readLimit = -1
- ) {
- if ($this->hasError()) {
- return new Response(null, true);
- }
-
-- $params = $this->getRequestParams($query, $headers, $uri);
-+ if (is_array($stdin)) {
-+ $stdin = $this->parseStdin($stdin, $headers);
-+ }
-
-+ $params = $this->getRequestParams($query, $headers, $uri, $scriptFilename, $stdin);
- try {
- $this->response = new Response(
-- $this->getClient($address, $connKeepAlive)->request_data($params, false)
-+ $this->getClient($address, $connKeepAlive)->request_data($params, $stdin, $readLimit)
- );
- $this->message($successMessage);
- } catch (\Exception $exception) {
diff --git a/testing/php7/atomic-lsapi.patch b/testing/php7/atomic-lsapi.patch
deleted file mode 100644
index 39cf1823f0b3..000000000000
--- a/testing/php7/atomic-lsapi.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Patch-Source: https://github.com/php/php-src/pull/7997
-
-diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
-index 2208bbd47b..42dd320356 100644
---- a/sapi/litespeed/lsapilib.c
-+++ b/sapi/litespeed/lsapilib.c
-@@ -443,7 +443,7 @@ static void lsapi_close_connection(LSAPI_Request *pReq)
- if (s_busy_workers)
- __sync_fetch_and_sub(s_busy_workers, 1);
- if (s_worker_status)
-- __sync_lock_test_and_set(&s_worker_status->m_state, LSAPI_STATE_IDLE);
-+ __atomic_test_and_set(&s_worker_status->m_state, LSAPI_STATE_IDLE);
- }
-
-
-@@ -1587,7 +1587,7 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
- else
- {
- if (s_worker_status)
-- __sync_lock_test_and_set(&s_worker_status->m_state,
-+ __atomic_test_and_set(&s_worker_status->m_state,
- LSAPI_STATE_CONNECTED);
- if (s_busy_workers)
- __sync_fetch_and_add(s_busy_workers, 1);
-@@ -3315,7 +3315,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
- if (pthread_atfork_func)
- (*pthread_atfork_func)(NULL, NULL, set_skip_write);
-
-- __sync_lock_test_and_set(&s_worker_status->m_state,
-+ __atomic_test_and_set(&s_worker_status->m_state,
- LSAPI_STATE_CONNECTED);
- if (s_busy_workers)
- __sync_add_and_fetch(s_busy_workers, 1);
-@@ -3402,7 +3402,7 @@ int LSAPI_Postfork_Child(LSAPI_Request * pReq)
- if (pthread_atfork_func)
- (*pthread_atfork_func)(NULL, NULL, set_skip_write);
-
-- __sync_lock_test_and_set(&s_worker_status->m_state,
-+ __atomic_test_and_set(&s_worker_status->m_state,
- LSAPI_STATE_CONNECTED);
- if (s_busy_workers)
- __sync_add_and_fetch(s_busy_workers, 1);
-@@ -3651,7 +3651,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
- if (fd == pReq->m_fdListen)
- {
- if (s_worker_status)
-- __sync_lock_test_and_set(&s_worker_status->m_state,
-+ __atomic_test_and_set(&s_worker_status->m_state,
- LSAPI_STATE_ACCEPTING);
- if (s_accepting_workers)
- __sync_fetch_and_add(s_accepting_workers, 1);
-@@ -3662,7 +3662,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
- if (s_accepting_workers)
- __sync_fetch_and_sub(s_accepting_workers, 1);
- if (s_worker_status)
-- __sync_lock_test_and_set(&s_worker_status->m_state,
-+ __atomic_test_and_set(&s_worker_status->m_state,
- LSAPI_STATE_IDLE);
- }
-
-@@ -3711,7 +3711,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
- if ( pReq->m_fd != -1 )
- {
- if (s_worker_status)
-- __sync_lock_test_and_set(&s_worker_status->m_state,
-+ __atomic_test_and_set(&s_worker_status->m_state,
- LSAPI_STATE_CONNECTED);
- if (s_busy_workers)
- __sync_fetch_and_add(s_busy_workers, 1);
-diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
-index 42dd320356..0932ebaaa8 100644
---- a/sapi/litespeed/lsapilib.c
-+++ b/sapi/litespeed/lsapilib.c
-@@ -3390,7 +3390,7 @@ int LSAPI_Postfork_Child(LSAPI_Request * pReq)
- {
- int max_children = g_prefork_server->m_iMaxChildren;
- s_pid = getpid();
-- __sync_lock_test_and_set(&pReq->child_status->m_pid, s_pid);
-+ __atomic_test_and_set(&pReq->child_status->m_pid, s_pid);
- s_worker_status = pReq->child_status;
-
- setsid();
diff --git a/testing/php7/disabled-tests.list b/testing/php7/disabled-tests.list
deleted file mode 100644
index f8a3f14ee0bc..000000000000
--- a/testing/php7/disabled-tests.list
+++ /dev/null
@@ -1,243 +0,0 @@
-#
-# Tests that we don't need to run
-#
-
-# These are mostly unit or regression tests, we care about integration tests.
-tests/classes/*
-Zend/tests/*
-
-# Windows tests
-ext/standard/tests/file/windows_mb_path/*
-ext/standard/tests/file/*win32*.phpt
-ext/standard/tests/dir/*win32*.phpt
-
-# Require database or slow as dblib
-ext/mysqli/tests/*
-ext/odbc/tests/*
-ext/pdo/tests/*.phpt
-ext/pdo_dblib/tests/*
-ext/pdo_mysql/tests/*
-ext/pdo_odbc/tests/*
-ext/pdo_pgsql/tests/*
-ext/pgsql/tests/*
-
-#
-# Tests that fail and probably should not...
-#
-
-# Too many tests fail! Some of them bogus, some not.
-# THIS SHOULD BE REALLY FIXED!
-ext/openssl/tests/bug46127.phpt
-ext/openssl/tests/bug48182.phpt
-ext/openssl/tests/bug54992.phpt
-ext/openssl/tests/bug65538_001.phpt
-ext/openssl/tests/bug65538_003.phpt
-ext/openssl/tests/bug65729.phpt
-ext/openssl/tests/bug68265.phpt
-ext/openssl/tests/bug68879.phpt
-ext/openssl/tests/bug68920.phpt
-ext/openssl/tests/bug69215.phpt
-ext/openssl/tests/bug72333.phpt
-ext/openssl/tests/bug74159.phpt
-ext/openssl/tests/bug76705.phpt
-ext/openssl/tests/bug77390.phpt
-ext/openssl/tests/capture_peer_cert_001.phpt
-ext/openssl/tests/openssl_peer_fingerprint_basic.phpt
-ext/openssl/tests/peer_verification.phpt
-ext/openssl/tests/san_peer_matching.phpt
-ext/openssl/tests/session_meta_capture.phpt
-ext/openssl/tests/session_meta_capture_tlsv13.phpt
-ext/openssl/tests/sni_server.phpt
-ext/openssl/tests/sni_server_key_cert.phpt
-ext/openssl/tests/stream_crypto_flags_001.phpt
-ext/openssl/tests/stream_crypto_flags_002.phpt
-ext/openssl/tests/stream_crypto_flags_003.phpt
-ext/openssl/tests/stream_crypto_flags_004.phpt
-ext/openssl/tests/stream_security_level.phpt
-ext/openssl/tests/stream_verify_peer_name_001.phpt
-ext/openssl/tests/stream_verify_peer_name_002.phpt
-ext/openssl/tests/stream_verify_peer_name_003.phpt
-ext/openssl/tests/streams_crypto_method.phpt
-ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt
-ext/openssl/tests/tls_wrapper.phpt
-ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt
-ext/openssl/tests/tlsv1.0_wrapper.phpt
-ext/openssl/tests/tlsv1.1_wrapper.phpt
-ext/openssl/tests/tlsv1.2_wrapper.phpt
-ext/openssl/tests/tlsv1.3_wrapper.phpt
-
-# Needs to open tls socket
-ext/openssl/tests/bug62890.phpt
-
-# Broken tests, missing config.
-sapi/fpm/tests/socket-ipv4-fallback.phpt
-
-# Fails in chroot (on Travis).
-sapi/cli/tests/cli_process_title_unix.phpt
-
-# Error messages in different order.
-sapi/cgi/tests/005.phpt
-
-# Fails on ppc64le.
-sapi/phpdbg/tests/watch_006.phpt
-
-# Missing timezone in date.
-ext/date/tests/bug27780.phpt
-ext/date/tests/bug32555.phpt
-ext/date/tests/bug33532.phpt
-
-# Number overflow!?
-ext/date/tests/bug53437_var5.phpt
-ext/date/tests/bug53437_var6.phpt
-# fails on 32 bits
-ext/date/tests/bug53437_var3.phpt
-
-# Incompatible version of enchant library?
-ext/enchant/tests/broker_list_dicts.phpt
-ext/enchant/tests/bug13181.phpt
-# no warning but expected
-ext/enchant/tests/bug53070.phpt
-
-# Wrong charset, conversion from `UTF-8' to `ASCII//TRANSLIT' is not allowed.
-ext/iconv/tests/iconv_basic_001.phpt
-
-# Wrong charset, conversion from `UTF-8' to `UTF-8//IGNORE' is not allowed.
-ext/iconv/tests/bug48147.phpt
-
-# stream_filter_append(): unable to create or locate filter "convert.iconv.ucs-2/utf-8//IGNORE"
-ext/iconv/tests/bug76249.phpt
-
-# for ICU <= 57.1
-ext/intl/tests/spoofchecker_001.phpt
-ext/intl/tests/timezone_IDforWindowsID_basic.phpt
-ext/intl/tests/timezone_windowsID_basic.phpt
-
-# Class 'Phar' not found.
-ext/opcache/tests/issue0115.phpt
-ext/opcache/tests/issue0149.phpt
-
-# Fails in CI - Insufficient privileges. https://gitlab.alpinelinux.org/alpine/aports/-/issues/12692#note_169663
-ext/pcntl/tests/pcntl_unshare_01.phpt
-ext/pcntl/tests/pcntl_unshare_02.phpt
-
-# Randomly fails.
-ext/pcntl/tests/002.phpt
-# Randomly fails on arm7
-ext/standard/tests/file/bug60120.phpt
-
-# Call to undefined function session_start().
-ext/session/tests/session_regenerate_id_cookie.phpt
-
-# Class 'SoapServer' not found.
-ext/soap/tests/bug73037.phpt
-
-# Incorrect results.
-ext/soap/tests/server009.phpt
-
-# Incorrect results.
-ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt
-ext/standard/tests/crypt/bcrypt_invalid_cost.phpt
-ext/standard/tests/crypt/des_fallback_invalid_salt.phpt
-ext/standard/tests/strings/crypt_blowfish.phpt
-ext/standard/tests/strings/crypt_blowfish_variation1.phpt
-ext/standard/tests/strings/crypt_blowfish_variation2.phpt
-
-# Incorrect results.
-ext/standard/tests/strings/bug51059.phpt
-ext/standard/tests/strings/bug79986.phpt
-
-# Failing tests related to locale and/or iconv.
-ext/date/tests/009.phpt
-ext/iconv/tests/bug52211.phpt
-ext/intl/tests/bug67052.phpt
-ext/json/tests/bug41403.phpt
-ext/pcre/tests/ctype_back_to_c.phpt
-ext/pcre/tests/locales.phpt
-ext/soap/tests/bugs/bug39815.phpt
-ext/standard/tests/array/locale_sort.phpt
-ext/standard/tests/strings/htmlentities02.phpt
-ext/standard/tests/strings/htmlentities03.phpt
-ext/standard/tests/strings/moneyformat.phpt
-ext/standard/tests/strings/setlocale_basic1.phpt
-ext/standard/tests/strings/setlocale_basic2.phpt
-ext/standard/tests/strings/setlocale_basic3.phpt
-ext/standard/tests/strings/setlocale_error.phpt
-ext/standard/tests/strings/setlocale_variation1.phpt
-ext/standard/tests/strings/setlocale_variation2.phpt
-ext/standard/tests/strings/setlocale_variation3.phpt
-ext/standard/tests/strings/setlocale_variation4.phpt
-ext/standard/tests/strings/setlocale_variation5.phpt
-ext/standard/tests/strings/sprintf_f_3.phpt
-ext/standard/tests/strings/strtoupper.phpt
-ext/standard/tests/time/strptime_basic.phpt
-ext/standard/tests/time/strptime_parts.phpt
-tests/lang/034.phpt
-tests/lang/bug30638.phpt
-
-# setlocale() does not affect result of nl_langinfo(CODESET) always returns UTF-8
-ext/fileinfo/tests/bug74170.phpt
-
-# no xml header displayed
-ext/tidy/tests/020.phpt
-
-#
-# Tests that fail for known reason and/or we don't need to worry about them
-#
-
-# Fails due to unsupported JP charsets.
-ext/iconv/tests/eucjp2iso2022jp.phpt
-ext/iconv/tests/iconv_mime_encode.phpt
-ext/standard/tests/strings/htmlentities04.phpt
-ext/standard/tests/strings/htmlentities15.phpt
-
-# Requires running SNMP server.
-ext/snmp/tests/*
-
-# Different wording of socket error messages (due to different libc).
-ext/sockets/tests/socket_strerror.phpt
-
-# Expects permissions on /etc to be 40755
-ext/standard/tests/file/006_error.phpt
-
-# Fails probably due to differencies in musl.
-ext/standard/tests/file/popen_pclose_error.phpt
-
-# Fails probably due to differencies in musl.
-ext/sockets/tests/socket_create_pair-wrongparams.phpt
-
-# Fail due to libxml2 upgrade to 2.9.12
-# See: https://gitlab.alpinelinux.org/alpine/aports/-/issues/12692
-ext/dom/tests/DOMDocument_loadXML_error1.phpt
-ext/dom/tests/DOMDocument_load_error1.phpt
-ext/dom/tests/bug43364.phpt
-ext/dom/tests/bug80268.phpt
-ext/libxml/tests/bug61367-read.phpt
-ext/libxml/tests/libxml_disable_entity_loader.phpt
-sapi/fpm/tests/bug68391-conf-include-order.phpt
-
-# compilation failed https://gitlab.alpinelinux.org/alpine/aports/-/issues/13116
-ext/pcre/tests/bug70345.phpt
-
-#incompatible with openssl 3
-ext/openssl/tests/bug28382.phpt
-ext/openssl/tests/bug71917.phpt
-ext/openssl/tests/bug72362.phpt
-ext/openssl/tests/bug73711.phpt
-ext/openssl/tests/bug74022_2.phpt
-ext/openssl/tests/cve2013_4073.phpt
-ext/openssl/tests/ecc.phpt
-ext/openssl/tests/openssl_decrypt_basic.phpt
-ext/openssl/tests/openssl_open_basic.phpt
-ext/openssl/tests/openssl_pkcs12_read_basic.phpt
-ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt
-ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt
-ext/openssl/tests/openssl_seal_basic.phpt
-ext/openssl/tests/openssl_spki_export_basic.phpt
-ext/openssl/tests/openssl_spki_export_challenge_basic.phpt
-ext/openssl/tests/openssl_spki_new_basic.phpt
-ext/openssl/tests/openssl_spki_verify_basic.phpt
-ext/openssl/tests/openssl_x509_parse_basic.phpt
-
-# ICU72
-ext/intl/tests/dateformat_format_variant3.phpt
-ext/intl/tests/dateformat_set_timezone_id4.phpt
diff --git a/testing/php7/enchant-2.patch b/testing/php7/enchant-2.patch
deleted file mode 100644
index 9d421c3bf08f..000000000000
--- a/testing/php7/enchant-2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- php-7.4.4/ext/enchant/config.m4 2020-03-17 10:40:22.000000000 +0000
-+++ php-7.4.4/ext/enchant/config.m4 2020-03-27 21:25:27.754470703 +0000
-@@ -4,21 +4,21 @@ PHP_ARG_WITH([enchant],
- [Include Enchant support])])
-
- if test "$PHP_ENCHANT" != "no"; then
-- PKG_CHECK_MODULES([ENCHANT], [enchant])
-+ PKG_CHECK_MODULES([ENCHANT], [enchant-2])
-
- PHP_EVAL_INCLINE($ENCHANT_CFLAGS)
- PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD)
-
- AC_DEFINE(HAVE_ENCHANT, 1, [ ])
-
-- PHP_CHECK_LIBRARY(enchant, enchant_get_version,
-+ PHP_CHECK_LIBRARY(enchant-2, enchant_get_version,
- [
- AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ ])
- ], [ ], [
- $ENCHANT_LIBS
- ])
-
-- PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
-+ PHP_CHECK_LIBRARY(enchant-2, enchant_broker_set_param,
- [
- AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
- ], [ ], [
---- a/ext/enchant/enchant.c.orig
-+++ b/ext/enchant/enchant.c
-@@ -738,7 +738,7 @@
- for (i = 0; i < n_sugg; i++) {
- add_next_index_string(sugg, suggs[i]);
- }
-- enchant_dict_free_suggestions(pdict->pdict, suggs);
-+ enchant_dict_free_string_list(pdict->pdict, suggs);
- }
-
-
-@@ -793,7 +793,7 @@
- add_next_index_string(return_value, suggs[i]);
- }
-
-- enchant_dict_free_suggestions(pdict->pdict, suggs);
-+ enchant_dict_free_string_list(pdict->pdict, suggs);
- }
- }
- /* }}} */
-@@ -813,7 +813,7 @@
-
- PHP_ENCHANT_GET_DICT;
-
-- enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
-+ enchant_dict_add(pdict->pdict, word, wordlen);
- }
- /* }}} */
-
-@@ -851,7 +851,7 @@
-
- PHP_ENCHANT_GET_DICT;
-
-- RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
-+ RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
- }
- /* }}} */
-
---- php-7.4.4/build/php.m4 2020-03-17 06:40:21.000000000 -0400
-+++ php-7.4.4/build/php.m4 2020-04-05 09:27:14.634620646 -0400
-@@ -1541,7 +1541,7 @@ AC_DEFUN([PHP_CHECK_LIBRARY], [
- ],[
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-- unset ac_cv_lib_$1[]_$2
-+ unset ac_cv_lib_[]translit($1, -, _)_$2
- $4
- ])dnl
- ])
diff --git a/testing/php7/fix-curl-7.83-test.patch b/testing/php7/fix-curl-7.83-test.patch
deleted file mode 100644
index b087acfb28a3..000000000000
--- a/testing/php7/fix-curl-7.83-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a4179e4c92b6365d39e09cb9cd63c476848013af Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Wed, 27 Apr 2022 12:37:39 +0200
-Subject: [PATCH] Fix test for curl 7.83.0
-Patch-Source: https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af
-
-libcurl 7.83.0 removed some trailing exclamation marks from error
-messages[1]; we have to cater to that.
-
-[1] <https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7>
----
- ext/curl/tests/curl_basic_007.phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt
-index 3b53658d6a7e..3834e4674f82 100644
---- a/ext/curl/tests/curl_basic_007.phpt
-+++ b/ext/curl/tests/curl_basic_007.phpt
-@@ -20,5 +20,5 @@ curl_close($ch);
-
- ?>
- --EXPECTF--
--string(%d) "No URL set!%w"
-+string(%d) "No URL set%A"
- int(3)
diff --git a/testing/php7/fix-fpm-syntax.patch b/testing/php7/fix-fpm-syntax.patch
deleted file mode 100644
index d6cd0bdfef26..000000000000
--- a/testing/php7/fix-fpm-syntax.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
-@@ -35,7 +35,7 @@
- $tester->start();
- $tester->expectLogStartNotices();
- echo $tester
-- ->request(stdin: [
-+ ->request('', [], null, null, null, null, false, null, [
- 'parts' => [
- 'count' => 30,
- ]
---- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
-@@ -34,7 +34,7 @@
- $tester->start();
- $tester->expectLogStartNotices();
- echo $tester
-- ->request(stdin: [
-+ ->request('', [], null, null, null, null, false, null, [
- 'parts' => [
- 'count' => 30,
- ]
---- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-@@ -33,7 +33,7 @@
- $tester->start();
- $tester->expectLogStartNotices();
- echo $tester
-- ->request(stdin: [
-+ ->request('', [], null, null, null, null, false, null, [
- 'parts' => [
- 'count' => 10,
- 'param' => 'filename'
diff --git a/testing/php7/fix-fpm-tests.patch b/testing/php7/fix-fpm-tests.patch
deleted file mode 100644
index a0d375e06e88..000000000000
--- a/testing/php7/fix-fpm-tests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Patch-Source: https://github.com/php/php-src/commit/e86d8704b44dde164e36b5364036e1988ac566fe
-
-From e86d8704b44dde164e36b5364036e1988ac566fe Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 14 Feb 2023 14:13:40 +0100
-Subject: [PATCH] more config for new FPM tests
-
----
- sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt | 4 +++-
- .../fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt | 4 +++-
- sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt | 4 +++-
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
-index d2239ac3c410..d5c4c4d46987 100644
---- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
-@@ -21,7 +21,9 @@ php_admin_value[html_errors] = false
- php_admin_value[max_input_vars] = 20
- php_admin_value[max_file_uploads] = 5
- php_admin_value[max_multipart_body_parts] = 10
--php_flag[display_errors] = On
-+php_admin_flag[display_errors] = On
-+php_admin_flag[display_startup_errors] = On
-+php_admin_flag[log_errors] = On
- EOT;
-
- $code = <<<EOT
-diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
-index 42b5afbf9ee7..c7e029371bba 100644
---- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
-@@ -20,7 +20,9 @@ pm.max_spare_servers = 3
- php_admin_value[html_errors] = false
- php_admin_value[max_input_vars] = 20
- php_admin_value[max_file_uploads] = 5
--php_flag[display_errors] = On
-+php_admin_flag[display_errors] = On
-+php_admin_flag[display_startup_errors] = On
-+php_admin_flag[log_errors] = On
- EOT;
-
- $code = <<<EOT
-diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-index da81174c7280..8c7ec54c799b 100644
---- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-+++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
-@@ -19,7 +19,9 @@ pm.min_spare_servers = 1
- pm.max_spare_servers = 3
- php_admin_value[html_errors] = false
- php_admin_value[max_file_uploads] = 5
--php_flag[display_errors] = On
-+php_admin_flag[display_errors] = On
-+php_admin_flag[display_startup_errors] = On
-+php_admin_flag[log_errors] = On
- EOT;
-
- $code = <<<EOT
diff --git a/testing/php7/fix-icu72.patch b/testing/php7/fix-icu72.patch
deleted file mode 100644
index a03543c47c95..000000000000
--- a/testing/php7/fix-icu72.patch
+++ /dev/null
@@ -1,735 +0,0 @@
-Patch-Source: https://github.com/php/php-src/pull/9800
-
-From 55dc54834c556cb2b8dc44bd7b3bc2a89bfd1f19 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Fri, 21 Oct 2022 17:21:16 +0200
-Subject: [PATCH] Adapt ext/intl tests for ICU 72.1
-
-This version replaces SPACEs before the meridian with NARROW NO-BREAK
-SPACEs. Thus, we split the affected test cases as usual.
----
- .../tests/dateformat_calendars_variant3.phpt | 1 +
- .../tests/dateformat_calendars_variant4.phpt | 48 +++
- ext/intl/tests/dateformat_create_default.phpt | 2 +
- .../tests/dateformat_create_default2.phpt | 26 ++
- ...format_formatObject_calendar_variant5.phpt | 1 +
- ...format_formatObject_calendar_variant6.phpt | 37 +++
- ...format_formatObject_datetime_variant5.phpt | 1 +
- ...format_formatObject_datetime_variant6.phpt | 30 ++
- .../dateformat_format_parse_version2.phpt | 1 +
- .../dateformat_format_parse_version3.phpt | 296 ++++++++++++++++++
- .../tests/dateformat_set_timezone_id3.phpt | 1 +
- .../tests/dateformat_set_timezone_id4.phpt | 85 +++++
- ...datepatterngenerator_get_best_pattern.phpt | 2 +
- ...atepatterngenerator_get_best_pattern2.phpt | 38 +++
- ext/intl/tests/msgfmt_format_datetime.phpt | 2 +
- ext/intl/tests/msgfmt_format_datetime2.phpt | 29 ++
- ...t_format_simple_types_numeric_strings.phpt | 2 +
- ..._format_simple_types_numeric_strings2.phpt | 54 ++++
- ...cebundle_null_mandatory_args_variant2.phpt | 1 +
- ...cebundle_null_mandatory_args_variant3.phpt | 24 ++
- 20 files changed, 681 insertions(+)
- create mode 100644 ext/intl/tests/dateformat_calendars_variant4.phpt
- create mode 100644 ext/intl/tests/dateformat_create_default2.phpt
- create mode 100644 ext/intl/tests/dateformat_formatObject_calendar_variant6.phpt
- create mode 100644 ext/intl/tests/dateformat_formatObject_datetime_variant6.phpt
- create mode 100644 ext/intl/tests/dateformat_format_parse_version3.phpt
- create mode 100644 ext/intl/tests/dateformat_set_timezone_id4.phpt
- create mode 100644 ext/intl/tests/datepatterngenerator_get_best_pattern2.phpt
- create mode 100644 ext/intl/tests/msgfmt_format_datetime2.phpt
- create mode 100644 ext/intl/tests/msgfmt_format_simple_types_numeric_strings2.phpt
- create mode 100644 ext/intl/tests/resourcebundle_null_mandatory_args_variant3.phpt
-
-diff --git a/ext/intl/tests/dateformat_calendars_variant3.phpt b/ext/intl/tests/dateformat_calendars_variant3.phpt
-index d189361bcffb..1ad970d07d0e 100644
---- a/ext/intl/tests/dateformat_calendars_variant3.phpt
-+++ b/ext/intl/tests/dateformat_calendars_variant3.phpt
-@@ -6,6 +6,7 @@ date.timezone=Atlantic/Azores
- intl
- --SKIPIF--
- <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1'); ?>
- --FILE--
- <?php
- ini_set("intl.error_level", E_WARNING);
-diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt
-index 494b66768906..9eb9f39a917a 100644
---- a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt
-+++ b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt
-@@ -4,6 +4,7 @@ IntlDateFormatter::formatObject(): IntlCalendar tests
- intl
- --SKIPIF--
- <?php if (version_compare(INTL_ICU_VERSION, '55.1') < 0) die('skip for ICU >= 55.1'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1'); ?>
- --FILE--
- <?php
- ini_set("intl.error_level", E_WARNING);
-diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant6.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant6.phpt
-new file mode 100644
-index 000000000000..fc5ddb6fc4fe
---- /dev/null
-+++ b/ext/intl/tests/dateformat_formatObject_calendar_variant6.phpt
-@@ -0,0 +1,37 @@
-+--TEST--
-+IntlDateFormatter::formatObject(): IntlCalendar tests
-+--EXTENSIONS--
-+intl
-+--SKIPIF--
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
-+--FILE--
-+<?php
-+ini_set("intl.error_level", E_WARNING);
-+ini_set("intl.default_locale", "pt_PT");
-+ini_set("date.timezone", "Europe/Lisbon");
-+
-+$cal = IntlCalendar::fromDateTime('2012-01-01 00:00:00'); //Europe/Lisbon
-+echo IntlDateFormatter::formatObject($cal), "\n";
-+echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL), "\n";
-+echo IntlDateFormatter::formatObject($cal, null, "en-US"), "\n";
-+echo IntlDateFormatter::formatObject($cal, array(IntlDateFormatter::SHORT, IntlDateFormatter::FULL), "en-US"), "\n";
-+echo IntlDateFormatter::formatObject($cal, 'E y-MM-d HH,mm,ss.SSS v', "en-US"), "\n";
-+
-+$cal = IntlCalendar::fromDateTime('2012-01-01 05:00:00+03:00');
-+echo datefmt_format_object($cal, IntlDateFormatter::FULL), "\n";
-+
-+$cal = IntlCalendar::createInstance(null,'en-US@calendar=islamic-civil');
-+$cal->setTime(strtotime('2012-01-01 00:00:00')*1000.);
-+echo IntlDateFormatter::formatObject($cal), "\n";
-+echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n";
-+
-+?>
-+--EXPECTF--
-+01/01/2012, 00:00:00
-+domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental
-+Jan 1, 2012, 12:00:00 AM
-+1/1/12, 12:00:00 AM Western European Standard Time
-+Sun 2012-01-1 00,00,00.000 Portugal Time
-+domingo, 1 de janeiro de 2012 Ã s 05:00:00 GMT+03:00
-+06/02/1433, 00:00:00
-+Sunday, Safar 6, 1433 at 12:00:00 AM Western European Standard Time
-diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt
-index b51a46d7f397..b3c2ecc8e793 100644
---- a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt
-+++ b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt
-@@ -4,6 +4,7 @@ IntlDateFormatter::formatObject(): DateTime tests
- intl
- --SKIPIF--
- <?php if (version_compare(INTL_ICU_VERSION, '55.1') < 0) die('skip for ICU >= 55.1'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1'); ?>
- --FILE--
- <?php
- ini_set("intl.error_level", E_WARNING);
-diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant6.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant6.phpt
-new file mode 100644
-index 000000000000..fe30d1f85ac1
---- /dev/null
-+++ b/ext/intl/tests/dateformat_formatObject_datetime_variant6.phpt
-@@ -0,0 +1,30 @@
-+--TEST--
-+IntlDateFormatter::formatObject(): DateTime tests
-+--EXTENSIONS--
-+intl
-+--SKIPIF--
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU < 72.1'); ?>
-+--FILE--
-+<?php
-+ini_set("intl.error_level", E_WARNING);
-+ini_set("intl.default_locale", "pt_PT");
-+ini_set("date.timezone", "Europe/Lisbon");
-+
-+$dt = new DateTime('2012-01-01 00:00:00'); //Europe/Lisbon
-+echo IntlDateFormatter::formatObject($dt), "\n";
-+echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
-+echo IntlDateFormatter::formatObject($dt, null, "en-US"), "\n";
-+echo IntlDateFormatter::formatObject($dt, array(IntlDateFormatter::SHORT, IntlDateFormatter::FULL), "en-US"), "\n";
-+echo IntlDateFormatter::formatObject($dt, 'E y-MM-d HH,mm,ss.SSS v', "en-US"), "\n";
-+
-+$dt = new DateTime('2012-01-01 05:00:00+03:00');
-+echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
-+
-+?>
-+--EXPECTF--
-+01/01/2012, 00:00:00
-+domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental
-+Jan 1, 2012, 12:00:00 AM
-+1/1/12, 12:00:00 AM Western European Standard Time
-+Sun 2012-01-1 00,00,00.000 Portugal Time
-+domingo, 1 de janeiro de 2012 Ã s 05:00:00 GMT+03:00
-diff --git a/ext/intl/tests/dateformat_format_parse_version2.phpt b/ext/intl/tests/dateformat_format_parse_version2.phpt
-index 19e7d914adcf..1293d29c383b 100644
---- a/ext/intl/tests/dateformat_format_parse_version2.phpt
-+++ b/ext/intl/tests/dateformat_format_parse_version2.phpt
-@@ -4,6 +4,7 @@ datefmt_format_code() and datefmt_parse_code()
- intl
- --SKIPIF--
- <?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1'); ?>
- --FILE--
- <?php
-
-diff --git a/ext/intl/tests/dateformat_format_parse_version3.phpt b/ext/intl/tests/dateformat_format_parse_version3.phpt
-new file mode 100644
-index 000000000000..890546fa7115
---- /dev/null
-+++ b/ext/intl/tests/dateformat_format_parse_version3.phpt
-@@ -0,0 +1,296 @@
-+--TEST--
-+datefmt_format_code() and datefmt_parse_code()
-+--EXTENSIONS--
-+intl
-+--SKIPIF--
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
-+--FILE--
-+<?php
-+
-+/*
-+ * Test for the datefmt_format function
-+ */
-+
-+
-+function ut_main()
-+{
-+ $timezone = 'GMT+05:00';
-+
-+ $locale_arr = array (
-+ 'en_US'
-+ );
-+
-+ $datetype_arr = array (
-+ IntlDateFormatter::FULL,
-+ IntlDateFormatter::LONG,
-+ IntlDateFormatter::MEDIUM
-+ );
-+
-+ $res_str = '';
-+
-+
-+ $time_arr = array (
-+ 0,
-+ -1200000,
-+ 1200000,
-+ 2200000000,
-+ -2200000000,
-+ 90099999,
-+ 3600,
-+ -3600
-+ );
-+
-+ $localtime_arr1 = array (
-+ 'tm_sec' => 24 ,
-+ 'tm_min' => 3,
-+ 'tm_hour' => 19,
-+ 'tm_mday' => 3,
-+ 'tm_mon' => 3,
-+ 'tm_year' => 105,
-+ );
-+ $localtime_arr2 = array (
-+ 'tm_sec' => 21,
-+ 'tm_min' => 5,
-+ 'tm_hour' => 7,
-+ 'tm_mday' => 13,
-+ 'tm_mon' => 7,
-+ 'tm_year' => 205,
-+ );
-+ $localtime_arr3 = array (
-+ 'tm_sec' => 11,
-+ 'tm_min' => 13,
-+ 'tm_hour' => 0,
-+ 'tm_mday' => 17,
-+ 'tm_mon' => 11,
-+ 'tm_year' => -5
-+ );
-+
-+ $localtime_arr = array (
-+ $localtime_arr1,
-+ $localtime_arr2,
-+ $localtime_arr3
-+ );
-+
-+ //Test format and parse with a timestamp : long
-+ foreach( $time_arr as $timestamp_entry){
-+ $res_str .= "\n------------\n";
-+ $res_str .= "\nInput timestamp is : $timestamp_entry";
-+ $res_str .= "\n------------\n";
-+ foreach( $locale_arr as $locale_entry ){
-+ foreach( $datetype_arr as $datetype_entry ) {
-+ $res_str .= "\nIntlDateFormatter locale= $locale_entry ,datetype = $datetype_entry ,timetype =$datetype_entry ";
-+ $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry,$timezone);
-+ $formatted = ut_datefmt_format( $fmt , $timestamp_entry);
-+ $res_str .= "\nFormatted timestamp is : $formatted";
-+ $parsed = ut_datefmt_parse( $fmt , $formatted);
-+ if( intl_get_error_code() == U_ZERO_ERROR){
-+ $res_str .= "\nParsed timestamp is : $parsed";
-+ }else{
-+ $res_str .= "\nError while parsing as: '".intl_get_error_message()."'";
-+ }
-+ }
-+ }
-+ }
-+
-+ //Test format and parse with a localtime :array
-+ foreach( $localtime_arr as $localtime_entry){
-+ $res_str .= "\n------------\n";
-+ $res_str .= "\nInput localtime is : ";
-+ foreach( $localtime_entry as $key => $value){
-+ $res_str .= "$key : '$value' , ";
-+ }
-+
-+ $res_str .= "\n------------\n";
-+ foreach( $locale_arr as $locale_entry ){
-+ foreach( $datetype_arr as $datetype_entry ) {
-+ $res_str .= "\nIntlDateFormatter locale= $locale_entry ,datetype = $datetype_entry ,timetype =$datetype_entry ";
-+ $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry,$timezone);
-+ $formatted1 = ut_datefmt_format( $fmt , $localtime_entry);
-+ if( intl_get_error_code() == U_ZERO_ERROR){
-+ $res_str .= "\nFormatted localtime_array is : $formatted1";
-+ }else{
-+ $res_str .= "\nError while formatting as: '".intl_get_error_message()."'";
-+ }
-+ //Parsing
-+ $parsed_arr = ut_datefmt_localtime( $fmt, $formatted1 );
-+
-+ if( $parsed_arr){
-+ $res_str .= "\nParsed array is: ";
-+ foreach( $parsed_arr as $key => $value){
-+ $res_str .= "$key : '$value' , ";
-+ }
-+ }
-+/*
-+ else{
-+ //$res_str .= "No values found from LocaleTime parsing.";
-+ $res_str .= "\tError : '".intl_get_error_message()."'";
-+ }
-+*/
-+ }
-+ }
-+ }
-+
-+ return $res_str;
-+
-+}
-+
-+include_once( 'ut_common.inc' );
-+
-+// Run the test
-+ut_run();
-+?>
-+--EXPECT--
-+------------
-+
-+Input timestamp is : 0
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Thursday, January 1, 1970 at 5:00:00 AM GMT+05:00
-+Parsed timestamp is : 0
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : January 1, 1970 at 5:00:00 AM GMT+5
-+Parsed timestamp is : 0
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Jan 1, 1970, 5:00:00 AM
-+Parsed timestamp is : 0
-+------------
-+
-+Input timestamp is : -1200000
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Thursday, December 18, 1969 at 7:40:00 AM GMT+05:00
-+Parsed timestamp is : -1200000
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : December 18, 1969 at 7:40:00 AM GMT+5
-+Parsed timestamp is : -1200000
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Dec 18, 1969, 7:40:00 AM
-+Parsed timestamp is : -1200000
-+------------
-+
-+Input timestamp is : 1200000
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Thursday, January 15, 1970 at 2:20:00 AM GMT+05:00
-+Parsed timestamp is : 1200000
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : January 15, 1970 at 2:20:00 AM GMT+5
-+Parsed timestamp is : 1200000
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Jan 15, 1970, 2:20:00 AM
-+Parsed timestamp is : 1200000
-+------------
-+
-+Input timestamp is : 2200000000
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Monday, September 19, 2039 at 4:06:40 AM GMT+05:00
-+Parsed timestamp is : 2200000000
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : September 19, 2039 at 4:06:40 AM GMT+5
-+Parsed timestamp is : 2200000000
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Sep 19, 2039, 4:06:40 AM
-+Parsed timestamp is : 2200000000
-+------------
-+
-+Input timestamp is : -2200000000
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Sunday, April 15, 1900 at 5:53:20 AM GMT+05:00
-+Parsed timestamp is : -2200000000
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : April 15, 1900 at 5:53:20 AM GMT+5
-+Parsed timestamp is : -2200000000
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Apr 15, 1900, 5:53:20 AM
-+Parsed timestamp is : -2200000000
-+------------
-+
-+Input timestamp is : 90099999
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Thursday, November 9, 1972 at 12:46:39 AM GMT+05:00
-+Parsed timestamp is : 90099999
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : November 9, 1972 at 12:46:39 AM GMT+5
-+Parsed timestamp is : 90099999
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Nov 9, 1972, 12:46:39 AM
-+Parsed timestamp is : 90099999
-+------------
-+
-+Input timestamp is : 3600
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Thursday, January 1, 1970 at 6:00:00 AM GMT+05:00
-+Parsed timestamp is : 3600
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : January 1, 1970 at 6:00:00 AM GMT+5
-+Parsed timestamp is : 3600
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Jan 1, 1970, 6:00:00 AM
-+Parsed timestamp is : 3600
-+------------
-+
-+Input timestamp is : -3600
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted timestamp is : Thursday, January 1, 1970 at 4:00:00 AM GMT+05:00
-+Parsed timestamp is : -3600
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted timestamp is : January 1, 1970 at 4:00:00 AM GMT+5
-+Parsed timestamp is : -3600
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted timestamp is : Jan 1, 1970, 4:00:00 AM
-+Parsed timestamp is : -3600
-+------------
-+
-+Input localtime is : tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_mday : '3' , tm_mon : '3' , tm_year : '105' ,
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted localtime_array is : Sunday, April 3, 2005 at 7:03:24 PM GMT+05:00
-+Parsed array is: tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_year : '105' , tm_mday : '3' , tm_wday : '0' , tm_yday : '93' , tm_mon : '3' , tm_isdst : '0' ,
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted localtime_array is : April 3, 2005 at 7:03:24 PM GMT+5
-+Parsed array is: tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_year : '105' , tm_mday : '3' , tm_wday : '0' , tm_yday : '93' , tm_mon : '3' , tm_isdst : '0' ,
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted localtime_array is : Apr 3, 2005, 7:03:24 PM
-+Parsed array is: tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_year : '105' , tm_mday : '3' , tm_wday : '0' , tm_yday : '93' , tm_mon : '3' , tm_isdst : '0' ,
-+------------
-+
-+Input localtime is : tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_mday : '13' , tm_mon : '7' , tm_year : '205' ,
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted localtime_array is : Thursday, August 13, 2105 at 7:05:21 AM GMT+05:00
-+Parsed array is: tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_year : '205' , tm_mday : '13' , tm_wday : '4' , tm_yday : '225' , tm_mon : '7' , tm_isdst : '0' ,
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted localtime_array is : August 13, 2105 at 7:05:21 AM GMT+5
-+Parsed array is: tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_year : '205' , tm_mday : '13' , tm_wday : '4' , tm_yday : '225' , tm_mon : '7' , tm_isdst : '0' ,
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted localtime_array is : Aug 13, 2105, 7:05:21 AM
-+Parsed array is: tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_year : '205' , tm_mday : '13' , tm_wday : '4' , tm_yday : '225' , tm_mon : '7' , tm_isdst : '0' ,
-+------------
-+
-+Input localtime is : tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_mday : '17' , tm_mon : '11' , tm_year : '-5' ,
-+------------
-+
-+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
-+Formatted localtime_array is : Tuesday, December 17, 1895 at 12:13:11 AM GMT+05:00
-+Parsed array is: tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_year : '-5' , tm_mday : '17' , tm_wday : '2' , tm_yday : '351' , tm_mon : '11' , tm_isdst : '0' ,
-+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
-+Formatted localtime_array is : December 17, 1895 at 12:13:11 AM GMT+5
-+Parsed array is: tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_year : '-5' , tm_mday : '17' , tm_wday : '2' , tm_yday : '351' , tm_mon : '11' , tm_isdst : '0' ,
-+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
-+Formatted localtime_array is : Dec 17, 1895, 12:13:11 AM
-+Parsed array is: tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_year : '-5' , tm_mday : '17' , tm_wday : '2' , tm_yday : '351' , tm_mon : '11' , tm_isdst : '0' ,
-diff --git a/ext/intl/tests/dateformat_set_timezone_id3.phpt b/ext/intl/tests/dateformat_set_timezone_id3.phpt
-index e0d7cd0e5260..a4952eb5a3dc 100644
---- a/ext/intl/tests/dateformat_set_timezone_id3.phpt
-+++ b/ext/intl/tests/dateformat_set_timezone_id3.phpt
-@@ -6,6 +6,7 @@ date.timezone=Atlantic/Azores
- intl
- --SKIPIF--
- <?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1'); ?>
- --FILE--
- <?php
-
-diff --git a/ext/intl/tests/dateformat_set_timezone_id4.phpt b/ext/intl/tests/dateformat_set_timezone_id4.phpt
-new file mode 100644
-index 000000000000..aedf886da2dd
---- /dev/null
-+++ b/ext/intl/tests/dateformat_set_timezone_id4.phpt
-@@ -0,0 +1,85 @@
-+--TEST--
-+datefmt_set_timezone_id_code() icu >= 4.8
-+--INI--
-+date.timezone=Atlantic/Azores
-+--EXTENSIONS--
-+intl
-+--SKIPIF--
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
-+--FILE--
-+<?php
-+
-+ini_set("intl.error_level", E_WARNING);
-+
-+/*
-+ * Test for the datefmt_set_timezone_id function
-+ */
-+
-+
-+function ut_main()
-+{
-+ $timezone_id_arr = array (
-+ 'America/New_York',
-+ 'America/Los_Angeles',
-+ 'America/Chicago',
-+ 'CN'
-+ );
-+ $timestamp_entry = 0;
-+
-+ $res_str = '';
-+
-+ $fmt = ut_datefmt_create( "en_US", IntlDateFormatter::FULL, IntlDateFormatter::FULL, 'US/Pacific' , IntlDateFormatter::GREGORIAN );
-+ $timezone_id = ut_datefmt_get_timezone_id( $fmt );
-+ $res_str .= "\nAfter creation of the dateformatter : timezone_id= $timezone_id\n";
-+
-+ foreach( $timezone_id_arr as $timezone_id_entry )
-+ {
-+
-+ $res_str .= "-----------";
-+ $res_str .= "\nTrying to set timezone_id= $timezone_id_entry";
-+ ut_datefmt_set_timezone_id( $fmt , $timezone_id_entry );
-+ $timezone_id = ut_datefmt_get_timezone_id( $fmt );
-+ $res_str .= "\nAfter call to set_timezone_id : timezone_id= $timezone_id";
-+ $formatted = ut_datefmt_format( $fmt, 0);
-+ $res_str .= "\nFormatting timestamp=0 resulted in $formatted";
-+ $formatted = ut_datefmt_format( $fmt, 3600);
-+ $res_str .= "\nFormatting timestamp=3600 resulted in $formatted";
-+ $res_str .= "\n";
-+
-+ }
-+
-+ return $res_str;
-+
-+}
-+
-+include_once( 'ut_common.inc' );
-+
-+// Run the test
-+ut_run();
-+?>
-+--EXPECTF--
-+Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
-+
-+Warning: datefmt_set_timezone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
-+
-+After creation of the dateformatter : timezone_id= US/Pacific
-+-----------
-+Trying to set timezone_id= America/New_York
-+After call to set_timezone_id : timezone_id= America/New_York
-+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 7:00:00 PM Eastern Standard Time
-+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 8:00:00 PM Eastern Standard Time
-+-----------
-+Trying to set timezone_id= America/Los_Angeles
-+After call to set_timezone_id : timezone_id= America/Los_Angeles
-+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 4:00:00 PM Pacific Standard Time
-+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 5:00:00 PM Pacific Standard Time
-+-----------
-+Trying to set timezone_id= America/Chicago
-+After call to set_timezone_id : timezone_id= America/Chicago
-+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 6:00:00 PM Central Standard Time
-+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 7:00:00 PM Central Standard Time
-+-----------
-+Trying to set timezone_id= CN
-+After call to set_timezone_id : timezone_id= America/Chicago
-+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 6:00:00 PM Central Standard Time
-+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 7:00:00 PM Central Standard Time
-diff --git a/ext/intl/tests/msgfmt_format_datetime.phpt b/ext/intl/tests/msgfmt_format_datetime.phpt
-index 8b3e37ab30f5..e6a7451906f7 100644
---- a/ext/intl/tests/msgfmt_format_datetime.phpt
-+++ b/ext/intl/tests/msgfmt_format_datetime.phpt
-@@ -6,6 +6,7 @@
- <?php
- if (!extension_loaded('intl'))
- die('skip intl extension not enabled');
-+if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1');
- --FILE--
- <?php
- ini_set("intl.error_level", E_WARNING);
-diff --git a/ext/intl/tests/msgfmt_format_datetime2.phpt b/ext/intl/tests/msgfmt_format_datetime2.phpt
-new file mode 100644
-index 000000000000..743b1d8b11c5
---- /dev/null
-+++ b/ext/intl/tests/msgfmt_format_datetime2.phpt
-@@ -0,0 +1,29 @@
-+--TEST--
-+MessageFormatter::format(): DateTime accepted to format dates and times
-+--INI--
-+date.timezone=Atlantic/Azores
-+--EXTENSIONS--
-+intl
-+--SKIPIF--
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
-+--FILE--
-+<?php
-+ini_set("intl.error_level", E_WARNING);
-+//ini_set("intl.default_locale", "nl");
-+
-+$fmt = <<<EOD
-+{0,date} {0,time}
-+EOD;
-+
-+$dt = new DateTime("2012-05-06 18:00:42", new DateTimeZone("Europe/Lisbon"));
-+$dti = new DateTimeImmutable("2012-05-06 18:00:42", new DateTimeZone("Europe/Lisbon"));
-+
-+$mf = new MessageFormatter('en_US', $fmt);
-+
-+var_dump($mf->format(array($dt)));
-+var_dump($mf->format(array($dti)));
-+
-+?>
-+--EXPECT--
-+string(24) "May 6, 2012 5:00:42 PM"
-+string(24) "May 6, 2012 5:00:42 PM"
-diff --git a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
-index 9bc38b683cd0..f92eaa2bdb54 100644
---- a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
-+++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
-@@ -6,6 +6,7 @@
- <?php
- if (!extension_loaded('intl'))
- die('skip intl extension not enabled');
-+if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1');
- --FILE--
- <?php
- ini_set("intl.error_level", E_WARNING);
-diff --git a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings2.phpt b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings2.phpt
-new file mode 100644
-index 000000000000..67093ddd8604
---- /dev/null
-+++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings2.phpt
-@@ -0,0 +1,54 @@
-+--TEST--
-+MessageFormatter::format(): simple types handling with numeric strings
-+--INI--
-+date.timezone=Atlantic/Azores
-+--EXTENSIONS--
-+intl
-+--SKIPIF--
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
-+--FILE--
-+<?php
-+ini_set("intl.error_level", E_WARNING);
-+//ini_set("intl.default_locale", "nl");
-+
-+$mf = new MessageFormatter('en_US',"
-+ none {a}
-+ number {b,number}
-+ number integer {c,number,integer}
-+ number currency {d,number,currency}
-+ number percent {e,number,percent}
-+ date {f,date}
-+ time {g,time}
-+ spellout {h,spellout}
-+ ordinal {i,ordinal}
-+ duration {j,duration}
-+");
-+
-+$ex = "1336317965.5 str";
-+var_dump($mf->format(array(
-+'a' => $ex,
-+'b' => $ex,
-+'c' => $ex,
-+'d' => $ex,
-+'e' => $ex,
-+'f' => " 1336317965.5",
-+'g' => " 1336317965.5",
-+'h' => $ex,
-+'i' => $ex,
-+'j' => $ex,
-+)));
-+
-+?>
-+--EXPECTF--
-+string(%d) "
-+ none 1336317965.5 str
-+ number 1,336,317,965.5
-+ number integer 1,336,317,965
-+ number currency $1,336,317,965.50
-+ number percent 133,631,796,550%
-+ date May %d, 2012
-+ time 3:26:05 PM
-+ spellout one billion three hundred thirty-six million three hundred seventeen thousand nine hundred sixty-five point five
-+ ordinal 1,336,317,966th
-+ duration 371,199:26:06
-+"
-diff --git a/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt b/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt
-index 31250027184b..5aefcf268dff 100644
---- a/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt
-+++ b/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt
-@@ -6,6 +6,7 @@ date.timezone=Atlantic/Azores
- intl
- --SKIPIF--
- <?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') >= 0) die('skip for ICU < 72.1'); ?>
- --FILE--
- <?php
- ini_set("intl.error_level", E_WARNING);
-diff --git a/ext/intl/tests/resourcebundle_null_mandatory_args_variant3.phpt b/ext/intl/tests/resourcebundle_null_mandatory_args_variant3.phpt
-new file mode 100644
-index 000000000000..d3e2615e0f49
---- /dev/null
-+++ b/ext/intl/tests/resourcebundle_null_mandatory_args_variant3.phpt
-@@ -0,0 +1,24 @@
-+--TEST--
-+ResourceBundle constructor bundle accepts NULL for first two arguments
-+--INI--
-+date.timezone=Atlantic/Azores
-+--EXTENSIONS--
-+intl
-+--SKIPIF--
-+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
-+--FILE--
-+<?php
-+ini_set("intl.error_level", E_WARNING);
-+
-+$r = new ResourceBundle('en_US', NULL);
-+$c = $r->get('calendar')->get('gregorian')->get('DateTimePatterns')->get(0);
-+var_dump($c);
-+
-+ini_set('intl.default_locale', 'pt_PT');
-+$r = new ResourceBundle(NULL, NULL);
-+$c = $r->get('calendar')->get('gregorian')->get('DateTimePatterns')->get(0);
-+var_dump($c);
-+?>
-+--EXPECT--
-+string(16) "h:mm:ss a zzzz"
-+string(13) "HH:mm:ss zzzz"
diff --git a/testing/php7/fix-tests-devserver.patch b/testing/php7/fix-tests-devserver.patch
deleted file mode 100644
index 44e4d43c972a..000000000000
--- a/testing/php7/fix-tests-devserver.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Mon, 01 May 2017 01:33:00 +0200
-Subject: [PATCH] Fix tests failing due to extra message from built-in web server
-
-Remove messages like:
-
- PHP 7.1.4 Development Server started at Mon May 1 00:42:39 2017
-
-from test outputs, because tests do not expect them. I have no clue what
-happens here...
-
---- a/run-tests.php
-+++ b/run-tests.php
-@@ -2503,6 +2503,9 @@
- // Does the output match what is expected?
- $output = preg_replace("/\r\n/", "\n", trim($out));
-
-+ // Remove message from built-in development server.
-+ $output = preg_replace("/^PHP [0-9.]+ Development Server started at .*\n\n?/m", "", $output);
-+
- /* when using CGI, strip the headers from the output */
- $headers = array();
-
diff --git a/testing/php7/includedir.patch b/testing/php7/includedir.patch
deleted file mode 100644
index c8874df69c2b..000000000000
--- a/testing/php7/includedir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/scripts/Makefile.frag
-+++ b/scripts/Makefile.frag
-@@ -2,7 +2,7 @@
- # Build environment install
- #
-
--phpincludedir = $(includedir)/php
-+phpincludedir = $(includedir)/php7
- phpbuilddir = $(libdir)/build
-
- BUILD_FILES = \
---- a/ext/pdo/Makefile.frag
-+++ b/ext/pdo/Makefile.frag
-@@ -1,4 +1,4 @@
--phpincludedir=$(prefix)/include/php
-+phpincludedir=$(prefix)/include/php7
-
- PDO_HEADER_FILES= \
- php_pdo.h \
---- a/scripts/php-config.in
-+++ b/scripts/php-config.in
-@@ -6,7 +6,7 @@
- exec_prefix="@exec_prefix@"
- version="@PHP_VERSION@"
- vernum="@PHP_VERSION_ID@"
--include_dir="@includedir@/php"
-+include_dir="@includedir@/php7"
- includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
- ldflags="@PHP_LDFLAGS@"
- libs="@EXTRA_LIBS@"
---- a/scripts/phpize.in
-+++ b/scripts/phpize.in
-@@ -5,7 +5,7 @@
- datarootdir='@datarootdir@'
- exec_prefix="`eval echo @exec_prefix@`"
- phpdir="`eval echo @libdir@`/build"
--includedir="`eval echo @includedir@`/php"
-+includedir="`eval echo @includedir@`/php7"
- builddir="`pwd`"
- SED="@SED@"
-
diff --git a/testing/php7/install-pear.patch b/testing/php7/install-pear.patch
deleted file mode 100644
index 831f60ab0c48..000000000000
--- a/testing/php7/install-pear.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./pear/Makefile.frag.orig 2013-04-12 07:02:27.041602514 +0000
-+++ ./pear/Makefile.frag 2013-04-12 07:04:09.065836822 +0000
-@@ -1,7 +1,10 @@
- peardir=$(PEAR_INSTALLDIR)
-
-+# help the built php to find xml extension so we can install pear
-+PEAR_INSTALL_XML_FLAGS = -d extension_dir="$(top_builddir)/modules" -d extension=xml.so
-+
- # Skip all php.ini files altogether
--PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
-+PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 $(PEAR_INSTALL_XML_FLAGS)
-
- WGET = `which wget 2>/dev/null`
- FETCH = `which fetch 2>/dev/null`
diff --git a/testing/php7/openssl3.patch b/testing/php7/openssl3.patch
deleted file mode 100644
index 6400e37ff6c7..000000000000
--- a/testing/php7/openssl3.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From a7df3564004807b812f189048463d8ad89fb0f21 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 18 May 2021 07:58:49 +0200
-Subject: [PATCH] minimal fix for openssl 3.0
-
----
- ext/openssl/openssl.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
-index 340e40a001bb..0ed4233b2125 100644
---- a/ext/openssl/openssl.c
-+++ b/ext/openssl/openssl.c
-@@ -1221,7 +1221,9 @@ PHP_MINIT_FUNCTION(openssl)
- REGISTER_LONG_CONSTANT("OPENSSL_CMS_NOSIGS", CMS_NOSIGS, CONST_CS|CONST_PERSISTENT);
-
- REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT);
-+#ifdef RSA_SSLV23_PADDING
- REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT);
-+#endif
- REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT);
-
-From 1887f2274cf7b2e19daf911df76313286ded6381 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv@gmail.com>
-Date: Tue, 3 Aug 2021 17:19:24 +0200
-Subject: [PATCH] Use OpenSSL NCONF APIs
-
----
- ext/openssl/openssl.c | 66 +++++++++++++++++++++++--------------------
- 1 file changed, 36 insertions(+), 30 deletions(-)
-
-diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
-index 9f5018d2fd75..8589fbaac164 100644
---- a/ext/openssl/openssl.c
-+++ b/ext/openssl/openssl.c
-@@ -487,8 +487,8 @@ int php_openssl_get_ssl_stream_data_index(void)
- static char default_ssl_conf_filename[MAXPATHLEN];
-
- struct php_x509_request { /* {{{ */
-- LHASH_OF(CONF_VALUE) * global_config; /* Global SSL config */
-- LHASH_OF(CONF_VALUE) * req_config; /* SSL config for this request */
-+ CONF *global_config; /* Global SSL config */
-+ CONF *req_config; /* SSL config for this request */
- const EVP_MD * md_alg;
- const EVP_MD * digest;
- char * section_name,
-@@ -700,13 +700,13 @@ static time_t php_openssl_asn1_time_to_time_t(ASN1_UTCTIME * timestr) /* {{{ */
- }
- /* }}} */
-
--static inline int php_openssl_config_check_syntax(const char * section_label, const char * config_filename, const char * section, LHASH_OF(CONF_VALUE) * config) /* {{{ */
-+static inline int php_openssl_config_check_syntax(const char * section_label, const char * config_filename, const char * section, CONF *config) /* {{{ */
- {
- X509V3_CTX ctx;
-
- X509V3_set_ctx_test(&ctx);
-- X509V3_set_conf_lhash(&ctx, config);
-- if (!X509V3_EXT_add_conf(config, &ctx, (char *)section, NULL)) {
-+ X509V3_set_nconf(&ctx, config);
-+ if (!X509V3_EXT_add_nconf(config, &ctx, (char *)section, NULL)) {
- php_openssl_store_errors();
- php_error_docref(NULL, E_WARNING, "Error loading %s section %s of %s",
- section_label,
-@@ -718,17 +718,24 @@ static inline int php_openssl_config_check_syntax(const char * section_label, co
- }
- /* }}} */
-
--static char *php_openssl_conf_get_string(
-- LHASH_OF(CONF_VALUE) *conf, const char *group, const char *name) {
-- char *str = CONF_get_string(conf, group, name);
-- if (str == NULL) {
-- /* OpenSSL reports an error if a configuration value is not found.
-- * However, we don't want to generate errors for optional configuration. */
-- ERR_clear_error();
-- }
-+static char *php_openssl_conf_get_string(CONF *conf, const char *group, const char *name) {
-+ /* OpenSSL reports an error if a configuration value is not found.
-+ * However, we don't want to generate errors for optional configuration. */
-+ ERR_set_mark();
-+ char *str = NCONF_get_string(conf, group, name);
-+ ERR_pop_to_mark();
- return str;
- }
-
-+static long php_openssl_conf_get_number(CONF *conf, const char *group, const char *name) {
-+ /* Same here, ignore errors. */
-+ long res = 0;
-+ ERR_set_mark();
-+ NCONF_get_number(conf, group, name, &res);
-+ ERR_pop_to_mark();
-+ return res;
-+}
-+
- static int php_openssl_add_oid_section(struct php_x509_request * req) /* {{{ */
- {
- char * str;
-@@ -740,7 +747,7 @@ static int php_openssl_add_oid_section(struct php_x509_request * req) /* {{{ */
- if (str == NULL) {
- return SUCCESS;
- }
-- sktmp = CONF_get_section(req->req_config, str);
-+ sktmp = NCONF_get_section(req->req_config, str);
- if (sktmp == NULL) {
- php_openssl_store_errors();
- php_error_docref(NULL, E_WARNING, "Problem loading oid section %s", str);
-@@ -811,13 +818,13 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option
-
- SET_OPTIONAL_STRING_ARG("config", req->config_filename, default_ssl_conf_filename);
- SET_OPTIONAL_STRING_ARG("config_section_name", req->section_name, "req");
-- req->global_config = CONF_load(NULL, default_ssl_conf_filename, NULL);
-- if (req->global_config == NULL) {
-+ req->global_config = NCONF_new(NULL);
-+ if (!NCONF_load(req->global_config, default_ssl_conf_filename, NULL)) {
- php_openssl_store_errors();
- }
-- req->req_config = CONF_load(NULL, req->config_filename, NULL);
-- if (req->req_config == NULL) {
-- php_openssl_store_errors();
-+
-+ req->req_config = NCONF_new(NULL);
-+ if (!NCONF_load(req->req_config, req->config_filename, NULL)) {
- return FAILURE;
- }
-
-@@ -841,8 +848,7 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option
- SET_OPTIONAL_STRING_ARG("req_extensions", req->request_extensions_section,
- php_openssl_conf_get_string(req->req_config, req->section_name, "req_extensions"));
- SET_OPTIONAL_LONG_ARG("private_key_bits", req->priv_key_bits,
-- CONF_get_number(req->req_config, req->section_name, "default_bits"));
--
-+ php_openssl_conf_get_number(req->req_config, req->section_name, "default_bits"));
- SET_OPTIONAL_LONG_ARG("private_key_type", req->priv_key_type, OPENSSL_KEYTYPE_DEFAULT);
-
- if (optional_args && (item = zend_hash_str_find(Z_ARRVAL_P(optional_args), "encrypt_key", sizeof("encrypt_key")-1)) != NULL) {
-@@ -922,11 +928,11 @@ static void php_openssl_dispose_config(struct php_x509_request * req) /* {{{ */
- req->priv_key = NULL;
- }
- if (req->global_config) {
-- CONF_free(req->global_config);
-+ NCONF_free(req->global_config);
- req->global_config = NULL;
- }
- if (req->req_config) {
-- CONF_free(req->req_config);
-+ NCONF_free(req->req_config);
- req->req_config = NULL;
- }
- }
-@@ -2808,12 +2814,12 @@ static int php_openssl_make_REQ(struct php_x509_request * req, X509_REQ * csr, z
- STACK_OF(CONF_VALUE) * dn_sk, *attr_sk = NULL;
- char * str, *dn_sect, *attr_sect;
-
-- dn_sect = CONF_get_string(req->req_config, req->section_name, "distinguished_name");
-+ dn_sect = NCONF_get_string(req->req_config, req->section_name, "distinguished_name");
- if (dn_sect == NULL) {
- php_openssl_store_errors();
- return FAILURE;
- }
-- dn_sk = CONF_get_section(req->req_config, dn_sect);
-+ dn_sk = NCONF_get_section(req->req_config, dn_sect);
- if (dn_sk == NULL) {
- php_openssl_store_errors();
- return FAILURE;
-@@ -2822,7 +2828,7 @@ static int php_openssl_make_REQ(struct php_x509_request * req, X509_REQ * csr, z
- if (attr_sect == NULL) {
- attr_sk = NULL;
- } else {
-- attr_sk = CONF_get_section(req->req_config, attr_sect);
-+ attr_sk = NCONF_get_section(req->req_config, attr_sect);
- if (attr_sk == NULL) {
- php_openssl_store_errors();
- return FAILURE;
-@@ -3239,8 +3245,8 @@ PHP_FUNCTION(openssl_csr_sign)
- X509V3_CTX ctx;
-
- X509V3_set_ctx(&ctx, cert, new_cert, csr, NULL, 0);
-- X509V3_set_conf_lhash(&ctx, req.req_config);
-- if (!X509V3_EXT_add_conf(req.req_config, &ctx, req.extensions_section, new_cert)) {
-+ X509V3_set_nconf(&ctx, req.req_config);
-+ if (!X509V3_EXT_add_nconf(req.req_config, &ctx, req.extensions_section, new_cert)) {
- php_openssl_store_errors();
- goto cleanup;
- }
-@@ -3313,10 +3319,10 @@ PHP_FUNCTION(openssl_csr_new)
- X509V3_CTX ext_ctx;
-
- X509V3_set_ctx(&ext_ctx, NULL, NULL, csr, NULL, 0);
-- X509V3_set_conf_lhash(&ext_ctx, req.req_config);
-+ X509V3_set_nconf(&ext_ctx, req.req_config);
-
- /* Add extensions */
-- if (req.request_extensions_section && !X509V3_EXT_REQ_add_conf(req.req_config,
-+ if (req.request_extensions_section && !X509V3_EXT_REQ_add_nconf(req.req_config,
- &ext_ctx, req.request_extensions_section, csr))
- {
- php_openssl_store_errors();
diff --git a/testing/php7/php7-fpm-version-suffix.patch b/testing/php7/php7-fpm-version-suffix.patch
deleted file mode 100644
index d480f7a0c9ad..000000000000
--- a/testing/php7/php7-fpm-version-suffix.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/sapi/fpm/fpm/fpm_conf.c
-+++ b/sapi/fpm/fpm/fpm_conf.c
-@@ -1212,7 +1212,7 @@
- }
-
- if (!fpm_global_config.error_log) {
-- fpm_global_config.error_log = strdup("log/php-fpm.log");
-+ fpm_global_config.error_log = strdup("log/php7/error.log");
- }
-
- #ifdef HAVE_SYSTEMD
-@@ -1223,7 +1223,7 @@
-
- #ifdef HAVE_SYSLOG_H
- if (!fpm_global_config.syslog_ident) {
-- fpm_global_config.syslog_ident = strdup("php-fpm");
-+ fpm_global_config.syslog_ident = strdup("php-fpm7");
- }
-
- if (fpm_global_config.syslog_facility < 0) {
-@@ -1722,7 +1722,7 @@
- if (fpm_globals.prefix == NULL) {
- spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
- } else {
-- spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix);
-+ spprintf(&tmp, 0, "%s/etc/php7/php-fpm.conf", fpm_globals.prefix);
- }
-
- if (!tmp) {
-
---- a/sapi/fpm/php-fpm.conf.in
-+++ b/sapi/fpm/php-fpm.conf.in
-@@ -16,3 +16,3 @@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+;pid = run/php-fpm7.pid
-
-@@ -22,4 +22,4 @@
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
--; Default Value: log/php-fpm.log
--;error_log = log/php-fpm.log
-+; Default Value: log/php7/error.log
-+;error_log = log/php7/error.log
-
-@@ -35,4 +35,4 @@
- ; which must suit common needs.
--; Default Value: php-fpm
--;syslog.ident = php-fpm
-+; Default Value: php-fpm7
-+;syslog.ident = php-fpm7
-
---- a/sapi/fpm/www.conf.in
-+++ b/sapi/fpm/www.conf.in
-@@ -257,7 +257,7 @@
-
- ; The access log file
- ; Default: not set
--;access.log = log/$pool.access.log
-+;access.log = log/php7/$pool.access.log
-
- ; The access log format.
- ; The following syntax is allowed
-@@ -321,7 +321,7 @@
- ; The log file for slow requests
- ; Default Value: not set
- ; Note: slowlog is mandatory if request_slowlog_timeout is set
--;slowlog = log/$pool.log.slow
-+;slowlog = log/php7/$pool.slow.log
-
- ; The timeout for serving a single request after which a PHP backtrace will be
- ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-@@ -434,6 +434,6 @@
- ; specified at startup with the -d argument
- ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
- ;php_flag[display_errors] = off
--;php_admin_value[error_log] = /var/log/fpm-php.www.log
-+;php_admin_value[error_log] = /var/log/php7/$pool.error.log
- ;php_admin_flag[log_errors] = on
- ;php_admin_value[memory_limit] = 32M
diff --git a/testing/php7/php7-fpm.initd b/testing/php7/php7-fpm.initd
deleted file mode 100644
index f56fdb523422..000000000000
--- a/testing/php7/php7-fpm.initd
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/sbin/openrc-run
-
-# If you want to run separate master process per pool, then create a symlink
-# to this runscript for each pool. In that mode, the php-fpm daemon is started
-# as nobody by default. You can override the user (and group) by declaring
-# variable "user" and optionally "group" in conf.d file, or in the $fpm_config
-# file (the former has precedence).
-
-: ${name:="PHP FastCGI Process Manager"}
-
-command="/usr/sbin/php-fpm7"
-command_background="yes"
-start_stop_daemon_args="--quiet"
-pidfile="/run/$RC_SVCNAME/php-fpm.pid"
-retry="SIGTERM/20"
-
-# configtest is here only for backward compatibility
-extra_commands="checkconfig configtest"
-extra_started_commands="reload reopen"
-description_checkconfig="Run php-fpm config check"
-description_reload="Gracefully reload workers and config"
-description_reopen="Reopen log files"
-
-required_files="$fpm_config"
-
-depend() {
- need net
- use apache2 lighttpd nginx
-}
-
-init_vars() {
- # Defaults for single master process with multiple pools
- if [ "$RC_SVCNAME" = "php-fpm7" ]; then
- : ${fpm_config:="/etc/php7/php-fpm.conf"}
- : ${user:="root"}
- # Defaults for master process per pool
- else
- : ${fpm_config="/etc/php7/php-fpm.d/${RC_SVCNAME#php-fpm7.}.conf"}
- : ${user:="$(conf_get user)"}
- : ${user:="nobody"}
- : ${group:="$(conf_get group)"}
- fi
- command_args="--nodaemonize --fpm-config $fpm_config"
- start_stop_daemon_args="$start_stop_daemon_args
- --user $user ${group:+"--group $group"}"
-}
-
-start_pre() {
- checkconfig || return 1
-
- # If unix socket is used (instead of TCP/IP), then ensure that the
- # directory exists and has correct privileges.
- local listen="$(conf_get listen)"
- if [ "${listen:0:1}" = "/" ]; then
- checkpath -d -o $user:$group "$(dirname "$listen")"
- fi
-
- checkpath -d "$(dirname "$pidfile")"
-}
-
-reload() {
- ebegin "Reloading $name"
- start-stop-daemon --signal USR2 --pidfile "$pidfile"
- eend $?
-}
-
-reopen() {
- ebegin "Reopening $name log files"
- start-stop-daemon --signal USR1 --pidfile "$pidfile"
- eend $?
-}
-
-checkconfig() {
- init_vars
- ebegin "Checking $fpm_config"
-
- local out
- out="$(su -s /bin/sh -c "$command --test --fpm-config $fpm_config" $user 2>&1)" || {
- printf "%s\n" "$out"
- eend 1 "failed, please correct errors above"
- return 1
- }
-}
-
-configtest() {
- ewarn "configtest is deprecated, use checkconfig instead"
- checkconfig
-}
-
-conf_get() {
- local key="$1"
- sed -nE "s/^${key}\s*=\s*\"?([^\";]+).*/\1/p" "$fpm_config" | head -n 1
-}
diff --git a/testing/php7/php7-fpm.logrotate b/testing/php7/php7-fpm.logrotate
deleted file mode 100644
index 10e53e46832a..000000000000
--- a/testing/php7/php7-fpm.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/php7/*.log {
- rotate 7
- daily
- missingok
- notifempty
- delaycompress
- compress
- dateext
- sharedscripts
- postrotate
- /etc/init.d/php-fpm7 --ifstarted --quiet reopen
- endscript
-}
diff --git a/testing/php7/php7-module.conf b/testing/php7/php7-module.conf
deleted file mode 100644
index 4c26b8f1cac6..000000000000
--- a/testing/php7/php7-module.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-LoadModule php7_module modules/mod_php7.so
-
-DirectoryIndex index.php index.html
-
-<FilesMatch \.php$>
- SetHandler application/x-httpd-php
-</FilesMatch>
-
-# Uncomment the following to allow .phps files to be handled by the php source filter,
-# and displayed as syntax-highlighted source code
-#<FilesMatch "\.phps$">
-# SetHandler application/x-httpd-php-source
-#</FilesMatch>
diff --git a/testing/php7/sharedir.patch b/testing/php7/sharedir.patch
deleted file mode 100644
index 2963e89da37b..000000000000
--- a/testing/php7/sharedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/php.ini-production 2018-07-28 18:05:51.737130931 +0300
-+++ b/php.ini-production 2018-07-28 18:06:45.177774666 +0300
-@@ -733,7 +733,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/php7"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
diff --git a/testing/php7/xfail-openssl-1.1-test.patch b/testing/php7/xfail-openssl-1.1-test.patch
deleted file mode 100644
index f607cc143c69..000000000000
--- a/testing/php7/xfail-openssl-1.1-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt
-index e4ea264b3b..fd1f7ef9d3 100644
---- a/ext/openssl/tests/openssl_error_string_basic.phpt
-+++ b/ext/openssl/tests/openssl_error_string_basic.phpt
-@@ -2,6 +2,8 @@
- openssl_error_string() tests
- --SKIPIF--
- <?php if (!extension_loaded("openssl")) print "skip"; ?>
-+--XFAIL--
-+Somehow unstable
- --FILE--
- <?php
- // helper function to check openssl errors
--
GitLab