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

Fix composer error when git config safe.bareRepository is set to explicit (#11969)

pull/11962/merge
Krzysztof Ciszewski 2024-05-27 14:56:27 +02:00 committed by GitHub
parent 818e3fc64b
commit 81b121bbdf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 71 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/Composer/Util/ProcessExecutor.php
View File

@ -33,6 +33,13 @@ class ProcessExecutor
private const STATUS_FAILED = 4;
private const STATUS_ABORTED = 5;
private const GIT_CMDS_NEED_GIT_DIR = [
['show'],
['log'],
['branch'],
['remote', 'set-url']
];
/** @var int */
protected static $timeout = 300;
@ -97,19 +104,15 @@ class ProcessExecutor
/**
* @param string|list<string> $command
* @param array<string, string>|null $env
* @param mixed $output
*/
private function doExecute($command, ?string $cwd, bool $tty, &$output = null): int
private function runProcess($command, ?string $cwd, ?array $env, bool $tty, &$output = null): ?int
{
$this->outputCommandRun($command, $cwd, false);
$this->captureOutput = func_num_args() > 3;
$this->errorOutput = '';
if (is_string($command)) {
$process = Process::fromShellCommandline($command, $cwd, null, null, static::getTimeout());
$process = Process::fromShellCommandline($command, $cwd, $env, null, static::getTimeout());
} else {
$process = new Process($command, $cwd, null, null, static::getTimeout());
$process = new Process($command, $cwd, $env, null, static::getTimeout());
}
if (! Platform::isWindows() && $tty) {
@ -124,11 +127,18 @@ class ProcessExecutor
$this->outputHandler($type, $buffer);
};
$signalHandler = SignalHandler::create([SignalHandler::SIGINT, SignalHandler::SIGTERM, SignalHandler::SIGHUP], function (string $signal) {
$signalHandler = SignalHandler::create(
[SignalHandler::SIGINT, SignalHandler::SIGTERM, SignalHandler::SIGHUP],
function (string $signal) {
if ($this->io !== null) {
$this->io->writeError('Received '.$signal.', aborting when child process is done', true, IOInterface::DEBUG);
$this->io->writeError(
'Received '.$signal.', aborting when child process is done',
true,
IOInterface::DEBUG
);
}
});
}
);
try {
$process->run($callback);
@ -150,6 +160,35 @@ class ProcessExecutor
return $process->getExitCode();
}
/**
* @param string|list<string> $command
* @param mixed $output
*/
private function doExecute($command, ?string $cwd, bool $tty, &$output = null): int
{
$this->outputCommandRun($command, $cwd, false);
$this->captureOutput = func_num_args() > 3;
$this->errorOutput = '';
$env = null;
$requiresGitDirEnv = $this->requiresGitDirEnv($command);
if ($cwd !== null && $requiresGitDirEnv) {
$isBareRepository = !is_dir(sprintf('%s/.git', rtrim($cwd, '/')));
if ($isBareRepository) {
$configValue = '';
$this->runProcess('git config safe.bareRepository', $cwd, ['GIT_DIR' => $cwd], $tty, $configValue);
$configValue = trim($configValue);
if ($configValue === 'explicit') {
$env = ['GIT_DIR' => $cwd];
}
}
}
return $this->runProcess($command, $cwd, $env, $tty, $output);
}
/**
* starts a process on the commandline in async mode
*
@ -478,4 +517,23 @@ class ProcessExecutor
return $argument;
}
/**
* @param string[]|string $command
*/
public function requiresGitDirEnv($command): bool
{
$cmd = !is_array($command) ? explode(' ', $command) : $command;
if ($cmd[0] !== 'git') {
return false;
}
foreach (self::GIT_CMDS_NEED_GIT_DIR as $gitCmd) {
if (array_intersect($cmd, $gitCmd) === $gitCmd) {
return true;
}
}
return false;
}
}