From 10199ae619e750729fc2bf2f71550a7516d70a29 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 8 Feb 2022 23:58:14 +0700 Subject: [PATCH 1/2] [ticket/16964] Fix composer installer deprecation notice PHPBB3-16964 --- phpBB/phpbb/composer/installer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 3e6d87d46f..313c538bdb 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -16,6 +16,7 @@ namespace phpbb\composer; use Composer\Composer; use Composer\DependencyResolver\Request as composer_request; use Composer\Factory; +use Composer\Filter\PlatformRequirementFilter\PlatformRequirementFilterFactory; use Composer\IO\IOInterface; use Composer\IO\NullIO; use Composer\Json\JsonFile; @@ -172,7 +173,7 @@ class installer ->setUpdate(true) ->setUpdateAllowList($whitelist) ->setUpdateAllowTransitiveDependencies(composer_request::UPDATE_ONLY_LISTED) - ->setIgnorePlatformRequirements(false) + ->setPlatformRequirementFilter(PlatformRequirementFilterFactory::fromBoolOrList(false)) ->setOptimizeAutoloader(true) ->setDumpAutoloader(true) ->setPreferStable(true) From 38fe1a4479f5b46bdf06863d8aa4e13998c442a0 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 9 Feb 2022 00:02:06 +0700 Subject: [PATCH 2/2] [ticket/16964] Fix doctrine error in installer Currently AbstractPostgreSQLDriver requires Postgres platform to be an instance of PostgreSQL94Platform. When this will be changed in Doctrine, this fix can be reverted. PHPBB3-16964 --- phpBB/phpbb/db/doctrine/postgresql_platform.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/doctrine/postgresql_platform.php b/phpBB/phpbb/db/doctrine/postgresql_platform.php index 1e81e59b19..ea637b4203 100644 --- a/phpBB/phpbb/db/doctrine/postgresql_platform.php +++ b/phpBB/phpbb/db/doctrine/postgresql_platform.php @@ -14,7 +14,7 @@ namespace phpbb\db\doctrine; use Doctrine\DBAL\Platforms\AbstractPlatform; -use Doctrine\DBAL\Platforms\PostgreSQLPlatform; +use Doctrine\DBAL\Platforms\PostgreSQL94Platform; use Doctrine\DBAL\Schema\Index; use Doctrine\DBAL\Schema\Sequence; use Doctrine\DBAL\Schema\Table; @@ -31,7 +31,7 @@ use Doctrine\DBAL\Types\Type; * to stay compatible with the existing DB we have to change its * naming and not ours. */ -class postgresql_platform extends PostgreSQLPlatform +class postgresql_platform extends PostgreSQL94Platform { /** * {@inheritdoc}