Verified Commit a86a0294 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3421175 by quietone, catch, Gábor Hojtsy, alexpott, smustgrave,... 

Issue #3421175 by quietone, catch, Gábor Hojtsy, alexpott, smustgrave, longwave, daffie: Update INSTALL.txt and hook_requirements() etc. with remaining Drupal 11 platform requirements

(cherry picked from commit c8e201a1)
parent ae9b7557

.gitlab-ci.yml

+3 −32
Original line number Diff line number Diff line
@@ -193,36 +193,12 @@ default: 
# Main listing of jobs.

# All of these are available on Merge Requests and also work as base jobs for

# on-commit and daily jobs to extend from.

'PHP 8.3 MySQL 5.7':

  <<: [ *default-stage, *run-on-mr ]

  variables:

    _TARGET_PHP: "8.3"

    _TARGET_DB: "mysql-5.7"



'PHP 8.3 MariaDB 10.3.22':

  <<: [ *default-stage, *run-on-mr ]

  variables:

    _TARGET_PHP: "8.3"

    _TARGET_DB: "mariadb-10.3.22"



'PHP 8.3 MariaDB 10.6':

  <<: [ *default-stage, *run-on-mr ]

  variables:

    _TARGET_PHP: "8.3"

    _TARGET_DB: "mariadb-10.6"



'PHP 8.3 PostgreSQL 14.1':

  <<: [ *default-stage, *run-on-mr ]

  variables:

    _TARGET_PHP: "8.3"

    _TARGET_DB: "pgsql-14.1"



'PHP 8.3 PostgreSQL 15':

  <<: [ *default-stage, *run-on-mr ]

  variables:

    _TARGET_PHP: "8.3"

    _TARGET_DB: "pgsql-15"



'PHP 8.3 PostgreSQL 16':

  <<: [ *default-stage, *run-on-mr ]

  variables:
@@ -237,14 +213,9 @@ default: 


# Jobs running on commits.

# The value set in the "needs" property will determine the order in the sequence.

'[Commit] PHP 8.3 MySQL 5.7':

  extends: 'PHP 8.3 MySQL 5.7'

  needs: [ 'DEFAULT: PHP 8.3 MySQL 8' ]

  <<: [ *run-on-commit ]



'[Commit] PHP 8.3 PostgreSQL 16':

  extends: 'PHP 8.3 PostgreSQL 16'

  needs: [ '[Commit] PHP 8.3 MySQL 5.7' ]

  needs: [ 'DEFAULT: PHP 8.3 MySQL 8' ]

  <<: [ *run-on-commit ]



'[Commit] PHP 8.3 SQLite 3.45':
@@ -264,8 +235,8 @@ default: 
  needs: [ '[Daily] PHP 8.3 PostgreSQL 16' ]

  <<: [ *run-daily ]



'[Daily] PHP 8.3 MariaDB 10.3.22':

  extends: 'PHP 8.3 MariaDB 10.3.22'

'[Daily] PHP 8.3 MariaDB 10.6':

  extends: 'PHP 8.3 MariaDB 10.6'

  needs: [ '[Daily] PHP 8.3 SQLite 3.45' ]

  <<: [ *run-daily ]

core/INSTALL.txt

+5 −5
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ Drupal requires: 
  - Nginx 1.1 (or greater) (http://nginx.com/).

- PHP 8.3.0 (or greater) (http://php.net/).

- One of the following databases:

  - MySQL 5.7.8 (or greater) (http://www.mysql.com/).

  - MariaDB 10.3.7 (or greater) (https://mariadb.org/). MariaDB is a fully

  - MySQL 8.0.0 (or greater) (http://www.mysql.com/).

  - MariaDB 10.6.0 (or greater) (https://mariadb.org/). MariaDB is a fully

    compatible drop-in replacement for MySQL.

  - Percona Server 5.7.8 (or greater) (http://www.percona.com/). Percona

  - Percona Server 8.0.0 (or greater) (http://www.percona.com/). Percona

    Server is a backwards-compatible replacement for MySQL.

  - PostgreSQL 10 (or greater) (http://www.postgresql.org/).

  - SQLite 3.26 (or greater) (http://www.sqlite.org/).

  - PostgreSQL 16 (or greater) (http://www.postgresql.org/).

  - SQLite 3.45 (or greater) (http://www.sqlite.org/).



For more detailed information about Drupal requirements, including a list of

PHP extensions and configurations that are required, see "System requirements"

core/assets/scaffold/files/default.settings.php

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
 * in deadlocks, the other two options are 'READ UNCOMMITTED' and 'SERIALIZABLE'.

 * They are available but not supported; use them at your own risk. For more

 * info:

 * https://dev.mysql.com/doc/refman/5.7/en/innodb-transaction-isolation-levels.html

 * https://dev.mysql.com/doc/refman/8.0/en/innodb-transaction-isolation-levels.html

 *

 * On your settings.php, change the isolation level:

 * @code

core/modules/migrate/src/Plugin/migrate/source/SqlBase.php

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ protected function initializeIterator() { 
      }

      // If the query has a group by, our added fields need it too, to keep the

      // query valid.

      // @see https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html

      // @see https://dev.mysql.com/doc/refman/8.0/en/group-by-handling.html

      $group_by = $this->query->getGroupBy();

      if ($group_by && $added_fields) {

        foreach ($added_fields as $added_field) {

core/modules/mysql/mysql.install

+1 −8
Original line number Diff line number Diff line
@@ -23,14 +23,7 @@ function mysql_requirements($phase) { 
        return [];

      }



      $query = 'SELECT @@SESSION.tx_isolation';

      // The database variable "tx_isolation" has been removed in MySQL v8.0.3 and

      // has been replaced by "transaction_isolation".

      // @see https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_tx_isolation

      // @see https://dev.mysql.com/doc/refman/8.0/en/added-deprecated-removed.html

      if (!$connection->isMariaDb() && version_compare($connection->version(), '8.0.2-AnyName', '>')) {

        $query = 'SELECT @@SESSION.transaction_isolation';

      }

      $query = $connection->isMariaDb() ? 'SELECT @@SESSION.tx_isolation' : 'SELECT @@SESSION.transaction_isolation';



      $isolation_level = $connection->query($query)->fetchField();