From b34e5b6fec9da4c40245b5ffd9f2e7df7b928b44 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Fri, 24 Nov 2023 14:12:11 +0100
Subject: [PATCH 1/3] PHP/8.3.0

GUS-W-14454295
---
 .github/workflows/ci.yml                      |  2 +-
 CHANGELOG.md                                  |  6 +++
 bin/compile                                   |  4 +-
 bin/util/eol.php                              |  1 +
 .../no-debug-non-zts-20180731/blackfire       |  3 ++
 .../no-debug-non-zts-20180731/newrelic        |  3 ++
 .../no-debug-non-zts-20230831/amqp-2.1.1      |  5 ++
 .../no-debug-non-zts-20230831/apcu-5.1.23     |  5 ++
 .../blackfire-1.92.1                          |  4 ++
 .../no-debug-non-zts-20230831/ev-1.1.5        |  5 ++
 .../no-debug-non-zts-20230831/event-3.0.8     |  5 ++
 .../no-debug-non-zts-20230831/imagick-3.7.0   |  5 ++
 .../no-debug-non-zts-20230831/memcached-3.2.0 |  5 ++
 .../no-debug-non-zts-20230831/mongodb-1.17.0  |  5 ++
 .../no-debug-non-zts-20230831/oauth-2.0.7     |  5 ++
 .../no-debug-non-zts-20230831/pcov-1.0.11     |  5 ++
 .../no-debug-non-zts-20230831/pq-2.2.2        |  5 ++
 .../no-debug-non-zts-20230831/psr-1.2.0       |  5 ++
 .../no-debug-non-zts-20230831/raphf-2.0.1     |  5 ++
 .../no-debug-non-zts-20230831/rdkafka-6.0.3   |  5 ++
 .../no-debug-non-zts-20230831/redis-6.0.2     |  5 ++
 .../no-debug-non-zts-20230831/uuid-1.2.0      |  5 ++
 support/build/php                             |  2 +
 support/build/php-8.3.0                       |  4 ++
 support/devcenter/generate.php                |  1 +
 test/spec/newrelic_spec.rb                    |  2 +-
 test/spec/php_8.3-apache2_boot_spec.rb        |  5 ++
 test/spec/php_8.3-apache2_concurrency_spec.rb |  5 ++
 test/spec/php_8.3-nginx_boot_spec.rb          |  5 ++
 test/spec/php_8.3-nginx_concurrency_spec.rb   |  5 ++
 test/spec/php_8.3_base_spec.rb                | 48 +++++++++++++++++++
 test/spec/spec_helper.rb                      |  6 +--
 32 files changed, 174 insertions(+), 7 deletions(-)
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/amqp-2.1.1
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/apcu-5.1.23
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.1
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/ev-1.1.5
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/event-3.0.8
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/imagick-3.7.0
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/memcached-3.2.0
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/mongodb-1.17.0
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/oauth-2.0.7
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/pcov-1.0.11
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/pq-2.2.2
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/psr-1.2.0
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/raphf-2.0.1
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/rdkafka-6.0.3
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/redis-6.0.2
 create mode 100755 support/build/extensions/no-debug-non-zts-20230831/uuid-1.2.0
 create mode 100755 support/build/php-8.3.0
 create mode 100644 test/spec/php_8.3-apache2_boot_spec.rb
 create mode 100644 test/spec/php_8.3-apache2_concurrency_spec.rb
 create mode 100644 test/spec/php_8.3-nginx_boot_spec.rb
 create mode 100644 test/spec/php_8.3-nginx_concurrency_spec.rb
 create mode 100644 test/spec/php_8.3_base_spec.rb

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 425c7e55e..e6171ac11 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Install PHP and Composer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.2"
           tools: "composer:2.6"
       - name: Hatchet setup
         run: bundle exec hatchet ci:setup
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36ab500d8..a306aefe8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # heroku-buildpack-php CHANGELOG
 
+## v242 (2023-11-??)
+
+### ADD
+
+- PHP/8.3.0 [David Zuelke]
+
 ## v241 (2023-11-29)
 
 - PHP/8.1.26 [David Zuelke]
diff --git a/bin/compile b/bin/compile
index 718babf17..abd13a09a 100755
--- a/bin/compile
+++ b/bin/compile
@@ -363,9 +363,9 @@ composer validate --no-plugins --no-check-publish --no-check-all --quiet "$COMPO
 status "Preparing platform package installation..."
 
 if [[ $STACK == "heroku-20" ]]; then
