Skip to content

Commit

Permalink
Merge branch 'MDL-83470-main' of https://github.com/junpataleta/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
HuongNV13 authored and junpataleta committed Nov 28, 2024
2 parents 376bcbe + 17e8952 commit d08c982
Show file tree
Hide file tree
Showing 130 changed files with 584 additions and 1,267 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
include:
# MySQL builds always run with the lowest PHP supported version.
- os: ubuntu-22.04
php: 8.1
php: 8.2
extensions:
db: mysqli
# PostgreSQL builds always run with the highest PHP supported version.
Expand All @@ -76,7 +76,7 @@ jobs:
uses: moodlehq/mysql-action@v1
with:
collation server: utf8mb4_bin
mysql version: 8.0
mysql version: 8.4
mysql database: test
mysql user: test
mysql password: test
Expand All @@ -88,7 +88,7 @@ jobs:
if: ${{ matrix.db == 'pgsql' }}
uses: m4nu56/postgresql-action@v1
with:
postgresql version: 13
postgresql version: 14
postgresql db: test
postgresql user: test
postgresql password: test
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ jobs:
db: pgsql
extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium, zip
- os: windows-latest
php: 8.1
php: 8.2
db: pgsql
extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium
extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium, zip

steps:
- name: Setting up DB mysql
if: ${{ matrix.db == 'mysqli' }}
uses: shogo82148/actions-setup-mysql@v1
with:
mysql-version: 8.0
mysql-version: 8.4
user: test
password: test

Expand Down
194 changes: 194 additions & 0 deletions admin/environment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4703,4 +4703,198 @@
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="5.0" requires="4.2.3">
<UNICODE level="required">
<FEEDBACK>
<ON_ERROR message="unicoderequired" />
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
<VENDOR name="mariadb" version="10.11.0" />
<VENDOR name="mysql" version="8.4" />
<VENDOR name="postgres" version="14" />
<VENDOR name="mssql" version="14.0" />
</DATABASE>
<PHP version="8.2.0" level="required">
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
<ON_CHECK message="pcreunicodewarning" />
</FEEDBACK>
</PCREUNICODE>
<PHP_EXTENSIONS>
<PHP_EXTENSION name="iconv" level="required">
<FEEDBACK>
<ON_ERROR message="iconvrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="mbstring" level="required">
<FEEDBACK>
<ON_ERROR message="mbstringrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="curl" level="required">
<FEEDBACK>
<ON_ERROR message="curlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="openssl" level="required">
<FEEDBACK>
<ON_ERROR message="opensslrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="tokenizer" level="optional">
<FEEDBACK>
<ON_CHECK message="tokenizerrecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="soap" level="optional">
<FEEDBACK>
<ON_CHECK message="soaprecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="ctype" level="required">
<FEEDBACK>
<ON_ERROR message="ctyperequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="zip" level="required">
<FEEDBACK>
<ON_ERROR message="ziprequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="zlib" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="gd" level="required">
<FEEDBACK>
<ON_ERROR message="gdrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="simplexml" level="required">
<FEEDBACK>
<ON_ERROR message="simplexmlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="spl" level="required">
<FEEDBACK>
<ON_ERROR message="splrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="pcre" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="dom" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="xml" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="xmlreader" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="intl" level="required">
<FEEDBACK>
<ON_ERROR message="intlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="json" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="hash" level="required"/>
<PHP_EXTENSION name="fileinfo" level="required"/>
<PHP_EXTENSION name="sodium" level="required"/>
<PHP_EXTENSION name="exif" level="optional"/>
</PHP_EXTENSIONS>
<PHP_SETTINGS>
<PHP_SETTING name="memory_limit" value="96M" level="required">
<FEEDBACK>
<ON_ERROR message="settingmemorylimit" />
</FEEDBACK>
</PHP_SETTING>
<PHP_SETTING name="file_uploads" value="1" level="optional">
<FEEDBACK>
<ON_CHECK message="settingfileuploads" />
</FEEDBACK>
</PHP_SETTING>
<PHP_SETTING name="opcache.enable" value="1" level="optional">
<FEEDBACK>
<ON_CHECK message="opcacherecommended" />
</FEEDBACK>
</PHP_SETTING>
</PHP_SETTINGS>
<CUSTOM_CHECKS>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbstorageengine" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
<FEEDBACK>
<ON_ERROR message="quizattemptsupgradedmessage" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
<FEEDBACK>
<ON_CHECK message="slashargumentswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
<FEEDBACK>
<ON_CHECK message="unsupporteddbtablerowformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
<FEEDBACK>
<ON_CHECK message="unoconvwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbfileformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbfilepertable" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddblargeprefix" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
<FEEDBACK>
<ON_CHECK message="ishttpswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
<FEEDBACK>
<ON_CHECK message="incompleteunicodesupport" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
<FEEDBACK>
<ON_ERROR message="sixtyfourbitsrequired" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
<FEEDBACK>
<ON_CHECK message="iscustomadminwarnings" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
3 changes: 0 additions & 3 deletions admin/tool/cohortroles/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
function xmldb_tool_cohortroles_upgrade($oldversion) {
global $DB;

// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/customlang/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
*/

function xmldb_tool_customlang_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/dataprivacy/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {

$dbman = $DB->get_manager();

// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/log/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
* @return bool always true
*/
function xmldb_tool_log_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/log/store/database/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
*/

function xmldb_logstore_database_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/log/store/standard/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
*/

function xmldb_logstore_standard_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/mobile/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
* @return bool always true
*/
function xmldb_tool_mobile_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/monitor/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
* @return bool always true
*/
function xmldb_tool_monitor_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/moodlenet/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
* @return bool always true
*/
function xmldb_tool_moodlenet_upgrade(int $oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/policy/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
* @return bool
*/
function xmldb_tool_policy_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/recyclebin/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ function xmldb_tool_recyclebin_upgrade($oldversion) {

$dbman = $DB->get_manager();

// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions admin/tool/usertours/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
* @return bool
*/
function xmldb_tool_usertours_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions auth/cas/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
* @return bool result
*/
function xmldb_auth_cas_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions auth/db/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
* @return bool result
*/
function xmldb_auth_db_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
3 changes: 0 additions & 3 deletions auth/email/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
* @return bool result
*/
function xmldb_auth_email_upgrade($oldversion) {
// Automatically generated Moodle v4.1.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.2.0 release upgrade line.
// Put any upgrade step following this.

Expand Down
Loading

0 comments on commit d08c982

Please sign in to comment.