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

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -471,13 +471,18 @@ class installer
$composer = Factory::create($io, null, false); $composer = Factory::create($io, null, false);
$core_packages = $this->get_core_packages($composer); $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 = [ $ext_json_data = [
'require' => array_merge( 'require' => array_merge(
['php' => $this->get_core_php_requirement($composer)], ['php' => $this->get_core_php_requirement($composer)],
$core_packages, $core_packages,
$this->get_extra_dependencies(), $this->get_extra_dependencies(),
$packages), $packages),
'replace' => $core_packages, 'replace' => $core_replace,
'repositories' => $this->get_composer_repositories(), 'repositories' => $this->get_composer_repositories(),
'config' => [ 'config' => [
'vendor-dir'=> $this->packages_vendor_dir, 'vendor-dir'=> $this->packages_vendor_dir,

33
phpBB/phpbb/db/migration/data/v330/extensions_composer_2.php Normal file
View file

@ -0,0 +1,33 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v330;
class extensions_composer_2 extends \phpbb\db\migration\migration
{
public function update_data()
{
$repositories = json_decode($this->config('exts_composer_repositories'), true);
$repositories[] = 'https://satis.phpbb.com';
$repositories = array_unique($repositories);
return array(
array('config.update', array('exts_composer_repositories', json_encode($repositories, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES))),
);
}
static public function depends_on()
{
return array('\phpbb\db\migration\data\v330\extensions_composer');
}
}