-	HEROKU_PHP_DEFAULT_RUNTIME_VERSION="^7.3.0 | ^8.0.0 <8.3"
+	HEROKU_PHP_DEFAULT_RUNTIME_VERSION="^7.3.0 | ^8.0.0 <8.4"
 else
-	HEROKU_PHP_DEFAULT_RUNTIME_VERSION="^8.0.0 <8.3"
+	HEROKU_PHP_DEFAULT_RUNTIME_VERSION="^8.0.0 <8.4"
 fi
 export HEROKU_PHP_DEFAULT_RUNTIME_VERSION
 # extract requirements from composer.lock
diff --git a/bin/util/eol.php b/bin/util/eol.php
index 9d64023dd..5ce607bbe 100644
--- a/bin/util/eol.php
+++ b/bin/util/eol.php
@@ -12,6 +12,7 @@
 	"8.0" => array("2022-11-26", "2023-11-26"),
 	"8.1" => array("2023-11-25", "2024-11-25"),
 	"8.2" => array("2024-12-08", "2025-12-08"),
+	"8.3" => array("2025-11-23", "2026-11-23"),
 );
 
 if(basename(__FILE__) != basename($_SERVER["PHP_SELF"])) return $eol; // we're being included, just return the data
diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire b/support/build/extensions/no-debug-non-zts-20180731/blackfire
index 08969f643..cd10fedb3 100755
--- a/support/build/extensions/no-debug-non-zts-20180731/blackfire
+++ b/support/build/extensions/no-debug-non-zts-20180731/blackfire
@@ -29,6 +29,9 @@ case ${ZEND_MODULE_API_VERSION} in
 	20220829)
 		series=8.2
 		;;
+	20230831)
+		series=8.3
+		;;
 	*)
 		echo "Unsupported PHP/Zend Module API version: ${ZEND_MODULE_API_VERSION}"
 		exit 1
diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic b/support/build/extensions/no-debug-non-zts-20180731/newrelic
index d20ff2259..fdfa59b2d 100755
--- a/support/build/extensions/no-debug-non-zts-20180731/newrelic
+++ b/support/build/extensions/no-debug-non-zts-20180731/newrelic
@@ -35,6 +35,9 @@ case ${ZEND_MODULE_API_VERSION} in
 	20220829)
 		series=8.2
 		;;
+	20230831)
+		series=8.3
+		;;
 	*)
 		echo "Unsupported PHP/Zend Module API version: ${ZEND_MODULE_API_VERSION}"
 		exit 1
