Merge pull request #666 from heroku/develop

v241

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "8.1"
-          tools: "composer:2.4"
+          tools: "composer:2.6"
       - name: Hatchet setup
         run: bundle exec hatchet ci:setup
       - name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …-develop (since we are not building main or a tag)

CHANGELOG.md

@@ -1,5 +1,14 @@
 # heroku-buildpack-php CHANGELOG
 
+## v241 (2023-11-29)
+
+- PHP/8.1.26 [David Zuelke]
+- PHP/8.2.13 [David Zuelke]
+- ext-apcu/5.1.23 [David Zuelke]
+- ext-mongodb/1.17.0 [David Zuelke]
+- ext-newrelic/10.14.0.3 [David Zuelke]
+- ext-blackfire/1.92.1 [David Zuelke]
+
 ## v240 (2023-10-27)
 
 ### 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.25.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.26.tar.gz" || {
 	mcount "failures.bootstrap.download.php-min"
 	error <<-EOF
 		Failed to download minimal PHP for bootstrapping!

test/fixtures/platform/repository/futurepaks/composer.json

@@ -34,7 +34,7 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

test/fixtures/platform/repository/priorities/composer-canonical.json

@@ -30,12 +30,12 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json",
+            "url": "./packages-custom.json",
             "canonical": false
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

test/fixtures/platform/repository/priorities/composer-default.json

@@ -30,11 +30,11 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json"
+            "url": "./packages-custom.json"
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

test/fixtures/platform/repository/priorities/composer-exclude.json

@@ -30,12 +30,12 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json",
+            "url": "./packages-custom.json",
             "exclude": ["heroku-sys/ext-redis"]
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

test/fixtures/platform/repository/priorities/composer-only.json

@@ -30,12 +30,12 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json",
+            "url": "./packages-custom.json",
             "only": ["heroku-sys/ext-igbinary"]
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

test/spec/platform_spec.rb

@@ -142,17 +142,8 @@
 	end
 
 	describe "Repository" do
-		after(:each) do
-			Process.kill("TERM", @pid)
-			Process.wait(@pid)
-		end
-
 		it "can hold packages compatible with future versions of the buildpack the current version will ignore" do
 			Dir.chdir("test/fixtures/platform/repository/futurepaks") do |cwd|
-				# we spawn a web server that serves packages.json, like a real composer repository
-				# this is to ensure that Composer really uses ComposerRepository behavior for provide/replace declarations
-				@pid = spawn("php -S localhost:8080")
-
 				cmd = "composer install --dry-run"
 				stdout, stderr, status = Open3.capture3("bash -c #{Shellwords.escape(cmd)}")
 				expect(status.exitstatus).to eq(0), "dry run install failed, stderr: #{stderr}, stdout: #{stdout}"
@@ -164,9 +155,6 @@
 
 		it "combined with a custom repository installs packages from that repo according to the priority given" do
 			Dir.chdir("test/fixtures/platform/repository/priorities") do |cwd|
-				# we spawn a web server that serves packages*.json, like a real composer repository
-				# this is to ensure that Composer really uses ComposerRepository behavior for priorities etc
-				@pid = spawn("php -S localhost:8080")
 				Dir.glob("composer-*.json") do |testcase|
 					cmd = "COMPOSER=#{testcase} composer install --dry-run"
 					stdout, stderr, status = Open3.capture3("bash -c #{Shellwords.escape(cmd)}")