From bbc9e8267b2345f0af6d8b7b8c4f76979050033d Mon Sep 17 00:00:00 2001 From: ARI WG Git Bot Date: Thu, 2 Jul 2026 00:50:39 +0000 Subject: [PATCH 1/3] Add php 8.4.23 for stack(s) cflinuxfs4, cflinuxfs5 --- manifest.yml | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) diff --git a/manifest.yml b/manifest.yml index b1c7cf2bb..c656b85e9 100644 --- a/manifest.yml +++ b/manifest.yml @@ -882,6 +882,246 @@ dependencies: - name: zip - name: zlib version: +- name: php + version: 8.4.23 + uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.4.23_linux_x64_cflinuxfs4_fae098d7.tgz + sha256: fae098d71238ed163753790ee88f5eddfe6c13838f14d1e169d16389fe903726 + cf_stacks: + - cflinuxfs4 + source: https://php.net/distributions/php-8.4.23.tar.gz + source_sha256: f43b69572cabfb91c023356f3ce197c782d8a255bc084c1a6af58c0e86cf7573 + dependencies: + - name: amqp + version: 2.1.2 + - name: apcu + version: 5.1.28 + - name: bz2 + version: + - name: curl + version: + - name: dba + version: + - name: enchant + - name: exif + version: + - name: fileinfo + version: + - name: ftp + version: + - name: gd + - name: gettext + version: + - name: gmp + version: + - name: igbinary + version: 3.2.15 + - name: imagick + version: 3.7.0 + - name: ioncube + version: 15.5.0 + - name: ldap + version: + - name: lzf + version: + - name: mailparse + version: 3.1.6 + - name: maxminddb + version: 1.11.1 + - name: mbstring + version: + - name: memcached + version: 3.2.0 + - name: mongodb + version: 2.2.1 + - name: msgpack + version: 2.2.0 + - name: mysqli + version: + - name: oauth + version: 2.0.10 + - name: opcache + version: + - name: openssl + version: + - name: pcntl + version: + - name: pdo + version: + - name: pdo_firebird + - name: pdo_mysql + version: + - name: pdo_odbc + - name: pdo_pgsql + version: + - name: pdo_sqlite + version: + - name: pdo_sqlsrv + version: 5.12.0 + - name: pgsql + version: + - name: phpiredis + version: 1.0.1 + - name: psr + version: 1.2.0 + - name: rdkafka + version: 6.0.3 + - name: readline + - name: redis + version: 6.1.0 + - name: shmop + version: + - name: snmp + - name: soap + version: + - name: sockets + version: + - name: sodium + - name: solr + version: 2.9.3 + - name: sqlsrv + version: 5.12.0 + - name: ssh2 + version: 1.4.1 + - name: stomp + version: 2.0.3 + - name: sysvmsg + version: + - name: sysvsem + version: + - name: sysvshm + version: + - name: tidy + - name: xdebug + version: 3.4.0 + - name: xsl + version: + - name: yaf + version: 3.3.7 + - name: yaml + version: 2.2.3 + - name: zip + - name: zlib + version: +- name: php + version: 8.4.23 + uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.4.23_linux_x64_cflinuxfs5_6452c8c8.tgz + sha256: 6452c8c8ad2c355710e2131a989788e84c100022742e3e6b33644fdaabb12cab + cf_stacks: + - cflinuxfs5 + source: https://php.net/distributions/php-8.4.23.tar.gz + source_sha256: f43b69572cabfb91c023356f3ce197c782d8a255bc084c1a6af58c0e86cf7573 + dependencies: + - name: amqp + version: 2.1.2 + - name: apcu + version: 5.1.28 + - name: bz2 + version: + - name: curl + version: + - name: dba + version: + - name: enchant + - name: exif + version: + - name: fileinfo + version: + - name: ftp + version: + - name: gd + - name: gettext + version: + - name: gmp + version: + - name: igbinary + version: 3.2.15 + - name: imagick + version: 3.7.0 + - name: ioncube + version: 15.5.0 + - name: ldap + version: + - name: lzf + version: + - name: mailparse + version: 3.1.6 + - name: maxminddb + version: 1.11.1 + - name: mbstring + version: + - name: memcached + version: 3.2.0 + - name: mongodb + version: 2.2.1 + - name: msgpack + version: 2.2.0 + - name: mysqli + version: + - name: oauth + version: 2.0.10 + - name: opcache + version: + - name: openssl + version: + - name: pcntl + version: + - name: pdo + version: + - name: pdo_firebird + - name: pdo_mysql + version: + - name: pdo_odbc + - name: pdo_pgsql + version: + - name: pdo_sqlite + version: + - name: pdo_sqlsrv + version: 5.12.0 + - name: pgsql + version: + - name: phpiredis + version: 1.0.1 + - name: psr + version: 1.2.0 + - name: rdkafka + version: 6.0.3 + - name: readline + - name: redis + version: 6.1.0 + - name: shmop + version: + - name: snmp + - name: soap + version: + - name: sockets + version: + - name: sodium + - name: solr + version: 2.9.3 + - name: sqlsrv + version: 5.12.0 + - name: ssh2 + version: 1.4.1 + - name: stomp + version: 2.0.3 + - name: sysvmsg + version: + - name: sysvsem + version: + - name: sysvshm + version: + - name: tidy + - name: xdebug + version: 3.4.0 + - name: xsl + version: + - name: yaf + version: 3.3.7 + - name: yaml + version: 2.2.3 + - name: zip + - name: zlib + version: - name: php version: 8.5.7 uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.5.7_linux_x64_cflinuxfs4_187fb86b.tgz From d68d451324d60b04ee606053e41750840ecbc3c6 Mon Sep 17 00:00:00 2001 From: ivanovac Date: Thu, 2 Jul 2026 17:00:31 +0300 Subject: [PATCH 2/3] fix test timeout on docker call --- src/php/unit/unit_suite_test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/php/unit/unit_suite_test.go b/src/php/unit/unit_suite_test.go index e97a6fb05..9333d5b1e 100644 --- a/src/php/unit/unit_suite_test.go +++ b/src/php/unit/unit_suite_test.go @@ -1,12 +1,12 @@ package unit_test import ( + "context" "os/exec" "time" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/onsi/gomega/gexec" "testing" ) @@ -17,11 +17,7 @@ func TestUnit(t *testing.T) { } func IsDockerAvailable() bool { - cmd := exec.Command("docker", "system", "info") - - session, err := gexec.Start(cmd, nil, nil) - Expect(err).ToNot(HaveOccurred()) - - session.Wait(5 * time.Second) - return session.ExitCode() == 0 + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + return exec.CommandContext(ctx, "docker", "system", "info").Run() == nil } From 78ae05a16d2bbf8235e8858b7677d98452f882c5 Mon Sep 17 00:00:00 2001 From: Tsvetelina Marinova Date: Thu, 2 Jul 2026 17:14:33 +0300 Subject: [PATCH 3/3] delete dependencies for php version 8.4.21 --- manifest.yml | 120 --------------------------------------------------- 1 file changed, 120 deletions(-) diff --git a/manifest.yml b/manifest.yml index c656b85e9..1ee0e1d62 100644 --- a/manifest.yml +++ b/manifest.yml @@ -762,126 +762,6 @@ dependencies: - name: zip - name: zlib version: -- name: php - version: 8.4.21 - uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.4.21_linux_x64_cflinuxfs4_cae162ac.tgz - sha256: cae162acf8680b4ef36a4edaeb3d8d86b0cb5e91ba03680272d2a0600128a233 - cf_stacks: - - cflinuxfs4 - source: https://php.net/distributions/php-8.4.21.tar.gz - source_sha256: db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48 - dependencies: - - name: amqp - version: 2.1.2 - - name: apcu - version: 5.1.28 - - name: bz2 - version: - - name: curl - version: - - name: dba - version: - - name: enchant - - name: exif - version: - - name: fileinfo - version: - - name: ftp - version: - - name: gd - - name: gettext - version: - - name: gmp - version: - - name: igbinary - version: 3.2.15 - - name: imagick - version: 3.7.0 - - name: ioncube - version: 15.5.0 - - name: ldap - version: - - name: lzf - version: - - name: mailparse - version: 3.1.6 - - name: maxminddb - version: 1.11.1 - - name: mbstring - version: - - name: memcached - version: 3.2.0 - - name: mongodb - version: 2.2.1 - - name: msgpack - version: 2.2.0 - - name: mysqli - version: - - name: oauth - version: 2.0.10 - - name: opcache - version: - - name: openssl - version: - - name: pcntl - version: - - name: pdo - version: - - name: pdo_firebird - - name: pdo_mysql - version: - - name: pdo_odbc - - name: pdo_pgsql - version: - - name: pdo_sqlite - version: - - name: pdo_sqlsrv - version: 5.12.0 - - name: pgsql - version: - - name: phpiredis - version: 1.0.1 - - name: psr - version: 1.2.0 - - name: rdkafka - version: 6.0.3 - - name: readline - - name: redis - version: 6.1.0 - - name: shmop - version: - - name: snmp - - name: soap - version: - - name: sockets - version: - - name: sodium - - name: solr - version: 2.9.3 - - name: sqlsrv - version: 5.12.0 - - name: ssh2 - version: 1.4.1 - - name: stomp - version: 2.0.3 - - name: sysvmsg - version: - - name: sysvsem - version: - - name: sysvshm - version: - - name: tidy - - name: xdebug - version: 3.4.0 - - name: xsl - version: - - name: yaf - version: 3.3.7 - - name: yaml - version: 2.2.3 - - name: zip - - name: zlib - version: - name: php version: 8.4.23 uri: https://buildpacks.cloudfoundry.org/dependencies/php/php_8.4.23_linux_x64_cflinuxfs4_fae098d7.tgz