1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00

[ticket/15536] Catalog: adds satis.phpbb.com to repositories

Also always installs composer/installers in vendor-ext too.

PHPBB3-15536
This commit is contained in:
Tristan Darricau
2017-12-30 11:21:57 +01:00
committed by Tristan Darricau
parent 4981f4cddd
commit 5f3898fc5f
2 changed files with 39 additions and 1 deletions

View File

@@ -471,13 +471,18 @@ class installer
$composer = Factory::create($io, null, false);
$core_packages = $this->get_core_packages($composer);
// The composer/installers package must be installed on his own and not provided by the existing autoloader
$core_replace = $core_packages;
unset($core_replace['composer/installers']);
$ext_json_data = [
'require' => array_merge(
['php' => $this->get_core_php_requirement($composer)],
$core_packages,
$this->get_extra_dependencies(),
$packages),
'replace' => $core_packages,
'replace' => $core_replace,
'repositories' => $this->get_composer_repositories(),
'config' => [
'vendor-dir'=> $this->packages_vendor_dir,