commit 5be57d0d7f424e3fb764546ef78623218f01ea38 Author: sam marshall Date: Wed Dec 2 12:11:02 2020 +0000 Environment.xml changes diff --git a/admin/environment.xml b/admin/environment.xml index 3c6365fba8b..7b623c4c016 100644 --- a/admin/environment.xml +++ b/admin/environment.xml @@ -3344,4 +3344,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lang/en/admin.php b/lang/en/admin.php index 18378970dfe..95e3dbfb699 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -1236,6 +1236,7 @@ $string['smtppass'] = 'SMTP password'; $string['smtpsecure'] = 'SMTP security'; $string['smtpuser'] = 'SMTP username'; $string['soaprecommended'] = 'Installing the optional SOAP extension is useful for web services and some plugins.'; +$string['sodiumrecommended'] = 'The Sodium extension allows for more secure storage of certain passwords and data.'; $string['sort_fullname'] = 'Course full name'; $string['sort_idnumber'] = 'Course ID number'; $string['sort_shortname'] = 'Course short name'; diff --git a/lib/tests/environment_test.php b/lib/tests/environment_test.php index f422cbe193e..6b16b88fa2c 100644 --- a/lib/tests/environment_test.php +++ b/lib/tests/environment_test.php @@ -89,6 +89,14 @@ class core_environment_testcase extends advanced_testcase { $this->markTestSkipped('64-bit check is not necessary for unit testing.'); } } + + if ($result->part === 'php_extension' + && $result->info === 'sodium' + && $result->getLevel() === 'optional' + && $result->getStatus() === false) { + $this->markTestSkipped('Sodium extension is not necessary for unit testing.'); + } + $info = "{$result->part}:{$result->info}"; $this->assertTrue($result->getStatus(), "Problem detected in environment ($info), fix all warnings and errors!"); }