diff --git a/support/build/extensions/no-debug-non-zts-20230831/amqp-2.1.1 b/support/build/extensions/no-debug-non-zts-20230831/amqp-2.1.1
new file mode 100755
index 000000000..abfa6768a
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/amqp-2.1.1
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/amqp
diff --git a/support/build/extensions/no-debug-non-zts-20230831/apcu-5.1.23 b/support/build/extensions/no-debug-non-zts-20230831/apcu-5.1.23
new file mode 100755
index 000000000..aa8967929
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/apcu-5.1.23
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/apcu
diff --git a/support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.1 b/support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.1
new file mode 100755
index 000000000..e65058fa3
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.1
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/../no-debug-non-zts-20180731/blackfire
diff --git a/support/build/extensions/no-debug-non-zts-20230831/ev-1.1.5 b/support/build/extensions/no-debug-non-zts-20230831/ev-1.1.5
new file mode 100755
index 000000000..f7f2e57d4
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/ev-1.1.5
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/ev
diff --git a/support/build/extensions/no-debug-non-zts-20230831/event-3.0.8 b/support/build/extensions/no-debug-non-zts-20230831/event-3.0.8
new file mode 100755
index 000000000..b2616860e
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/event-3.0.8
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/event
diff --git a/support/build/extensions/no-debug-non-zts-20230831/imagick-3.7.0 b/support/build/extensions/no-debug-non-zts-20230831/imagick-3.7.0
new file mode 100755
index 000000000..f7d507846
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/imagick-3.7.0
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/imagick
diff --git a/support/build/extensions/no-debug-non-zts-20230831/memcached-3.2.0 b/support/build/extensions/no-debug-non-zts-20230831/memcached-3.2.0
new file mode 100755
index 000000000..20e8b40c5
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/memcached-3.2.0
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/memcached
diff --git a/support/build/extensions/no-debug-non-zts-20230831/mongodb-1.17.0 b/support/build/extensions/no-debug-non-zts-20230831/mongodb-1.17.0
new file mode 100755
index 000000000..f81cb6024
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/mongodb-1.17.0
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/mongodb
diff --git a/support/build/extensions/no-debug-non-zts-20230831/oauth-2.0.7 b/support/build/extensions/no-debug-non-zts-20230831/oauth-2.0.7
new file mode 100755
index 000000000..acfa75a14
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/oauth-2.0.7
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/oauth
diff --git a/support/build/extensions/no-debug-non-zts-20230831/pcov-1.0.11 b/support/build/extensions/no-debug-non-zts-20230831/pcov-1.0.11
new file mode 100755
index 000000000..649c094bf
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/pcov-1.0.11
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/pcov
diff --git a/support/build/extensions/no-debug-non-zts-20230831/pq-2.2.2 b/support/build/extensions/no-debug-non-zts-20230831/pq-2.2.2
new file mode 100755
index 000000000..671abd64b
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/pq-2.2.2
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*, extensions/no-debug-non-zts-20230831/raphf-2.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/pq
diff --git a/support/build/extensions/no-debug-non-zts-20230831/psr-1.2.0 b/support/build/extensions/no-debug-non-zts-20230831/psr-1.2.0
new file mode 100755
index 000000000..3e9c40005
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/psr-1.2.0
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/psr
diff --git a/support/build/extensions/no-debug-non-zts-20230831/raphf-2.0.1 b/support/build/extensions/no-debug-non-zts-20230831/raphf-2.0.1
new file mode 100755
index 000000000..a94eddeff
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/raphf-2.0.1
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/raphf
diff --git a/support/build/extensions/no-debug-non-zts-20230831/rdkafka-6.0.3 b/support/build/extensions/no-debug-non-zts-20230831/rdkafka-6.0.3
new file mode 100755
index 000000000..537c0945f
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/rdkafka-6.0.3
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*, libraries/librdkafka-1.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/rdkafka
diff --git a/support/build/extensions/no-debug-non-zts-20230831/redis-6.0.2 b/support/build/extensions/no-debug-non-zts-20230831/redis-6.0.2
new file mode 100755
index 000000000..ee0c82d09
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/redis-6.0.2
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/redis
diff --git a/support/build/extensions/no-debug-non-zts-20230831/uuid-1.2.0 b/support/build/extensions/no-debug-non-zts-20230831/uuid-1.2.0
new file mode 100755
index 000000000..d34a2eecf
--- /dev/null
+++ b/support/build/extensions/no-debug-non-zts-20230831/uuid-1.2.0
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+# Build Deps: php-8.3.*
+
+source $(dirname $0)/../no-debug-non-zts-20180731/uuid
diff --git a/support/build/php b/support/build/php
index 05e6ec069..524efa271 100755
--- a/support/build/php
+++ b/support/build/php
@@ -26,6 +26,8 @@ if [[ $dep_version == *alpha* ]] || [[ $dep_version == *beta* ]] || [[ $dep_vers
 		dep_url=https://downloads.php.net/~ramsey/${dep_archive_name}
 	elif [[ $dep_version == 8.2.* ]]; then
 		dep_url=https://downloads.php.net/~pierrick/${dep_archive_name}
+	elif [[ $dep_version == 8.3.* ]]; then
+		dep_url=https://downloads.php.net/~eric/${dep_archive_name}
 	fi
 else
 	dep_url=https://www.php.net/distributions/${dep_archive_name}
diff --git a/support/build/php-8.3.0 b/support/build/php-8.3.0
new file mode 100755
index 000000000..6fe432acc
--- /dev/null
+++ b/support/build/php-8.3.0
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/php
diff --git a/support/devcenter/generate.php b/support/devcenter/generate.php
index 3d786fcc3..cb457f554 100755
--- a/support/devcenter/generate.php
+++ b/support/devcenter/generate.php
@@ -19,6 +19,7 @@
 	'8.0',
 	'8.1',
 	'8.2',
+	'8.3',
 ];
 
 $findstacks = function(array $package) use($stacks) {
diff --git a/test/spec/newrelic_spec.rb b/test/spec/newrelic_spec.rb
index 7f476f796..ba018f76f 100644
--- a/test/spec/newrelic_spec.rb
+++ b/test/spec/newrelic_spec.rb
@@ -29,7 +29,7 @@
 					# a NEW_RELIC_LICENSE_KEY triggers the automatic installation of ext-newrelic at the end of the build
 					@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
 						config: { "NEW_RELIC_LOG_LEVEL" => "info", "NEW_RELIC_LICENSE_KEY" => "thiswilltriggernewrelic" },
-						before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:8.1.*'") or raise "Failed to require PHP version" },
+						before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:8.2.*'") or raise "Failed to require PHP version" },
 						run_multi: true
 					)
 				end
diff --git a/test/spec/php_8.3-apache2_boot_spec.rb b/test/spec/php_8.3-apache2_boot_spec.rb
new file mode 100644
index 000000000..3a327ead2
--- /dev/null
+++ b/test/spec/php_8.3-apache2_boot_spec.rb
@@ -0,0 +1,5 @@
+require_relative "php_shared_boot"
+
+describe "A PHP 8.3/Apache application for testing boot options", :requires_php_on_stack => "8.3" do
+	include_examples "A PHP application for testing boot options", "8.3", "apache2"
+end
diff --git a/test/spec/php_8.3-apache2_concurrency_spec.rb b/test/spec/php_8.3-apache2_concurrency_spec.rb
new file mode 100644
index 000000000..93fc6cdc2
--- /dev/null
+++ b/test/spec/php_8.3-apache2_concurrency_spec.rb
@@ -0,0 +1,5 @@
+require_relative "php_shared_concurrency"
+
+describe "A PHP 8.3/Apache application for testing WEB_CONCURRENCY behavior", :requires_php_on_stack => "8.3" do
+	include_examples "A PHP application for testing WEB_CONCURRENCY behavior", "8.3", "apache2"
+end
diff --git a/test/spec/php_8.3-nginx_boot_spec.rb b/test/spec/php_8.3-nginx_boot_spec.rb
new file mode 100644
index 000000000..1b2871a62
--- /dev/null
+++ b/test/spec/php_8.3-nginx_boot_spec.rb
@@ -0,0 +1,5 @@
+require_relative "php_shared_boot"
+
+describe "A PHP 8.3/Nginx application for testing boot options", :requires_php_on_stack => "8.3" do
+	include_examples "A PHP application for testing boot options", "8.3", "nginx"
+end
diff --git a/test/spec/php_8.3-nginx_concurrency_spec.rb b/test/spec/php_8.3-nginx_concurrency_spec.rb
new file mode 100644
index 000000000..8f90c783c
--- /dev/null
+++ b/test/spec/php_8.3-nginx_concurrency_spec.rb
@@ -0,0 +1,5 @@
+require_relative "php_shared_concurrency"
+
+describe "A PHP 8.3/Nginx application for testing WEB_CONCURRENCY behavior", :requires_php_on_stack => "8.3" do
+	include_examples "A PHP application for testing WEB_CONCURRENCY behavior", "8.3", "nginx"
+end
diff --git a/test/spec/php_8.3_base_spec.rb b/test/spec/php_8.3_base_spec.rb
new file mode 100644
index 000000000..78607c46f
--- /dev/null
+++ b/test/spec/php_8.3_base_spec.rb
@@ -0,0 +1,48 @@
+require_relative "php_shared_base"
+
+describe "A basic PHP 8.3 application", :requires_php_on_stack => "8.3" do
+	include_examples "A basic PHP application", "8.3"
+	
+	context "with an index.php that allows for different execution times" do
+		['apache2', 'nginx'].each do |server|
+			context "running the #{server} web server" do
+				let(:app) {
+					new_app_with_stack_and_platrepo('test/fixtures/sigterm',
+						before_deploy: -> { system("composer require --quiet --ignore-platform-reqs php '8.3.*'") or raise "Failed to require PHP version" }
+					)
+				}
+				
+				# FIXME: move to php_shared.rb once all PHPs are rebuilt with that tracing capability
+				it "logs slowness after configured time and sees a trace" do
+					app.deploy do |app|
+						# launch web server wrapped in a 20 second timeout
+						# once web server is ready, `read` unblocks and we curl the sleep() script which will take a few seconds to run
+						# after `curl` completes, `wait-for.it.sh` will shut down
+						# ensure slowlog info and trace is there
+						cmd = "./waitforit.sh 20 'ready for connections' heroku-php-#{server} --verbose -F fpm.request_slowlog_timeout.conf | { read && curl \"localhost:$PORT/index.php?wait=5\"; }"
+						retry_until retry: 3, sleep: 5 do
+							output = app.run(cmd)
+							expect(output).to include("executing too slow")
+							expect(output).to include("sleep() /app/index.php:5")
+						end
+					end
+				end
+				
+				it "logs slowness after about 3 seconds and terminates the process after about 30 seconds" do
+					app.deploy do |app|
+						# launch web server wrapped in a 50 second timeout
+						# once web server is ready, `read` unblocks and we curl the sleep() script with a very long timeout
+						# after `curl` completes, `wait-for.it.sh` will shut down
+						# ensure slowlog and terminate output is there
+						cmd = "./waitforit.sh 50 'ready for connections' heroku-php-#{server} --verbose | { read && curl \"localhost:$PORT/index.php?wait=35\"; }"
+						retry_until retry: 3, sleep: 5 do
+							output = app.run(cmd)
+							expect(output).to match(/executing too slow/)
+							expect(output).to match(/execution timed out/)
+						end
+					end
+				end
+			end
+		end
+	end
+end
diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb
index fd384e995..acb4ea1d4 100644
--- a/test/spec/spec_helper.rb
+++ b/test/spec/spec_helper.rb
@@ -53,15 +53,15 @@ def expect_exit(expect: :to, operator: :eq, code: 0)
 end
 
 def expected_default_php(stack)
-	"8.2"
+	"8.3"
 end
 
 def php_on_stack?(series)
 	case ENV["STACK"]
 		when "heroku-20"
-			available = ["7.3", "7.4", "8.0", "8.1", "8.2"]
+			available = ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]
 		else
