Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ jobs:
strategy:
matrix:
include:
- php: '8.2'
db: "mariadb:10.2"
- php: '8.2'
db: "mariadb:10.3"
- php: '8.2'
db: "mariadb:10.4"
- php: '8.2'
Expand Down Expand Up @@ -260,10 +256,6 @@ jobs:
strategy:
matrix:
include:
- php: '8.2'
db: "postgres:9.5"
- php: '8.2'
db: "postgres:9.6"
- php: '8.2'
db: "postgres:10"
- php: '8.2'
Expand All @@ -277,17 +269,17 @@ jobs:
- php: '8.2'
db: "postgres:15"
- php: '8.3'
db: "postgres:9.5"
db: "postgres:10"
- php: '8.4'
db: "postgres:9.5"
db: "postgres:10"
- php: '8.5'
db: "postgres:9.5"
db: "postgres:10"

name: PHP ${{ matrix.php }} - ${{ matrix.db }}

services:
postgres:
image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }}
image: ${{ matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }}
env:
POSTGRES_HOST: localhost
POSTGRES_USER: postgres
Expand Down
2 changes: 1 addition & 1 deletion phpBB/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"composer/composer": "^2.0",
"composer/installers": "^2.3",
"composer/package-versions-deprecated": "^1.11",
"doctrine/dbal": "^3.9",
"doctrine/dbal": "^4.4",
"google/recaptcha": "~1.1",
"guzzlehttp/guzzle": " ^7.0",
"marc1706/fast-image-size": "^1.1",
Expand Down
127 changes: 14 additions & 113 deletions phpBB/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions phpBB/docs/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ <h1>Install</h1>
<li>A SQL database system, <strong>one of</strong>:
<ul>
<li>MySQL 8.0 or above (MySQLi required)</li>
<li>MariaDB 10.2.7 or above</li>
<li>PostgreSQL 9.5 or above</li>
<li>SQLite 3.8.3 or above</li>
<li>MS SQL Server 2012 or above</li>
<li>Oracle 12.1.0.2 or above</li>
<li>MariaDB 10.4.3 or above</li>
<li>PostgreSQL 10.0 or above</li>
<li>SQLite 3.16 or above</li>
<li>MS SQL Server 2017 or above</li>
<li>Oracle 18c (12.2.0.2) or above</li>
</ul>
</li>
<li><strong>PHP 8.2.0+</strong> up to and including <strong>PHP 8.5</strong> with support for the database you intend to use.</li>
Expand Down
4 changes: 2 additions & 2 deletions phpBB/docs/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ <h1>Readme</h1>
<ul>
<li>Your server type/version, e.g. Apache 2.4.65, IIS 10, Sambar, etc.</li>
<li>PHP version and mode of operation, e.g. PHP 8.2.0 as a module, PHP 8.2.3 running as CGI, etc.</li>
<li>DB type/version, e.g. MySQL 8.0.44, PostgreSQL 9.5.6, MSSQL Server 2012 (via ODBC), etc.</li>
<li>DB type/version, e.g. MySQL 8.0.44, PostgreSQL 10.23, MSSQL Server 2017 (via ODBC), etc.</li>
</ul>

<p>The relevant database type/version is listed within the administration control panel.</p>
Expand Down Expand Up @@ -326,7 +326,7 @@ <h1>Readme</h1>

<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>

<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 8.0 to 9.4, MariaDB 10.2 to 10.11, PostgreSQL 9.5 to 15, Oracle 12 and SQLite 3. Versions of PHP used range from 8.2.x to 8.3.x, 8.4.x and 8.5.x.</p>
<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 8.0 to 9.4, MariaDB 10.5 to 10.11, PostgreSQL 10 to 15, Oracle 18c and SQLite 3. Versions of PHP used range from 8.2.x to 8.3.x, 8.4.x and 8.5.x.</p>

<a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>

Expand Down
24 changes: 12 additions & 12 deletions phpBB/language/en/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@

<p>phpBB supports the following databases:</p>
<ul>
<li>MySQL 5.6 or above</li>
<li>MariaDB 10.2.7 or above</li>
<li>PostgreSQL 9.4 or above</li>
<li>SQLite 3.8.3 or above</li>
<li>MS SQL Server 2012 or above (via ODBC or the native adapter)</li>
<li>Oracle</li>
<li>MySQL 8.0 or above</li>
<li>MariaDB 10.5.2 or above</li>
<li>PostgreSQL 10.0 or above</li>
<li>SQLite 3.16 or above</li>
<li>MS SQL Server 2017 or above (via ODBC or the native adapter)</li>
<li>Oracle 18c or above</li>
</ul>

<p>Only those databases supported on your server will be displayed.',
Expand Down Expand Up @@ -203,12 +203,12 @@
'INST_ERR_DB_NO_WRITABLE' => 'Both the database and the directory containing it must be writable.',
'INST_ERR_DB_NO_ERROR' => 'No error message given.',
'INST_ERR_PREFIX' => 'Tables with the specified prefix already exist, please choose an alternative.',
'INST_ERR_DB_NO_MARIADB' => 'The version of MariaDB installed on this machine is too old, it must be upgraded to at least 10.2.7.',
'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is too old, it must be upgraded to at least 5.6.',
'INST_ERR_DB_NO_MSSQL' => 'The version of Microsoft SQL Server installed on this machine is too old, it must be upgraded to at least SQL Server 2012 (11.0.2100.60)',
'INST_ERR_DB_NO_SQLITE3' => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.8.3.',
'INST_ERR_DB_NO_ORACLE' => 'The version of Oracle installed is too old, it must be upgraded to at least 12.1.0.2.',
'INST_ERR_DB_NO_POSTGRES' => 'The version of the PostgreSQL you have installed is too old, it must be upgraded to at least 9.4.',
'INST_ERR_DB_NO_MARIADB' => 'The version of MariaDB installed on this machine is too old, it must be upgraded to at least 10.5.2.',
'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is too old, it must be upgraded to at least 8.0.',
'INST_ERR_DB_NO_MSSQL' => 'The version of Microsoft SQL Server installed on this machine is too old, it must be upgraded to at least SQL Server 2017 (12.0.1000.159)',
'INST_ERR_DB_NO_SQLITE3' => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.16.',
'INST_ERR_DB_NO_ORACLE' => 'The version of Oracle installed is too old, it must be upgraded to at least 18c.',
'INST_ERR_DB_NO_POSTGRES' => 'The version of the PostgreSQL you have installed is too old, it must be upgraded to at least 10.0.',
'INST_ERR_DB_NO_POSTGRES_UTF8' => 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
'INST_SCHEMA_FILE_NOT_WRITABLE' => 'The schema file is not writable',

Expand Down
2 changes: 1 addition & 1 deletion phpBB/phpbb/db/doctrine/case_insensitive_string.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
return $platform->getAsciiStringTypeDeclarationSQL($column);
}

return $platform->getVarcharTypeDeclarationSQL($column);
return $platform->getStringTypeDeclarationSQL($column);
}

/**
Expand Down
Loading
Loading