Merge pull request #235 from stellarwp/bugfix/properly-override-set-php-version

Fix: Preserve staged PHP versions

Author: defunctl

changelog.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [2.1.7] - 2026-02-02
+- Fixed - Preserve staged PHP versions (from `slic php-version set X.Y --skip-rebuild`) when a project's `.env.slic.local` file would otherwise override them. Staged versions now correctly take precedence over project-specific PHP version overrides.
+
 # [2.1.6] - 2025-12-03
 - Added - Prevent running slic if the `uopz` extension is enabled with `uopz.exit=0`.
 

slic.php

@@ -54,7 +54,7 @@
 ] );
 
 $cli_name = 'slic';
-const CLI_VERSION = '2.1.6';
+const CLI_VERSION = '2.1.7';
 
 // If the run-time option `-q`, for "quiet", is specified, then do not print the header.
 if ( in_array( '-q', $argv, true ) || ( in_array( 'exec', $argv, true ) && ! in_array( 'help', $argv, true ) ) ) {

src/slic.php

@@ -268,8 +268,19 @@ function setup_slic_env( $root_dir, $reset = false ) {
 	}
 
 	// Load the current session configuration file.
-	if ( file_exists( $root_dir . '/.env.slic.run' ) ) {
-		load_env_file( $root_dir . '/.env.slic.run' );
+	$run_env_file = $root_dir . '/.env.slic.run';
+	$staged_php_version = null;
+
+	if ( file_exists( $run_env_file ) ) {
+		load_env_file( $run_env_file );
+
+		// Read directly from file to check for staged version before a project's .env.slic.local loads.
+		$run_env               = read_env_file($run_env_file);
+		$is_php_version_staged = ($run_env['SLIC_PHP_VERSION_STAGED'] ?? '') === '1';
+
+		if ( $is_php_version_staged && isset( $run_env['SLIC_PHP_VERSION'] ) ) {
+			$staged_php_version = $run_env['SLIC_PHP_VERSION'];
+		}
 	}
 
 	/*
@@ -300,6 +311,9 @@ function setup_slic_env( $root_dir, $reset = false ) {
 	if ( $target_version ) {
 		putenv( "SLIC_PHP_VERSION=$target_version" );
 		putenv( "SLIC_PHP_CLI_VERSION=$target_version" );
+	} elseif ( $staged_php_version !== null ) {
+		// A PHP version was staged, restore it (project's .env.slic.local may have overwritten it to the wrong version).
+		putenv( "SLIC_PHP_VERSION=$staged_php_version" );
 	}
 
 	// All the possible env files have been loaded, time to set the db image depending on the PHP version.
@@ -391,6 +405,9 @@ function slic_set_php_version( $version, $require_confirm = false, $skip_rebuild
 		return;
 	}
 
+	// Set the environment variable so docker-compose build/rebuild operations use the correct PHP version.
+	putenv( "SLIC_PHP_VERSION=$version" );
+
 	rebuild_stack();
 	update_stack_images();
 	restart_php_services( true );