makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6388 from marc1706/ticket/16987-master

Browse source 
[ticket/16987] Update composer and dependencies to latest versions - master version
This commit is contained in:
Marc Alexander 2022-04-16 22:20:43 +02:00
commit 70086dcb3b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 417 additions and 380 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
composer.phar
View file

Binary file not shown.

793
phpBB/composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
phpBB/phpbb/composer/installer.php
View file

@ -319,7 +319,7 @@ class installer
if ($repo_url->getValue($repository) === 'https://repo.packagist.org') if ($repo_url->getValue($repository) === 'https://repo.packagist.org')
{ {
$url = 'https://packagist.org/packages/list.json?type=' . $type; $url = 'https://packagist.org/packages/list.json?type=' . $type;
$composer_config = new \Composer\Config([]); $composer_config = new \Composer\Config();
$downloader = new HttpDownloader($io, $composer_config); $downloader = new HttpDownloader($io, $composer_config);
$json = $downloader->get($url)->getBody(); $json = $downloader->get($url)->getBody();

2
phpBB/phpbb/composer/io/html_output_formatter.php
View file

@ -46,7 +46,7 @@ class html_output_formatter extends \Composer\Console\HtmlOutputFormatter
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function format($message) public function format(?string $message): ?string
{ {
$formatted = parent::format($message); $formatted = parent::format($message);