From bdc70bbffdfc5db0b0168678e3096994a3cef9bf Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Tue, 18 Apr 2017 10:43:05 +0100
Subject: [PATCH 1/2] MDL-58625 competency restore: avoid use of magic gettter

These were deprecated when persistents moved to core.
---
 backup/moodle2/restore_stepslib.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
index 5f4cf05685c..9a1634ac389 100644
--- a/backup/moodle2/restore_stepslib.php
+++ b/backup/moodle2/restore_stepslib.php
@@ -3272,14 +3272,14 @@ class restore_course_competencies_structure_step extends restore_structure_step
             return;
         }
         $competency = \core_competency\competency::get_record(array('idnumber' => $data->idnumber,
-            'competencyframeworkid' => $framework->get_id()));
+            'competencyframeworkid' => $framework->get('id')));
         if (!$competency) {
             return;
         }
-        $this->set_mapping(\core_competency\competency::TABLE, $data->id, $competency->get_id());
+        $this->set_mapping(\core_competency\competency::TABLE, $data->id, $competency->get('id'));
 
         $params = array(
-            'competencyid' => $competency->get_id(),
+            'competencyid' => $competency->get('id'),
             'courseid' => $this->task->get_courseid()
         );
         $query = 'competencyid = :competencyid AND courseid = :courseid';
@@ -3383,13 +3383,13 @@ class restore_activity_competencies_structure_step extends restore_structure_ste
             return;
         }
         $competency = \core_competency\competency::get_record(array('idnumber' => $data->idnumber,
-            'competencyframeworkid' => $framework->get_id()));
+            'competencyframeworkid' => $framework->get('id')));
         if (!$competency) {
             return;
         }
 
         $params = array(
-            'competencyid' => $competency->get_id(),
+            'competencyid' => $competency->get('id'),
             'cmid' => $this->task->get_moduleid()
         );
         $query = 'competencyid = :competencyid AND cmid = :cmid';

From 34702e22e67d6052b42ff65672e3ead9e85ac1f3 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Tue, 18 Apr 2017 12:51:13 +0100
Subject: [PATCH 2/2] MDL-58625 behat: update tool_lp data generator

---
 admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php b/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php
index 8eea3dc0bb7..166b4c5509a 100644
--- a/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php
+++ b/admin/tool/lp/tests/behat/behat_tool_lp_data_generators.php
@@ -175,11 +175,11 @@ class behat_tool_lp_data_generators extends behat_base {
         if (isset($data['framework'])) {
             $framework = competency_framework::get_record(array('idnumber' => $data['framework']));
             if ($framework) {
-                $data['competencyframeworkid'] = $framework->get_id();
+                $data['competencyframeworkid'] = $framework->get('id');
             } else {
                 $framework = competency_framework::get_record(array('id' => $data['framework']));
                 if ($framework) {
-                    $data['competencyframeworkid'] = $framework->get_id();
+                    $data['competencyframeworkid'] = $framework->get('id');
                 } else {
                     throw new Exception('Could not resolve framework with idnumber or id : "' . $data['category'] . '"');
                 }