From 24cccaac6996e6ccb6039441341a5c7df4c88145 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Fri, 30 Oct 2026 18:36:00 +0100
Subject: [PATCH 1/2] Load the maintenance classes of the checkout that runs
 them

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .maintenance/autoload.php | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/.maintenance/autoload.php b/.maintenance/autoload.php
index 32957cc..8329bb5 100644
--- a/.maintenance/autoload.php
+++ b/.maintenance/autoload.php
@@ -1,33 +1,19 @@
 <?php
 /**
- * Loads the maintenance commands.
+ * Loads the maintenance commands of this checkout.
  *
- * Within a full development environment, Composer does that. Without one, any
- * `wp` executable can still run them, so the maintenance tooling only needs
+ * Any `wp` executable can run them, so the maintenance tooling only needs
  * WP-CLI, git and the GitHub CLI, not a complete install of every package.
+ *
+ * The classes are loaded right away instead of through an autoloader. The
+ * `wp` executable may belong to another checkout, such as the main checkout
+ * run within a worktree, and its Composer autoloader maps the same namespace.
+ * WP-CLI registers that autoloader after this file runs, so it would take
+ * precedence and silently run the other checkout's, possibly older, code.
  */
 
-$composer_autoloader = dirname( __DIR__ ) . '/vendor/autoload.php';
-
-if ( is_file( $composer_autoloader ) ) {
-	require_once $composer_autoloader;
-	return;
+foreach ( glob( __DIR__ . '/src/*.php' ) as $maintenance_class_file ) {
+	require_once $maintenance_class_file;
 }
 
-spl_autoload_register(
-	static function ( $class_name ) {
-		$prefix = 'WP_CLI\\Maintenance\\';
-
-		if ( 0 !== strpos( $class_name, $prefix ) ) {
-			return;
-		}
-
-		$file = __DIR__ . '/src/' . str_replace( '\\', '/', substr( $class_name, strlen( $prefix ) ) ) . '.php';
-
-		if ( is_file( $file ) ) {
-			require $file;
-		}
-	}
-);
-
 require_once __DIR__ . '/bootstrap.php';

From 97954bb1812d3bd4eb44cc753108bba9a7b479ed Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Fri, 30 Oct 2026 19:01:09 +0100
Subject: [PATCH 2/2] Read the class files from the literal source directory

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .maintenance/autoload.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.maintenance/autoload.php b/.maintenance/autoload.php
index 8329bb5..553be0e 100644
--- a/.maintenance/autoload.php
+++ b/.maintenance/autoload.php
@@ -12,8 +12,10 @@
  * precedence and silently run the other checkout's, possibly older, code.
  */
 
-foreach ( glob( __DIR__ . '/src/*.php' ) as $maintenance_class_file ) {
-	require_once $maintenance_class_file;
+foreach ( (array) scandir( __DIR__ . '/src' ) as $maintenance_class_file ) {
+	if ( '.php' === substr( (string) $maintenance_class_file, -4 ) ) {
+		require_once __DIR__ . '/src/' . $maintenance_class_file;
+	}
 }
 
 require_once __DIR__ . '/bootstrap.php';