From afe97fb57312f2ce5452d12be9362fbfe9153c24 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 20 Dec 2021 23:39:19 +0700 Subject: [PATCH] [ticket/16688] Fix issues with custom repositories Make any custom repo non-canonical to give repo.packagist.org (if enabled) higher repository priority in case custom repo contains outdated/incorrect packages/dependencies. PHPBB3-16688 --- phpBB/phpbb/composer/installer.php | 1 + tests/functional/extension_acp_test.php | 1 + 2 files changed, 2 insertions(+) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 9244644788..3e6d87d46f 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -591,6 +591,7 @@ class installer $repositories[] = [ 'type' => 'composer', 'url' => $repository, + 'canonical' => $this->packagist ? false : true, ]; } } diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index f36df243f3..a4d45506f4 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -254,6 +254,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case $form = $crawler->selectButton('Submit')->form(); $form['minimum_stability']->select('dev'); + $form['repositories'] = 'https://satis.phpbb.com/'; $crawler = self::submit($form); $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text());