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

Make sure path repo reuses an existing ProcessExecutor if provided to it, fixes #10642

pull/10656/head
Jordi Boggiano 2022-03-21 13:43:19 +01:00
parent bd89a67398
commit 8b373a1306
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Repository/PathRepository.php
View File

@ -13,6 +13,7 @@
namespace Composer\Repository; namespace Composer\Repository;
use Composer\Config; use Composer\Config;
use Composer\EventDispatcher\EventDispatcher;
use Composer\IO\IOInterface; use Composer\IO\IOInterface;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Package\CompleteAliasPackage; use Composer\Package\CompleteAliasPackage;
@ -21,6 +22,7 @@ use Composer\Package\Loader\ArrayLoader;
use Composer\Package\Version\VersionGuesser; use Composer\Package\Version\VersionGuesser;
use Composer\Package\Version\VersionParser; use Composer\Package\Version\VersionParser;
use Composer\Pcre\Preg; use Composer\Pcre\Preg;
use Composer\Util\HttpDownloader;
use Composer\Util\Platform; use Composer\Util\Platform;
use Composer\Util\ProcessExecutor; use Composer\Util\ProcessExecutor;
use Composer\Util\Filesystem; use Composer\Util\Filesystem;
@ -109,7 +111,7 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
* @param IOInterface $io * @param IOInterface $io
* @param Config $config * @param Config $config
*/ */
public function __construct(array $repoConfig, IOInterface $io, Config $config) public function __construct(array $repoConfig, IOInterface $io, Config $config, HttpDownloader $httpDownloader, EventDispatcher $dispatcher = null, ProcessExecutor $process = null)
{ {
if (!isset($repoConfig['url'])) { if (!isset($repoConfig['url'])) {
throw new \RuntimeException('You must specify the `url` configuration for the path repository'); throw new \RuntimeException('You must specify the `url` configuration for the path repository');
@ -117,7 +119,7 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
$this->loader = new ArrayLoader(null, true); $this->loader = new ArrayLoader(null, true);
$this->url = Platform::expandPath($repoConfig['url']); $this->url = Platform::expandPath($repoConfig['url']);
$this->process = new ProcessExecutor($io); $this->process = $process ?? new ProcessExecutor($io);
$this->versionGuesser = new VersionGuesser($config, $this->process, new VersionParser()); $this->versionGuesser = new VersionGuesser($config, $this->process, new VersionParser());
$this->repoConfig = $repoConfig; $this->repoConfig = $repoConfig;
$this->options = $repoConfig['options'] ?? array(); $this->options = $repoConfig['options'] ?? array();