From ae42a8cc1785f43f622e472729c66d4c5fdce858 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 13:50:43 +0200
Subject: [PATCH 01/13] PHP/8.1.24

GUS-W-14137930
---
 CHANGELOG.md                                     | 6 ++++++
 bin/compile                                      | 2 +-
 support/build/{php-8.1.23 => php-8.1.24}         | 0
 support/build/{php-min-8.1.23 => php-min-8.1.24} | 0
 4 files changed, 7 insertions(+), 1 deletion(-)
 rename support/build/{php-8.1.23 => php-8.1.24} (100%)
 rename support/build/{php-min-8.1.23 => php-min-8.1.24} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a96570c295..4d3e3566f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # heroku-buildpack-php CHANGELOG
 
+## v239 (2023-09-??)
+
+### ADD
+
+- PHP/8.1.24 [David Zuelke]
+
 ## v238 (2023-08-31)
 
 ### ADD
diff --git a/bin/compile b/bin/compile
index 2893d4957a..c8f9165770 100755
--- a/bin/compile
+++ b/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!
diff --git a/support/build/php-8.1.23 b/support/build/php-8.1.24
similarity index 100%
rename from support/build/php-8.1.23
rename to support/build/php-8.1.24
diff --git a/support/build/php-min-8.1.23 b/support/build/php-min-8.1.24
similarity index 100%
rename from support/build/php-min-8.1.23
rename to support/build/php-min-8.1.24

From c85ae4333ee5251c3d7c454a8b6cd2908a6b2574 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 13:51:04 +0200
Subject: [PATCH 02/13] PHP/8.2.11

GUS-W-14137930
---
 CHANGELOG.md                             | 1 +
 support/build/{php-8.2.10 => php-8.2.11} | 0
 2 files changed, 1 insertion(+)
 rename support/build/{php-8.2.10 => php-8.2.11} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d3e3566f1..17d5a73340 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### ADD
 
 - PHP/8.1.24 [David Zuelke]
+- PHP/8.2.11 [David Zuelke]
 
 ## v238 (2023-08-31)
 
diff --git a/support/build/php-8.2.10 b/support/build/php-8.2.11
similarity index 100%
rename from support/build/php-8.2.10
rename to support/build/php-8.2.11

From cc9a2b5079a99c0b1b68994196628341720b5359 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 13:55:47 +0200
Subject: [PATCH 03/13] ext-amqp/2.1.0

GUS-W-14137932
---
 CHANGELOG.md                                                     | 1 +
 .../no-debug-non-zts-20200930/{amqp-2.0.0 => amqp-2.1.0}         | 0
 .../no-debug-non-zts-20210902/{amqp-2.0.0 => amqp-2.1.0}         | 0
 .../no-debug-non-zts-20220829/{amqp-2.0.0 => amqp-2.1.0}         | 0
 4 files changed, 1 insertion(+)
 rename support/build/extensions/no-debug-non-zts-20200930/{amqp-2.0.0 => amqp-2.1.0} (100%)
 rename support/build/extensions/no-debug-non-zts-20210902/{amqp-2.0.0 => amqp-2.1.0} (100%)
 rename support/build/extensions/no-debug-non-zts-20220829/{amqp-2.0.0 => amqp-2.1.0} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17d5a73340..4accf07858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - PHP/8.1.24 [David Zuelke]
 - PHP/8.2.11 [David Zuelke]
+- ext-amqp/2.1.0 [David Zuelke]
 
 ## v238 (2023-08-31)
 
diff --git a/support/build/extensions/no-debug-non-zts-20200930/amqp-2.0.0 b/support/build/extensions/no-debug-non-zts-20200930/amqp-2.1.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20200930/amqp-2.0.0
rename to support/build/extensions/no-debug-non-zts-20200930/amqp-2.1.0
diff --git a/support/build/extensions/no-debug-non-zts-20210902/amqp-2.0.0 b/support/build/extensions/no-debug-non-zts-20210902/amqp-2.1.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20210902/amqp-2.0.0
rename to support/build/extensions/no-debug-non-zts-20210902/amqp-2.1.0
diff --git a/support/build/extensions/no-debug-non-zts-20220829/amqp-2.0.0 b/support/build/extensions/no-debug-non-zts-20220829/amqp-2.1.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20220829/amqp-2.0.0
rename to support/build/extensions/no-debug-non-zts-20220829/amqp-2.1.0