-			available = ["8.1", "8.2"]
+			available = ["8.1", "8.2", "8.3"]
 	end
 	available.include?(series)
 end

From 0d88f71bdf2cabf76a2ade663893286eb5323cd0 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Wed, 29 Nov 2023 21:38:44 +0100
Subject: [PATCH 2/3] Update test runtimes

Used for balancing parallel tests
---
 test/var/log/parallel_runtime_rspec.heroku-20.log | 5 +++++
 test/var/log/parallel_runtime_rspec.heroku-22.log | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/test/var/log/parallel_runtime_rspec.heroku-20.log b/test/var/log/parallel_runtime_rspec.heroku-20.log
index 5e9d4491d..b68b8ad1f 100644
--- a/test/var/log/parallel_runtime_rspec.heroku-20.log
+++ b/test/var/log/parallel_runtime_rspec.heroku-20.log
@@ -30,6 +30,11 @@ test/spec/php_8.2-apache2_concurrency_spec.rb:100
 test/spec/php_8.2_base_spec.rb:210
 test/spec/php_8.2-nginx_boot_spec.rb:100
 test/spec/php_8.2-nginx_concurrency_spec.rb:90
+test/spec/php_8.3-apache2_boot_spec.rb:110
+test/spec/php_8.3-apache2_concurrency_spec.rb:100
+test/spec/php_8.3_base_spec.rb:210
+test/spec/php_8.3-nginx_boot_spec.rb:100
+test/spec/php_8.3-nginx_concurrency_spec.rb:90
 test/spec/php_default_spec.rb:65
 test/spec/platform_spec.rb:50
 test/spec/sigterm_spec.rb:56
