code_review

Author: rdebleu

classes/condition.php

@@ -102,22 +102,20 @@ public function is_available($not, \core_availability\info $info, $grabthelot, $
         if (isset($course->lang) && $course->lang === $this->languageid) {
             $allow = true;
         } else {
-            if ($userid === $USER->id) {
+            $language = match (true) {
                 // Checking the language of the currently logged in user, so do not
                 // default to the account language, because the session language
                 // or the language of the current course may be different.
-                $language = current_language();
-            } else {
-                if (is_null($userid)) {
-                    // Fall back to site language or English.
-                    $language = $CFG->lang;
-                } else {
-                    // Checking access for someone else than the logged in user, so
-                    // use the preferred language of that user account.
-                    // This language is never empty as there is a not-null constraint.
-                    $language = \core_user::get_user($userid)->lang;
-                }
-            }
+                $userid === $USER->id => current_language(),
+
+                // When the userid is null then fall back to site language.
+                is_null($userid) => $CFG->lang,
+
+                // Checking access for someone else than the logged in user, so
+                // use the preferred language of that user account.
+                // This language is never empty as there is a not-null constraint.
+                default => \core_user::get_user($userid)->lang,
+            };
 
             if ($language === $this->languageid) {
                 $allow = true;

tests/condition_test.php

@@ -198,7 +198,9 @@ public function test_save(): void {
     public function test_get_description(): void {
         $mockinfo = new mock_info();
         $language = new condition((object)['type' => 'language', 'id' => '']);
-        $this->assertEquals($language->get_description(false, false, $mockinfo), '');
+        $this->assertSame($language->get_description(false, false, $mockinfo), '');
+        $language = new condition((object)['type' => 'language', 'id' => 'xw']);
+        $this->assertSame($language->get_description(false, false, $mockinfo), '');
         $language = new condition((object)['type' => 'language', 'id' => 'en']);
         $desc = $language->get_description(true, false, $mockinfo);
         $this->assertEquals('The student\'s language is English ‎(en)‎', $desc);
@@ -230,6 +232,8 @@ public function test_is_available(): void {
         $condition = new condition((object)['type' => 'language', 'id' => 'en']);
         $this->assertTrue($condition->is_available(false, $infomodule, false, $user->id));
         $this->assertFalse($condition->is_available(true, $infomodule, false, $user->id));
+        $this->setAdminUser();
+        $this->assertNotEmpty($USER);
     }
 
     /**