From 7aa5ba613e6aef2f4559d16505de61aea07f29b5 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 13:56:32 +0200
Subject: [PATCH 04/13] ext-phalcon/5.3.1

GUS-W-14137932
---
 CHANGELOG.md                                                     | 1 +
 .../no-debug-non-zts-20190902/{phalcon-5.3.0 => phalcon-5.3.1}   | 0
 .../no-debug-non-zts-20200930/{phalcon-5.3.0 => phalcon-5.3.1}   | 0
 .../no-debug-non-zts-20210902/{phalcon-5.3.0 => phalcon-5.3.1}   | 0
 .../no-debug-non-zts-20220829/{phalcon-5.3.0 => phalcon-5.3.1}   | 0
 5 files changed, 1 insertion(+)
 rename support/build/extensions/no-debug-non-zts-20190902/{phalcon-5.3.0 => phalcon-5.3.1} (100%)
 rename support/build/extensions/no-debug-non-zts-20200930/{phalcon-5.3.0 => phalcon-5.3.1} (100%)
 rename support/build/extensions/no-debug-non-zts-20210902/{phalcon-5.3.0 => phalcon-5.3.1} (100%)
 rename support/build/extensions/no-debug-non-zts-20220829/{phalcon-5.3.0 => phalcon-5.3.1} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4accf07858..f2f5bba932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - 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]
 
 ## v238 (2023-08-31)
 
diff --git a/support/build/extensions/no-debug-non-zts-20190902/phalcon-5.3.0 b/support/build/extensions/no-debug-non-zts-20190902/phalcon-5.3.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20190902/phalcon-5.3.0
rename to support/build/extensions/no-debug-non-zts-20190902/phalcon-5.3.1
diff --git a/support/build/extensions/no-debug-non-zts-20200930/phalcon-5.3.0 b/support/build/extensions/no-debug-non-zts-20200930/phalcon-5.3.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20200930/phalcon-5.3.0
rename to support/build/extensions/no-debug-non-zts-20200930/phalcon-5.3.1
diff --git a/support/build/extensions/no-debug-non-zts-20210902/phalcon-5.3.0 b/support/build/extensions/no-debug-non-zts-20210902/phalcon-5.3.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20210902/phalcon-5.3.0
rename to support/build/extensions/no-debug-non-zts-20210902/phalcon-5.3.1
diff --git a/support/build/extensions/no-debug-non-zts-20220829/phalcon-5.3.0 b/support/build/extensions/no-debug-non-zts-20220829/phalcon-5.3.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20220829/phalcon-5.3.0
rename to support/build/extensions/no-debug-non-zts-20220829/phalcon-5.3.1

From d8d260919b57d9f7d44c212a64f29cdeba71dbc0 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 13:57:37 +0200
Subject: [PATCH 05/13] ext-newrelic/10.12.0.1

GUS-W-14137932
---
 CHANGELOG.md                                                     | 1 +
 .../{newrelic-10.11.0.3 => newrelic-10.12.0.1}                   | 0
 .../{newrelic-10.11.0.3 => newrelic-10.12.0.1}                   | 0
 .../{newrelic-10.11.0.3 => newrelic-10.12.0.1}                   | 0
 .../{newrelic-10.11.0.3 => newrelic-10.12.0.1}                   | 0
 .../{newrelic-10.11.0.3 => newrelic-10.12.0.1}                   | 0
 6 files changed, 1 insertion(+)
 rename support/build/extensions/no-debug-non-zts-20180731/{newrelic-10.11.0.3 => newrelic-10.12.0.1} (100%)
 rename support/build/extensions/no-debug-non-zts-20190902/{newrelic-10.11.0.3 => newrelic-10.12.0.1} (100%)
 rename support/build/extensions/no-debug-non-zts-20200930/{newrelic-10.11.0.3 => newrelic-10.12.0.1} (100%)
 rename support/build/extensions/no-debug-non-zts-20210902/{newrelic-10.11.0.3 => newrelic-10.12.0.1} (100%)
 rename support/build/extensions/no-debug-non-zts-20220829/{newrelic-10.11.0.3 => newrelic-10.12.0.1} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2f5bba932..d93fd0a4f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - 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]
 
 ## v238 (2023-08-31)
 
diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-10.11.0.3 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-10.12.0.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20180731/newrelic-10.11.0.3
rename to support/build/extensions/no-debug-non-zts-20180731/newrelic-10.12.0.1
diff --git a/support/build/extensions/no-debug-non-zts-20190902/newrelic-10.11.0.3 b/support/build/extensions/no-debug-non-zts-20190902/newrelic-10.12.0.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20190902/newrelic-10.11.0.3
rename to support/build/extensions/no-debug-non-zts-20190902/newrelic-10.12.0.1
diff --git a/support/build/extensions/no-debug-non-zts-20200930/newrelic-10.11.0.3 b/support/build/extensions/no-debug-non-zts-20200930/newrelic-10.12.0.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20200930/newrelic-10.11.0.3
rename to support/build/extensions/no-debug-non-zts-20200930/newrelic-10.12.0.1
diff --git a/support/build/extensions/no-debug-non-zts-20210902/newrelic-10.11.0.3 b/support/build/extensions/no-debug-non-zts-20210902/newrelic-10.12.0.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20210902/newrelic-10.11.0.3
rename to support/build/extensions/no-debug-non-zts-20210902/newrelic-10.12.0.1
diff --git a/support/build/extensions/no-debug-non-zts-20220829/newrelic-10.11.0.3 b/support/build/extensions/no-debug-non-zts-20220829/newrelic-10.12.0.1
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20220829/newrelic-10.11.0.3
rename to support/build/extensions/no-debug-non-zts-20220829/newrelic-10.12.0.1

From 6e5a034e64237f30b3be38b05bacfeff979111f0 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 14:06:54 +0200
Subject: [PATCH 06/13] ext-redis/6.0.1

Enable lz4, lzf, zstd for version 6 or newer.

GUS-W-14137932
---
 CHANGELOG.md                                                | 1 +
 support/build/extensions/no-debug-non-zts-20180731/redis    | 6 ++++++
 .../build/extensions/no-debug-non-zts-20180731/redis-6.0.1  | 5 +++++
 .../build/extensions/no-debug-non-zts-20190902/redis-6.0.1  | 5 +++++
 .../build/extensions/no-debug-non-zts-20200930/redis-6.0.1  | 5 +++++
 .../build/extensions/no-debug-non-zts-20210902/redis-6.0.1  | 5 +++++
 .../build/extensions/no-debug-non-zts-20220829/redis-6.0.1  | 5 +++++
 7 files changed, 32 insertions(+)
 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/redis-6.0.1
 create mode 100755 support/build/extensions/no-debug-non-zts-20190902/redis-6.0.1
 create mode 100755 support/build/extensions/no-debug-non-zts-20200930/redis-6.0.1
 create mode 100755 support/build/extensions/no-debug-non-zts-20210902/redis-6.0.1
 create mode 100755 support/build/extensions/no-debug-non-zts-20220829/redis-6.0.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d93fd0a4f1..268654d73b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - 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]
 
 ## v238 (2023-08-31)
 
diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis b/support/build/extensions/no-debug-non-zts-20180731/redis
index 58fb390e7c..85322b4f5f 100755
--- a/support/build/extensions/no-debug-non-zts-20180731/redis
+++ b/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
diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-6.0.1 b/support/build/extensions/no-debug-non-zts-20180731/redis-6.0.1
new file mode 100755
index 0000000000..a789aec27c
--- /dev/null
+++ b/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
diff --git a/support/build/extensions/no-debug-non-zts-20190902/redis-6.0.1 b/support/build/extensions/no-debug-non-zts-20190902/redis-6.0.1
new file mode 100755
index 0000000000..fa381887f2
--- /dev/null
+++ b/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
diff --git a/support/build/extensions/no-debug-non-zts-20200930/redis-6.0.1 b/support/build/extensions/no-debug-non-zts-20200930/redis-6.0.1
new file mode 100755
index 0000000000..eff0dd1692
--- /dev/null
+++ b/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
diff --git a/support/build/extensions/no-debug-non-zts-20210902/redis-6.0.1 b/support/build/extensions/no-debug-non-zts-20210902/redis-6.0.1
new file mode 100755
index 0000000000..d1fdec7904
--- /dev/null
+++ b/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
diff --git a/support/build/extensions/no-debug-non-zts-20220829/redis-6.0.1 b/support/build/extensions/no-debug-non-zts-20220829/redis-6.0.1
new file mode 100755
index 0000000000..18c63d8682
--- /dev/null
+++ b/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

From b6f088912db93a3a5d58f9233ffed4e89f02a090 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 14:08:21 +0200
Subject: [PATCH 07/13] ext-blackfire/1.90.0

GUS-W-14137932
---
 CHANGELOG.md                                                     | 1 +
 .../{blackfire-1.88.1 => blackfire-1.90.0}                       | 0
 .../{blackfire-1.88.1 => blackfire-1.90.0}                       | 0
 .../{blackfire-1.88.1 => blackfire-1.90.0}                       | 0
 .../{blackfire-1.88.1 => blackfire-1.90.0}                       | 0
 .../{blackfire-1.88.1 => blackfire-1.90.0}                       | 0
 6 files changed, 1 insertion(+)
 rename support/build/extensions/no-debug-non-zts-20180731/{blackfire-1.88.1 => blackfire-1.90.0} (100%)
 rename support/build/extensions/no-debug-non-zts-20190902/{blackfire-1.88.1 => blackfire-1.90.0} (100%)
 rename support/build/extensions/no-debug-non-zts-20200930/{blackfire-1.88.1 => blackfire-1.90.0} (100%)
 rename support/build/extensions/no-debug-non-zts-20210902/{blackfire-1.88.1 => blackfire-1.90.0} (100%)
 rename support/build/extensions/no-debug-non-zts-20220829/{blackfire-1.88.1 => blackfire-1.90.0} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 268654d73b..ffce1455c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - 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]
 
 ## v238 (2023-08-31)
 
diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.88.1 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.90.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20180731/blackfire-1.88.1
rename to support/build/extensions/no-debug-non-zts-20180731/blackfire-1.90.0
diff --git a/support/build/extensions/no-debug-non-zts-20190902/blackfire-1.88.1 b/support/build/extensions/no-debug-non-zts-20190902/blackfire-1.90.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20190902/blackfire-1.88.1
rename to support/build/extensions/no-debug-non-zts-20190902/blackfire-1.90.0
diff --git a/support/build/extensions/no-debug-non-zts-20200930/blackfire-1.88.1 b/support/build/extensions/no-debug-non-zts-20200930/blackfire-1.90.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20200930/blackfire-1.88.1
rename to support/build/extensions/no-debug-non-zts-20200930/blackfire-1.90.0
diff --git a/support/build/extensions/no-debug-non-zts-20210902/blackfire-1.88.1 b/support/build/extensions/no-debug-non-zts-20210902/blackfire-1.90.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20210902/blackfire-1.88.1
rename to support/build/extensions/no-debug-non-zts-20210902/blackfire-1.90.0
diff --git a/support/build/extensions/no-debug-non-zts-20220829/blackfire-1.88.1 b/support/build/extensions/no-debug-non-zts-20220829/blackfire-1.90.0
similarity index 100%
rename from support/build/extensions/no-debug-non-zts-20220829/blackfire-1.88.1
rename to support/build/extensions/no-debug-non-zts-20220829/blackfire-1.90.0

From 5eb4f8eda06025c1ded5c547d8613e892b4226d6 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 28 Sep 2023 14:11:55 +0200
Subject: [PATCH 08/13] blackfire/2.22.0

