Merge pull request #658 from heroku/develop

v239

CHANGELOG.md

@@ -1,5 +1,24 @@
 # heroku-buildpack-php CHANGELOG
 
+## v239 (2023-09-30)
+
+### ADD
+
+- PHP/8.1.24 [David Zuelke]
+- PHP/8.2.11 [David Zuelke]
+- ext-amqp/2.1.0 [David Zuelke]
+- ext-phalcon/5.3.1 [David Zuelke]
+- ext-newrelic/10.12.0.1 [David Zuelke]
+- ext-redis/6.0.1 (with lz4, lzf, zstd support enabled) [David Zuelke]
+- ext-blackfire/1.90.0 [David Zuelke]
+- Composer/1.10.27 [David Zuelke]
+- Composer/2.2.22 [David Zuelke]
+- Composer/2.6.4 [David Zuelke]
+
+### CHG
+
+- blackfire/2.22.0 [David Zuelke]
+
 ## v238 (2023-08-31)
 
 ### ADD

bin/compile

@@ -245,7 +245,7 @@ fi
 mkdir -p $build_dir/.heroku/php-min
 ln -s $build_dir/.heroku/php-min /app/.heroku/php-min
 
-curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.1.23.tar.gz" || {
+curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.1.24.tar.gz" || {
 	mcount "failures.bootstrap.download.php-min"
 	error <<-EOF
 		Failed to download minimal PHP for bootstrapping!
@@ -258,7 +258,7 @@ curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --sile
 tar xzf $build_dir/.heroku/php-min.tar.gz -C $build_dir/.heroku/php-min
 rm $build_dir/.heroku/php-min.tar.gz
 
-curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-2.5.8.tar.gz" || {
+curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-2.6.4.tar.gz" || {
 	mcount "failures.bootstrap.download.composer"
 	error <<-EOF
 		Failed to download Composer for bootstrapping!

support/build/composer-2.6.4

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-min-*
+
+source $(dirname $0)/composer

support/build/extensions/no-debug-non-zts-20180731/redis

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
 dep_name=$(basename $BASH_SOURCE)
+dep_formula=${0#$WORKSPACE_DIR/}
+dep_version=${dep_formula##*"/${dep_name}-"}
+
+if [[ $dep_version != [1-5].* ]]; then
+	CONFIGURE_EXTRA="--enable-redis-lz4 --with-liblz4 --enable-redis-lzf --with-liblzf --enable-redis-zstd --with-libzstd"
+fi
 
 source $(dirname $BASH_SOURCE)/../pecl

support/build/extensions/no-debug-non-zts-20180731/redis-6.0.1

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-7.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/redis

support/build/extensions/no-debug-non-zts-20190902/redis-6.0.1

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-7.4.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/redis

support/build/extensions/no-debug-non-zts-20200930/redis-6.0.1

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.0.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/redis

support/build/extensions/no-debug-non-zts-20210902/redis-6.0.1

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.1.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/redis

support/build/extensions/no-debug-non-zts-20220829/redis-6.0.1

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.2.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/redis

support/installer/composer.json

@@ -1,7 +1,7 @@
 {
 	"type": "composer-plugin",
 	"name": "heroku/installer-plugin",
-	"version": "1.7.0",
+	"version": "1.7.1",
 	"autoload": {
 		"psr-4": {
 			"Heroku\\Buildpack\\PHP\\": "src/"

support/installer/src/Downloader.php

@@ -30,7 +30,7 @@ protected function extract(PackageInterface $package, string $file, string $path
 			$marker = "$path/$fn.extracted";
 			touch($marker);
 
-			return \React\Promise\resolve();
+			return \React\Promise\resolve(null);
 		}
 
 		throw new \RuntimeException("Failed to execute '$command'\n\n" . $this->process->getErrorOutput());