CTP-6305 Code review changes

Author: amandadoughty

backup/moodle2/restore_format_ucl_plugin.class.php

@@ -30,7 +30,6 @@ class restore_format_ucl_plugin extends \restore_format_plugin {
      * Returns the paths to be handled by the plugin at course level
      */
     protected function define_course_plugin_structure(): array {
-        $paths = [];
         $paths[] = new restore_path_element(
             'customcontact',
             $this->get_pathfor('/customcontacts/customcontact')
@@ -48,14 +47,13 @@ protected function define_course_plugin_structure(): array {
     public function process_customcontact($data): void {
         global $DB;
 
-        $data = (object)$data;
         /* We only process this information if the course we are restoring to
-           has 'ucl' format (target format can change depending of restore options). */
-        $format = $DB->get_field('course', 'format', ['id' => $this->task->get_courseid()]);
-        if ($format != 'ucl') {
-            return;
+           has 'ucl' format (target format can change depending on restore options). */
+        if ($DB->get_field('course', 'format', ['id' => $this->task->get_courseid()]) != 'ucl') {
+              return;
         }
 
+        $data = (object)$data;
         $oldid = $data->id;
         $data->courseid = $this->task->get_courseid();
         unset($data->id);

tests/behat/backup.feature

@@ -6,8 +6,8 @@ Feature: Custom contacts are backed up and restored
 
   Background:
     Given the following "courses" exist:
-      | fullname | shortname | format | coursedisplay | numsections | startdate     |
-      | Course 1 | C1        | ucl    | 0             | 5           | ##yesterday## |
+      | fullname | shortname | format | coursedisplay | numsections |
+      | Course 1 | C1        | ucl    | 0             | 5           |
     And the following "users" exist:
       | username | firstname | lastname | email                |
       | teacher1 | Teacher   | 1        | teacher1@example.com |
@@ -24,7 +24,7 @@ Feature: Custom contacts are backed up and restored
     And I set the following fields to these values:
       | Role        | Ring Master           |
       | Name        | Jack Tucker           |
-      | Email       | zzucker@stamptown.com |
+      | Email       | zzucker@example.com |
       | Description | Clown king            |
     And I press "Save"
 
@@ -39,5 +39,5 @@ Feature: Custom contacts are backed up and restored
     And I click on "Course contacts" "link"
     Then I should see "Ring Master"
     And I should see "Jack Tucker"
-    And I should see "zzucker@stamptown.com"
+    And I should see "zzucker@example.com"
     And I should see "Clown king"