From c66dc59131599f8cc03e3b6306904cb033a86592 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Mon, 2 Jan 2023 17:00:43 +0100
Subject: [PATCH] MDL-74905 environment: Apply agreed changes:

- PHP 8.0 required.
- Moodle 3.11.8 required (first minor supporting PHP 8.0 officially).
- MySQL 8.0 required.
- MariaDB 10.6.7 required.
- PostgreSQL 13 required.
- php-sodium extension required.
- 64-bit PHP required.
---
 admin/environment.xml | 16 ++++++++--------
 lang/en/admin.php     |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/admin/environment.xml b/admin/environment.xml
index 4fd06ed0164..8ecafae5fb6 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -3924,20 +3924,20 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
-  <MOODLE version="4.2" requires="3.9">
+  <MOODLE version="4.2" requires="3.11.8">
     <UNICODE level="required">
       <FEEDBACK>
         <ON_ERROR message="unicoderequired" />
       </FEEDBACK>
     </UNICODE>
     <DATABASE level="required">
-      <VENDOR name="mariadb" version="10.4" />
-      <VENDOR name="mysql" version="5.7" />
-      <VENDOR name="postgres" version="12" />
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
       <VENDOR name="mssql" version="14.0" />
       <VENDOR name="oracle" version="19" />
     </DATABASE>
-    <PHP version="7.4.0" level="required">
+    <PHP version="8.0.0" level="required">
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -4019,7 +4019,7 @@
       </PHP_EXTENSION>
       <PHP_EXTENSION name="hash" level="required"/>
       <PHP_EXTENSION name="fileinfo" level="required"/>
-      <PHP_EXTENSION name="sodium" level="optional"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
       <PHP_EXTENSION name="exif" level="optional"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
@@ -4095,9 +4095,9 @@
           <ON_CHECK message="incompleteunicodesupport" />
         </FEEDBACK>
       </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
         <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
+          <ON_ERROR message="sixtyfourbitsrequired" />
         </FEEDBACK>
       </CUSTOM_CHECK>
       <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 99f7463843a..bc34156ec17 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -1258,6 +1258,7 @@ $string['sitepolicyhandlerplugin'] = '{$a->name} ({$a->component})';
 $string['sitepolicyguest'] = 'Site policy URL for guests';
 $string['sitepolicyguest_help'] = 'The URL of the site policy that all guests must see and agree to before accessing the site. Note that this setting will only have an effect if the site policy handler is set to default (core).';
 $string['sitesectionhelp'] = 'If selected, a topic section will be displayed on the site home.';
+$string['sixtyfourbitsrequired'] = 'It has been detected that your site is not using a 64-bit PHP version. You are required to upgrade your system (operating system, PHP...) before installing this Moodle version.';
 $string['sixtyfourbitswarning'] = 'It has been detected that your site is not using a 64-bit PHP version. It is recommended that you upgrade your site to ensure future compatibility.';
 $string['slasharguments'] = 'Use slash arguments';
 $string['slashargumentswarning'] = 'It is recommended that the use of slash arguments is enabled. In future it will be required. For more details, see the documentation <a href="https://docs.moodle.org/en/admin/environment/slasharguments">Using slash arguments</a>.';