public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Minor BC Break! Rename COMPOSER_BIN_DIR available inside binaries to COMPOSER_RUNTIME_BIN_DIR (#10512) 

This was available to non-PHP binaries as env var since Composer 2.2.2, and the rename is needed to fix a regression due to a name clash. 

Fixes #10504
pull/10514/head
Jordi Boggiano 2022-02-04 09:23:00 +01:00 committed by GitHub
parent 62d5f4f295
commit 7c2954d349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Installer/BinaryInstaller.php
View File

@ -235,14 +235,14 @@ class BinaryInstaller
return "@ECHO OFF\r\n". return "@ECHO OFF\r\n".
"setlocal DISABLEDELAYEDEXPANSION\r\n". "setlocal DISABLEDELAYEDEXPANSION\r\n".
"SET BIN_TARGET=%~dp0/".trim(ProcessExecutor::escape(basename($link, '.bat')), '"\'')."\r\n". "SET BIN_TARGET=%~dp0/".trim(ProcessExecutor::escape(basename($link, '.bat')), '"\'')."\r\n".
"SET COMPOSER_BIN_DIR=%~dp0\r\n". "SET COMPOSER_RUNTIME_BIN_DIR=%~dp0\r\n".
"{$caller} \"%BIN_TARGET%\" %*\r\n"; "{$caller} \"%BIN_TARGET%\" %*\r\n";
} }
return "@ECHO OFF\r\n". return "@ECHO OFF\r\n".
"setlocal DISABLEDELAYEDEXPANSION\r\n". "setlocal DISABLEDELAYEDEXPANSION\r\n".
"SET BIN_TARGET=%~dp0/".trim(ProcessExecutor::escape($binPath), '"\'')."\r\n". "SET BIN_TARGET=%~dp0/".trim(ProcessExecutor::escape($binPath), '"\'')."\r\n".
"SET COMPOSER_BIN_DIR=%~dp0\r\n". "SET COMPOSER_RUNTIME_BIN_DIR=%~dp0\r\n".
"{$caller} \"%BIN_TARGET%\" %*\r\n"; "{$caller} \"%BIN_TARGET%\" %*\r\n";
} }
@ -434,7 +434,7 @@ if [ -d /proc/cygdrive ]; then
esac esac
fi fi
export COMPOSER_BIN_DIR=\$(cd "\${self%[/\\\\]*}" > /dev/null; pwd) export COMPOSER_RUNTIME_BIN_DIR=\$(cd "\${self%[/\\\\]*}" > /dev/null; pwd)
# If bash is sourcing this file, we have to source the target as well # If bash is sourcing this file, we have to source the target as well
bashSource="\$BASH_SOURCE" bashSource="\$BASH_SOURCE"