Use composer patches to fix phar_safe_path in vendor

Removed non-working function override approach. Instead, added cweagans/composer-patches plugin and created a patch file to fix phar_safe_path() in wp-cli/wp-cli vendor code. The patch changes the replacement from bare 'phar://' to 'phar://wp-cli.phar/' alias, ensuring template paths resolve correctly.

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>

Author: Copilot

composer.json

@@ -41,7 +41,8 @@
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest",
-    "wp-cli/wp-cli-tests": "^5"
+    "wp-cli/wp-cli-tests": "^5",
+    "cweagans/composer-patches": "^1.7"
   },
   "suggest": {
     "psy/psysh": "Enhanced `wp shell` functionality"
@@ -50,7 +51,8 @@
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "johnpbloch/wordpress-core-installer": true,
-      "phpstan/extension-installer": true
+      "phpstan/extension-installer": true,
+      "cweagans/composer-patches": true
     },
     "autoloader-suffix": "WpCliBundle",
     "platform": {
@@ -62,6 +64,11 @@
   "extra": {
     "branch-alias": {
       "dev-main": "2.12.x-dev"
+    },
+    "patches": {
+      "wp-cli/wp-cli": {
+        "Fix phar_safe_path to use alias path": "patches/wp-cli-phar-safe-path.patch"
+      }
     }
   },
   "autoload-dev": {

composer.lock

@@ -0,0 +1,12 @@
+--- a/php/utils.php
++++ b/php/utils.php
+@@ -1683,7 +1683,7 @@ function phar_safe_path( $path ) {
+ 	}
+ 
+ 	return str_replace(
+ 		PHAR_STREAM_PREFIX . rtrim( WP_CLI_PHAR_PATH, '/' ) . '/',
+-		PHAR_STREAM_PREFIX,
++		'phar://wp-cli.phar/',
+ 		$path
+ 	);
+ }

patches/wp-cli-phar-safe-path.patch

@@ -18,13 +18,9 @@
 if ( file_exists( 'phar://wp-cli.phar/php/wp-cli.php' ) ) {
 	define( 'WP_CLI_ROOT', 'phar://wp-cli.phar' );
 	include WP_CLI_ROOT . '/php/wp-cli.php';
-	// Override phar_safe_path() to fix template resolution (temporary until wp-cli/wp-cli#6242 is merged)
-	include __DIR__ . '/utils-override.php';
 } elseif ( file_exists( 'phar://wp-cli.phar/vendor/wp-cli/wp-cli/php/wp-cli.php' ) ) {
 	define( 'WP_CLI_ROOT', 'phar://wp-cli.phar/vendor/wp-cli/wp-cli' );
 	include WP_CLI_ROOT . '/php/wp-cli.php';
-	// Override phar_safe_path() to fix template resolution (temporary until wp-cli/wp-cli#6242 is merged)
-	include __DIR__ . '/utils-override.php';
 } else {
 	echo "Couldn't find 'php/wp-cli.php'. Was this Phar built correctly?";
 	exit( 1 );