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

Fixed $this usage on static functions

pull/9204/head
Simon Berger 2020-09-11 21:53:12 +02:00
parent bd2f321527
commit 6b3b51e299
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ EOT
} else { } else {
$factory = new Factory; $factory = new Factory;
$process = new ProcessExecutor(); $process = new ProcessExecutor();
$httpDownloader = $factory->createHttpDownloader($io, $config); $httpDownloader = Factory::createHttpDownloader($io, $config);
$downloadManager = $factory->createDownloadManager($io, $config, $httpDownloader, $process); $downloadManager = $factory->createDownloadManager($io, $config, $httpDownloader, $process);
$archiveManager = $factory->createArchiveManager($config, $downloadManager, new Loop($httpDownloader, $process)); $archiveManager = $factory->createArchiveManager($config, $downloadManager, new Loop($httpDownloader, $process));
} }

2
src/Composer/Repository/Vcs/GitLabDriver.php
View File

@ -95,7 +95,7 @@ class GitLabDriver extends VcsDriver
? $match['scheme'] ? $match['scheme']
: (isset($this->repoConfig['secure-http']) && $this->repoConfig['secure-http'] === false ? 'http' : 'https') : (isset($this->repoConfig['secure-http']) && $this->repoConfig['secure-http'] === false ? 'http' : 'https')
; ;
$this->originUrl = $this->determineOrigin($configuredDomains, $guessedDomain, $urlParts, $match['port']); $this->originUrl = self::determineOrigin($configuredDomains, $guessedDomain, $urlParts, $match['port']);
if (false !== strpos($this->originUrl, ':') || false !== strpos($this->originUrl, '/')) { if (false !== strpos($this->originUrl, ':') || false !== strpos($this->originUrl, '/')) {
$this->hasNonstandardOrigin = true; $this->hasNonstandardOrigin = true;