remove branching for unsupported versions

Author: TamaroWalter

classes/post/post.php

@@ -494,11 +494,7 @@ public function moodleoverflow_get_complete_post() {
         global $DB, $CFG;
         $this->existence_check();
 
-        if ($CFG->branch >= 311) {
-            $allnames = \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
-        } else {
-            $allnames = implode(', ', fields::get_name_fields());
-        }
+        $allnames = \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
         $sql = "SELECT p.*, d.moodleoverflow, $allnames, u.email, u.picture, u.imagealt
                 FROM {moodleoverflow_posts} p
                     JOIN {moodleoverflow_discussions} d ON p.discussion = d.id

classes/task/send_review_mails.php

@@ -24,6 +24,7 @@
 
 namespace mod_moodleoverflow\task;
 
+use core\cron;
 use core\session\exception;
 use mod_moodleoverflow\anonymous;
 use mod_moodleoverflow\manager\mail_manager;
@@ -123,12 +124,7 @@ public function send_review_notifications() {
 
             foreach ($usersto as $userto) {
                 try {
-                    // Check for moodle version. Version 401 supported until 8 December 2025.
-                    if ($CFG->branch >= 402) {
-                        \core\cron::setup_user($userto, $course);
-                    } else {
-                        cron_setup_user($userto, $course);
-                    }
+                    cron::setup_user($userto, $course);
 
                     $maildata = new moodleoverflow_email(
                         $course,

locallib.php

@@ -24,6 +24,8 @@
  * @copyright 2017 Kennet Winter <[email protected]>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+use core_user\fields;
 use mod_moodleoverflow\anonymous;
 use mod_moodleoverflow\capabilities;
 use mod_moodleoverflow\event\post_deleted;
@@ -69,28 +71,13 @@ function moodleoverflow_get_discussions($cm, $page = -1, $perpage = 0) {
     }
 
     // Get all name fields as sql string snippet.
-    if ($CFG->branch >= 311) {
-        $allnames = \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
-    } else {
-        $allnames = get_all_user_name_fields(true, 'u');
-    }
+    $allnames = fields::for_name()->get_sql('u', false, '', '', false)->selects;
     $postdata = 'p.id, p.modified, p.discussion, p.userid, p.reviewed';
     $discussiondata = 'd.name, d.timemodified, d.timestart, d.usermodified, d.firstpost';
     $userdata = 'u.email, u.picture, u.imagealt';
 
-    if ($CFG->branch >= 311) {
-        $usermodifiedfields = \core_user\fields::for_name()->get_sql(
-            'um',
-            false,
-            'um',
-            '',
-            false
-        )->selects .
+    $usermodifiedfields = fields::for_name()->get_sql('um', false, 'um', '', false)->selects .
             ', um.email AS umemail, um.picture AS umpicture, um.imagealt AS umimagealt';
-    } else {
-        $usermodifiedfields = get_all_user_name_fields(true, 'um', null, 'um') .
-            ', um.email AS umemail, um.picture AS umpicture, um.imagealt AS umimagealt';
-    }
 
     $params = [$cm->instance];
     $whereconditions = ['d.moodleoverflow = ?', 'p.parent = 0'];
@@ -313,11 +300,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = -
 
         // Get information about the user who started the discussion.
         $startuser = new stdClass();
-        if ($CFG->branch >= 311) {
-            $startuserfields = \core_user\fields::get_picture_fields();
-        } else {
-            $startuserfields = explode(',', user_picture::fields());
-        }
+        $startuserfields = fields::get_picture_fields();
 
         $startuser = username_load_fields_from_object($startuser, $discussion, null, $startuserfields);
         $startuser->id = $discussion->userid;
@@ -676,7 +659,7 @@ function moodleoverflow_get_discussions_unread($cm) {
  */
 function moodleoverflow_get_post_full($postid) {
     global $DB;
-    $allnames = \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
+    $allnames = fields::for_name()->get_sql('u', false, '', '', false)->selects;
     $sql = "SELECT p.*, d.moodleoverflow, $allnames, u.email, u.picture, u.imagealt
               FROM {moodleoverflow_posts} p
                    JOIN {moodleoverflow_discussions} d ON p.discussion = d.id
@@ -1093,11 +1076,7 @@ function moodleoverflow_get_all_discussion_posts($discussionid, $tracking, $modc
     }
 
     // Get all username fields.
-    if ($CFG->branch >= 311) {
-        $allnames = \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
-    } else {
-        $allnames = get_all_user_name_fields(true, 'u');
-    }
+    $allnames = fields::for_name()->get_sql('u', false, '', '', false)->selects;
 
     $additionalwhere = '';
 
@@ -1284,11 +1263,7 @@ function moodleoverflow_print_post(
 
     // Build the object that represents the posting user.
     $postinguser = new stdClass();
-    if ($CFG->branch >= 311) {
-        $postinguserfields = \core_user\fields::get_picture_fields();
-    } else {
-        $postinguserfields = explode(',', user_picture::fields());
-    }
+    $postinguserfields = fields::get_picture_fields();
     $postinguser = username_load_fields_from_object($postinguser, $post, null, $postinguserfields);
 
     // Post was anonymized.

mod_form.php

@@ -71,11 +71,7 @@ public function definition() {
         $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
         // Adding the standard "intro" and "introformat" fields.
-        if ($CFG->branch >= 29) {
-            $this->standard_intro_elements();
-        } else {
-            $this->add_intro_editor();
-        }
+        $this->standard_intro_elements();
 
         $currentsetting = $this->current && property_exists($this->current, 'anonymous') ? $this->current->anonymous : 0;
         $possiblesettings = [
@@ -174,7 +170,7 @@ public function definition() {
         $mform->addElement(
             'header',
             'gradeheading',
-            $CFG->branch >= 311 ? get_string('gradenoun') : get_string('grade')
+            get_string('gradenoun')
         );
 
         $mform->addElement('text', 'grademaxgrade', get_string('modgrademaxgrade', 'grades'));

tests/behat/behat_mod_moodleoverflow.php

@@ -225,30 +225,10 @@ public function i_comment_moodleoverflow_post_with_message(string $postmessage,
      * @param TableNode $data
      */
     public function i_add_moodleoverflow_to_course_and_fill_form(string $courseshortname, string $sectionnumber, TableNode $data) {
-        global $CFG;
-
-        if ($CFG->branch >= 404) {
-            $this->execute(
-                "behat_course::i_add_to_course_section_and_i_fill_the_form_with",
-                [$this->escape('moodleoverflow'), $this->escape($courseshortname), $this->escape($sectionnumber), $data]
-            );
-        } else {
-            // This is the code from the deprecated behat function "i_add_to_section_and_i_fill_the_form_with".
-            // Add activity to section.
-            $this->execute(
-                "behat_course::i_add_to_section",
-                [$this->escape('moodleoverflow'), $this->escape($sectionnumber)]
-            );
-
-            // Wait to be redirected.
-            $this->execute('behat_general::wait_until_the_page_is_ready');
-
-            // Set form fields.
-            $this->execute("behat_forms::i_set_the_following_fields_to_these_values", $data);
-
-            // Save course settings.
-            $this->execute("behat_forms::press_button", get_string('savechangesandreturntocourse'));
-        }
+        $this->execute(
+            "behat_course::i_add_to_course_section_and_i_fill_the_form_with",
+            [$this->escape('moodleoverflow'), $this->escape($courseshortname), $this->escape($sectionnumber), $data]
+        );
     }
 
     /**

tests/review_test.php

@@ -262,11 +262,7 @@ private function assert_matches_properties($expected, $actual) {
         $expected = (array)$expected;
         $actual = (object)$actual;
         foreach ($expected as $key => $value) {
-            if ($CFG->branch >= 404) {
-                $this->assertObjectHasProperty($key, $actual, "Failed asserting that attribute '$key' exists.");
-            } else {
-                $this->assertObjectHasAttribute($key, $actual, "Failed asserting that attribute '$key' exists.");
-            }
+            $this->assertObjectHasProperty($key, $actual, "Failed asserting that attribute '$key' exists.");
             $this->assertEquals($value, $actual->$key, "Failed asserting that \$obj->$key '" . $actual->$key . "' equals '$value'");
         }
     }