From 1ad13345ff838670bfa954dbcddb9a1eda1bd1e4 Mon Sep 17 00:00:00 2001
From: swissspidy <swissspidy@users.noreply.github.com>
Date: Wed, 8 Oct 2025 09:39:35 +0000
Subject: [PATCH 1/3] Update file(s) from wp-cli/.github

---
 .github/dependabot.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d6c7b8b..24a0f82 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,16 +1,9 @@
 version: 2
 updates:
-  - package-ecosystem: composer
-    directory: "/"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - scope:distribution
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: daily
+      interval: weekly
     open-pull-requests-limit: 10
     labels:
       - scope:distribution

From 6ca81ab917f12d430b27bc079e83040d9cb734e1 Mon Sep 17 00:00:00 2001
From: swissspidy <swissspidy@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:20:30 +0000
Subject: [PATCH 2/3] Update file(s) from wp-cli/.github

---
 .github/dependabot.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 24a0f82..d6c7b8b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,9 +1,16 @@
 version: 2
 updates:
+  - package-ecosystem: composer
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - scope:distribution
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: weekly
+      interval: daily
     open-pull-requests-limit: 10
     labels:
       - scope:distribution

From 7ed71902b4e213fa0f6c32cff5232db2e3d1b1b3 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 13 Oct 2025 09:32:39 +0200
Subject: [PATCH 3/3] Fix tests against trunk

---
 features/profile-hook.feature | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/features/profile-hook.feature b/features/profile-hook.feature
index 8eb522c..b3335ca 100644
--- a/features/profile-hook.feature
+++ b/features/profile-hook.feature
@@ -66,7 +66,7 @@ Feature: Profile a specific hook
       <meta name="generator"
       """
 
-  @require-wp-4.0
+  @require-wp-4.0 @less-than-wp-6.9
   Scenario: Profile the shutdown hook
     Given a WP install
     And a wp-content/mu-plugins/shutdown.php file:
@@ -86,6 +86,28 @@ Feature: Profile a specific hook
       | total (2)              | 0              | 1                |
     And STDERR should be empty
 
+  # `_wp_cron` was added to shutdown hook in 6.9, see https://core.trac.wordpress.org/changeset/60925.
+  @require-wp-6.9
+  Scenario: Profile the shutdown hook
+    Given a WP install
+    And a wp-content/mu-plugins/shutdown.php file:
+      """
+      <?php
+      function wp_cli_shutdown_hook() {
+        wp_cache_get( 'foo' );
+      }
+      add_action( 'shutdown', 'wp_cli_shutdown_hook' );
+      """
+
+    When I run `wp profile hook shutdown --fields=callback,cache_hits,cache_misses`
+    Then STDOUT should be a table containing rows:
+      | callback               | cache_hits     | cache_misses     |
+      | wp_cli_shutdown_hook() | 0              | 1                |
+      | wp_ob_end_flush_all()  | 0              | 0                |
+      | _wp_cron()             | 0              | 0                |
+      | total (3)              | 0              | 1                |
+    And STDERR should be empty
+
   @require-wp-4.0
   Scenario: Indicate where a callback is defined with profiling a hook
     Given a WP install