GUS-W-14137933
---
 CHANGELOG.md                                         | 4 ++++
 support/build/{blackfire-2.21.0 => blackfire-2.22.0} | 0
 2 files changed, 4 insertions(+)
 rename support/build/{blackfire-2.21.0 => blackfire-2.22.0} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffce1455c8..b17168ba3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@
 - ext-redis/6.0.1 (with lz4, lzf, zstd support enabled) [David Zuelke]
 - ext-blackfire/1.90.0 [David Zuelke]
 
+### CHG
+
+- blackfire/2.22.0 [David Zuelke]
+
 ## v238 (2023-08-31)
 
 ### ADD
diff --git a/support/build/blackfire-2.21.0 b/support/build/blackfire-2.22.0
similarity index 100%
rename from support/build/blackfire-2.21.0
rename to support/build/blackfire-2.22.0

From e8154d0a3823d00973fbc086f40739759c13df0b Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Sat, 30 Sep 2023 13:13:16 +0200
Subject: [PATCH 09/13] Composer/1.10.27

GUS-W-14137933
---
 CHANGELOG.md                                         | 1 +
 support/build/{composer-1.10.26 => composer-1.10.27} | 0
 2 files changed, 1 insertion(+)
 rename support/build/{composer-1.10.26 => composer-1.10.27} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b17168ba3d..a982a4a38a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - 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]
 
 ### CHG
 
diff --git a/support/build/composer-1.10.26 b/support/build/composer-1.10.27
similarity index 100%
rename from support/build/composer-1.10.26
rename to support/build/composer-1.10.27

From e9b5bdd5fe333bfb5d5ba8b89995b84dbb2dc449 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Sat, 30 Sep 2023 13:13:57 +0200
Subject: [PATCH 10/13] Composer/2.2.22

GUS-W-14137933
---
 CHANGELOG.md                                       | 1 +
 support/build/{composer-2.2.20 => composer-2.2.22} | 0
 2 files changed, 1 insertion(+)
 rename support/build/{composer-2.2.20 => composer-2.2.22} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a982a4a38a..df698a318b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - 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]
 
 ### CHG
 
diff --git a/support/build/composer-2.2.20 b/support/build/composer-2.2.22
similarity index 100%
rename from support/build/composer-2.2.20
rename to support/build/composer-2.2.22

From 7bcda762316648e6a7ee2be7761c38c74af18a98 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Sat, 30 Sep 2023 16:34:04 +0200
Subject: [PATCH 11/13] Composer 2.6 compat for installer plugin

react/promise v3 requires an argument for Promise::resolve()
---
 support/installer/composer.json      | 2 +-
 support/installer/src/Downloader.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/installer/composer.json b/support/installer/composer.json
index a7192d2a8a..9497d61aae 100644
--- a/support/installer/composer.json
+++ b/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/"
diff --git a/support/installer/src/Downloader.php b/support/installer/src/Downloader.php
index 5373d14256..da07b6808c 100644
--- a/support/installer/src/Downloader.php
+++ b/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());

From bcef36e497ff7cd640a14d29761a65fb326d7c8d Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Sat, 30 Sep 2023 13:15:13 +0200
Subject: [PATCH 12/13] Composer/2.6.4

GUS-W-14137933
---
 CHANGELOG.md                 | 1 +
 bin/compile                  | 2 +-
 support/build/composer-2.6.4 | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 support/build/composer-2.6.4

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df698a318b..10fbe06fec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - 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
 
diff --git a/bin/compile b/bin/compile
index c8f9165770..f4c1daabe6 100755
--- a/bin/compile
+++ b/bin/compile
@@ -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!
diff --git a/support/build/composer-2.6.4 b/support/build/composer-2.6.4
new file mode 100755
index 0000000000..9e1cfd3c56
--- /dev/null
+++ b/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

From 0a5674271dd5bc9ca187351529b672fcc411d856 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Sat, 30 Sep 2023 13:32:31 +0200
Subject: [PATCH 13/13] v239 date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10fbe06fec..a07b0d059c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # heroku-buildpack-php CHANGELOG
 
-## v239 (2023-09-??)
+## v239 (2023-09-30)
 
 ### ADD