mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge pull request #6365 from marc1706/ticket/16964-master
[ticket/16964] Update composer and dependencies to latest versions -- Master version
This commit is contained in:
commit
cf33075fb1
5 changed files with 438 additions and 359 deletions
BIN
composer.phar
BIN
composer.phar
Binary file not shown.
|
@ -82,6 +82,9 @@
|
||||||
"config": {
|
"config": {
|
||||||
"platform": {
|
"platform": {
|
||||||
"php": "7.3.0"
|
"php": "7.3.0"
|
||||||
|
},
|
||||||
|
"allow-plugins": {
|
||||||
|
"composer/installers": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
787
phpBB/composer.lock
generated
787
phpBB/composer.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -16,6 +16,7 @@ namespace phpbb\composer;
|
||||||
use Composer\Composer;
|
use Composer\Composer;
|
||||||
use Composer\DependencyResolver\Request as composer_request;
|
use Composer\DependencyResolver\Request as composer_request;
|
||||||
use Composer\Factory;
|
use Composer\Factory;
|
||||||
|
use Composer\Filter\PlatformRequirementFilter\PlatformRequirementFilterFactory;
|
||||||
use Composer\IO\IOInterface;
|
use Composer\IO\IOInterface;
|
||||||
use Composer\IO\NullIO;
|
use Composer\IO\NullIO;
|
||||||
use Composer\Json\JsonFile;
|
use Composer\Json\JsonFile;
|
||||||
|
@ -172,7 +173,7 @@ class installer
|
||||||
->setUpdate(true)
|
->setUpdate(true)
|
||||||
->setUpdateAllowList($whitelist)
|
->setUpdateAllowList($whitelist)
|
||||||
->setUpdateAllowTransitiveDependencies(composer_request::UPDATE_ONLY_LISTED)
|
->setUpdateAllowTransitiveDependencies(composer_request::UPDATE_ONLY_LISTED)
|
||||||
->setIgnorePlatformRequirements(false)
|
->setPlatformRequirementFilter(PlatformRequirementFilterFactory::fromBoolOrList(false))
|
||||||
->setOptimizeAutoloader(true)
|
->setOptimizeAutoloader(true)
|
||||||
->setDumpAutoloader(true)
|
->setDumpAutoloader(true)
|
||||||
->setPreferStable(true)
|
->setPreferStable(true)
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
namespace phpbb\db\doctrine;
|
namespace phpbb\db\doctrine;
|
||||||
|
|
||||||
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
||||||
use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
|
use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
|
||||||
use Doctrine\DBAL\Schema\Index;
|
use Doctrine\DBAL\Schema\Index;
|
||||||
use Doctrine\DBAL\Schema\Sequence;
|
use Doctrine\DBAL\Schema\Sequence;
|
||||||
use Doctrine\DBAL\Schema\Table;
|
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
|
* to stay compatible with the existing DB we have to change its
|
||||||
* naming and not ours.
|
* naming and not ours.
|
||||||
*/
|
*/
|
||||||
class postgresql_platform extends PostgreSQLPlatform
|
class postgresql_platform extends PostgreSQL94Platform
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
|
|
Loading…
Add table
Reference in a new issue