From c2f54d6b53e11a0d23bf18f12020352a11764de4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 29 Jan 2026 21:16:22 -0800
Subject: [PATCH 1/4] bootstrap.php - Fix small warning in CI

---
 tests/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d513015..2980997 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -19,7 +19,7 @@
 #### Extra - Register classes in "tests" directory
 $loader->add('GitScan', __DIR__);
 
-$userEmail = trim(shell_exec('git config --get user.email'));
+$userEmail = trim(shell_exec('git config --get user.email') ?? '');
 if (strpos($userEmail, '(none)') !== false || $userEmail === '') {
     shell_exec('git config --global user.email "testbot@example.com"');
     shell_exec('git config --global user.name "Test Bot"');

From 400414824bf08e96ee20d31b7d576fea2175a962 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 29 Jan 2026 21:16:29 -0800
Subject: [PATCH 2/4] Tests - Raise max PHP to 8.5

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 693c415..87266d5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
             php: 8.3
             phpunit: 9
           - operating-system: ubuntu-latest
-            php: 8.4
+            php: 8.5
             phpunit: 9
           ## We used to test here, but we were forced to switch to newer actions.
           ## But these actions don't seem to run on Windows...

From e741024a733337f15a3744d0159b7f5c5f21299e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 29 Jan 2026 21:17:20 -0800
Subject: [PATCH 3/4] Update buildkit.nix

---
 nix/buildkit.nix | 6 +++---
 shell.nix        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix/buildkit.nix b/nix/buildkit.nix
index 8c2067e..624eb22 100644
--- a/nix/buildkit.nix
+++ b/nix/buildkit.nix
@@ -1,10 +1,10 @@
 { pkgs ? import <nixpkgs> {} }:
 
 ## Get civicrm-buildkit from github.
-## Based on "master" branch circa 2024-02-26 04:30 UTC
+## Based on "master" branch circa 2026-01-30 04:33 UTC
 import (pkgs.fetchzip {
-  url = "https://github.com/civicrm/civicrm-buildkit/archive/d6f6b8dd2d5944c35cd78cb319fef21673214b35.tar.gz";
-  sha256 = "02p2yzdfgv66a2zf8i36h6pjfi78wnp92m3klij7fqbfd9mpvi5a";
+  url = "https://github.com/civicrm/civicrm-buildkit/archive/c1dbe963785e8205307a58ecb1dc826f9f8abb25.tar.gz";
+  sha256 = "12csnfk6246msiadqkdjlxk943xb0bwnrhksnvbhw5mm8a2gy4ym";
 })
 
 ## Get a local copy of civicrm-buildkit. (Useful for developing patches.)
diff --git a/shell.nix b/shell.nix
index 63b8f14..7adb211 100644
--- a/shell.nix
+++ b/shell.nix
@@ -15,7 +15,7 @@ in
   pkgs.mkShell {
     nativeBuildInputs = buildkit.profiles.base ++ [
 
-      (buildkit.pins.v2305.php82.buildEnv {
+      (buildkit.pins.v2505.php82.buildEnv {
         extraConfig = ''
           memory_limit=-1
         '';

From 033e0ec14803bc157f83392212ad3d1c391bee30 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 29 Jan 2026 21:21:32 -0800
Subject: [PATCH 4/4] Update box

---
 .github/workflows/release.yml | 4 ++--
 composer.json                 | 2 +-
 scripts/build.sh              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 922e5ee..1266dc8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,8 +15,8 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          ## box.phar requires php72
-          php-version: '7.4'
+          ## box.phar requires php82
+          php-version: '8.2'
           tools: composer:v2
           extensions: pcntl
 
diff --git a/composer.json b/composer.json
index abc23a6..694304c 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     "extra": {
         "downloads": {
             "box": {
-                "url": "https://github.com/humbug/box/releases/download/3.16.0/box.phar",
+                "url": "https://github.com/box-project/box/releases/download/4.6.10/box.phar",
                 "path": "extern/box",
                 "type": "phar"
             }
diff --git a/scripts/build.sh b/scripts/build.sh
index dee5606..601c674 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -18,4 +18,4 @@ export PATH="$PRJDIR/extern:$PATH"
 set -ex
 composer install --prefer-dist --no-progress --no-suggest --no-dev
 which box
-php -d phar.read_only=0 `which box` build -v
+php -d phar.read_only=0 `which box` compile -v