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

Make COMPOSER_BIN_DIR env or _composer_bin_dir global available to binaries, fixes #10389 (#10402)

pull/10404/head
Jordi Boggiano 2021-12-28 21:31:52 +01:00 committed by GitHub
parent c1c6698799
commit 6f5baab77b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,12 +231,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".
"{$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".
"{$caller} \"%BIN_TARGET%\" %*\r\n"; "{$caller} \"%BIN_TARGET%\" %*\r\n";
} }
@ -260,14 +262,15 @@ class BinaryInstaller
// carry over the existing shebang if present, otherwise add our own // carry over the existing shebang if present, otherwise add our own
$proxyCode = empty($match[1]) ? '#!/usr/bin/env php' : trim($match[1]); $proxyCode = empty($match[1]) ? '#!/usr/bin/env php' : trim($match[1]);
$binPathExported = $this->filesystem->findShortestPathCode($link, $bin, false, true); $binPathExported = $this->filesystem->findShortestPathCode($link, $bin, false, true);
$autoloadPathCode = $streamProxyCode = $streamHint = ''; $streamProxyCode = $streamHint = '';
$globalsCode = '$GLOBALS[\'_composer_bin_dir\'] = __DIR__;'."\n";
// Don't expose autoload path when vendor dir was not set in custom installers // Don't expose autoload path when vendor dir was not set in custom installers
if ($this->vendorDir) { if ($this->vendorDir) {
$autoloadPathCode = '$GLOBALS[\'_composer_autoload_path\'] = ' . $this->filesystem->findShortestPathCode($link, $this->vendorDir . '/autoload.php', false, true).";\n"; $globalsCode .= '$GLOBALS[\'_composer_autoload_path\'] = ' . $this->filesystem->findShortestPathCode($link, $this->vendorDir . '/autoload.php', false, true).";\n";
} }
// Add workaround for PHPUnit process isolation on PHPUnit 6+ // Add workaround for PHPUnit process isolation on PHPUnit 6+
if ($this->filesystem->normalizePath($bin) === $this->filesystem->normalizePath($this->vendorDir.'/phpunit/phpunit/phpunit')) { if ($this->filesystem->normalizePath($bin) === $this->filesystem->normalizePath($this->vendorDir.'/phpunit/phpunit/phpunit')) {
$autoloadPathCode .= '$GLOBALS[\'__PHPUNIT_ISOLATION_EXCLUDE_LIST\'] = $GLOBALS[\'__PHPUNIT_ISOLATION_BLACKLIST\'] = array(realpath('.$binPathExported.'));'."\n"; $globalsCode .= '$GLOBALS[\'__PHPUNIT_ISOLATION_EXCLUDE_LIST\'] = $GLOBALS[\'__PHPUNIT_ISOLATION_BLACKLIST\'] = array(realpath('.$binPathExported.'));'."\n";
} }
if (trim($match[0]) !== '<?php') { if (trim($match[0]) !== '<?php') {
$streamHint = ' using a stream wrapper to prevent the shebang from being output on PHP<8'."\n *"; $streamHint = ' using a stream wrapper to prevent the shebang from being output on PHP<8'."\n *";
@ -368,7 +371,7 @@ STREAMPROXY;
namespace Composer; namespace Composer;
$autoloadPathCode $globalsCode
$streamProxyCode $streamProxyCode
include $binPathExported; include $binPathExported;
@ -389,6 +392,8 @@ if [ -d /proc/cygdrive ]; then
esac esac
fi fi
export COMPOSER_BIN_DIR=\$(cd "\${0%[/\\\\]*}" > /dev/null; pwd)
"\${dir}/$binFile" "\$@" "\${dir}/$binFile" "\$@"
PROXY; PROXY;