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

Fix ProcessExecutor bootstrapping, fixes #10703

pull/10718/head
Jordi Boggiano 2022-04-07 15:16:13 +02:00
parent 0efb557afc
commit 849bc51ce7
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
10 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/CreateProjectCommand.php
View File

@ -235,7 +235,7 @@ EOT
}
}
$process = new ProcessExecutor($io);
$process = $composer->getLoop()->getProcessExecutor();
$fs = new Filesystem($process);
// dispatch event

4
src/Composer/Command/DiagnoseCommand.php
View File

@ -80,6 +80,9 @@ EOT
$io->write('Checking composer.json: ', false);
$this->outputResult($this->checkComposerSchema());
$this->process = $composer->getLoop()->getProcessExecutor() ?? new ProcessExecutor($io);
} else {
$this->process = new ProcessExecutor($io);
}
if ($composer) {
@ -92,7 +95,6 @@ EOT
$config->prohibitUrlByConfig('http://repo.packagist.org', new NullIO);
$this->httpDownloader = Factory::createHttpDownloader($io, $config);
$this->process = new ProcessExecutor($io);
$io->write('Checking platform settings: ', false);
$this->outputResult($this->checkPlatform());

2
src/Composer/Command/StatusCommand.php
View File

@ -96,7 +96,7 @@ EOT
$vcsVersionChanges = array();
$parser = new VersionParser;
$guesser = new VersionGuesser($composer->getConfig(), new ProcessExecutor($io), $parser);
$guesser = new VersionGuesser($composer->getConfig(), $composer->getLoop()->getProcessExecutor() ?? new ProcessExecutor($io), $parser);
$dumper = new ArrayDumper;
// list packages

2
src/Composer/Downloader/FileDownloader.php
View File

@ -89,7 +89,7 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface
$this->eventDispatcher = $eventDispatcher;
$this->httpDownloader = $httpDownloader;
$this->cache = $cache;
$this->process = $process ?: new ProcessExecutor($io);
$this->process = $process ?? new ProcessExecutor($io);
$this->filesystem = $filesystem ?: new Filesystem($this->process);
if ($this->cache && $this->cache->gcIsNecessary()) {

4
src/Composer/Downloader/VcsDownloader.php
View File

@ -45,8 +45,8 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
{
$this->io = $io;
$this->config = $config;
$this->process = $process ?: new ProcessExecutor($io);
$this->filesystem = $fs ?: new Filesystem($this->process);
$this->process = $process ?? new ProcessExecutor($io);
$this->filesystem = $fs ?? new Filesystem($this->process);
}
/**

2
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -71,7 +71,7 @@ class EventDispatcher
{
$this->composer = $composer;
$this->io = $io;
$this->process = $process ?: new ProcessExecutor($io);
$this->process = $process ?? new ProcessExecutor($io);
$this->eventStack = array();
}

2
src/Composer/Package/Locker.php
View File

@ -68,7 +68,7 @@ class Locker
$this->contentHash = self::getContentHash($composerFileContents);
$this->loader = new ArrayLoader(null, true);
$this->dumper = new ArrayDumper();
$this->process = $process ?: new ProcessExecutor($io);
$this->process = $process ?? new ProcessExecutor($io);
}
/**

2
src/Composer/Platform/HhvmDetector.php
View File

@ -54,7 +54,7 @@ class HhvmDetector
$this->executableFinder = $this->executableFinder ?: new ExecutableFinder();
$hhvmPath = $this->executableFinder->find('hhvm');
if ($hhvmPath !== null) {
$this->processExecutor = $this->processExecutor ?: new ProcessExecutor();
$this->processExecutor = $this->processExecutor ?? new ProcessExecutor();
$exitCode = $this->processExecutor->execute(
ProcessExecutor::escape($hhvmPath).
' --php -d hhvm.jit=0 -r "echo HHVM_VERSION;" 2>/dev/null',

2
src/Composer/Repository/RepositoryManager.php
View File

@ -51,7 +51,7 @@ class RepositoryManager
$this->config = $config;
$this->httpDownloader = $httpDownloader;
$this->eventDispatcher = $eventDispatcher;
$this->process = $process ?: new ProcessExecutor($io);
$this->process = $process ?? new ProcessExecutor($io);
}
/**

2
src/Composer/Repository/VcsRepository.php
View File

@ -99,7 +99,7 @@ class VcsRepository extends ArrayRepository implements ConfigurableRepositoryInt
$this->repoConfig = $repoConfig;
$this->versionCache = $versionCache;
$this->httpDownloader = $httpDownloader;
$this->processExecutor = $process ?: new ProcessExecutor($io);
$this->processExecutor = $process ?? new ProcessExecutor($io);
}
public function getRepoName()