diff --git a/test/var/log/parallel_runtime_rspec.heroku-22.log b/test/var/log/parallel_runtime_rspec.heroku-22.log
index afce2e3f0..fa34186cc 100644
--- a/test/var/log/parallel_runtime_rspec.heroku-22.log
+++ b/test/var/log/parallel_runtime_rspec.heroku-22.log
@@ -15,6 +15,11 @@ test/spec/php_8.2-apache2_concurrency_spec.rb:100
 test/spec/php_8.2_base_spec.rb:210
 test/spec/php_8.2-nginx_boot_spec.rb:100
 test/spec/php_8.2-nginx_concurrency_spec.rb:90
+test/spec/php_8.3-apache2_boot_spec.rb:110
+test/spec/php_8.3-apache2_concurrency_spec.rb:100
+test/spec/php_8.3_base_spec.rb:210
+test/spec/php_8.3-nginx_boot_spec.rb:100
+test/spec/php_8.3-nginx_concurrency_spec.rb:90
 test/spec/php_default_spec.rb:65
 test/spec/platform_spec.rb:50
 test/spec/sigterm_spec.rb:56

From b36aa4e87e816ee02006272b0513e92a928ca865 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@salesforce.com>
Date: Thu, 7 Dec 2023 23:31:56 +0100
Subject: [PATCH 3/3] v242 date

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a306aefe8..69b694c8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # heroku-buildpack-php CHANGELOG
 
-## v242 (2023-11-??)
+## v242 (2023-12-07)
 
 ### ADD