From 160133ce2411babe26fff535f64677061a0f67b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Wed, 29 Aug 2012 15:33:22 +0200 Subject: [PATCH] MDL-34725 Make the signatures of process_legacy_element() method consistent The patch fixes the missing parameter type declaration in all subclasses of the moodle1_workshopform_handler class. --- mod/workshop/form/comments/backup/moodle1/lib.php | 7 ++++++- mod/workshop/form/numerrors/backup/moodle1/lib.php | 5 ++++- mod/workshop/form/rubric/backup/moodle1/lib.php | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/mod/workshop/form/comments/backup/moodle1/lib.php b/mod/workshop/form/comments/backup/moodle1/lib.php index 5d557a443c6..2e9a0c01e43 100644 --- a/mod/workshop/form/comments/backup/moodle1/lib.php +++ b/mod/workshop/form/comments/backup/moodle1/lib.php @@ -32,8 +32,13 @@ class moodle1_workshopform_comments_handler extends moodle1_workshopform_handler /** * Converts into + * + * @param array $data legacy element data + * @param array $raw raw element data + * + * @return array converted */ - public function process_legacy_element($data, $raw) { + public function process_legacy_element(array $data, array $raw) { // prepare a fake record and re-use the upgrade logic $fakerecord = (object)$data; $converted = (array)workshopform_comments_upgrade_element($fakerecord, 12345678); diff --git a/mod/workshop/form/numerrors/backup/moodle1/lib.php b/mod/workshop/form/numerrors/backup/moodle1/lib.php index d2c63103811..e18a2f26701 100644 --- a/mod/workshop/form/numerrors/backup/moodle1/lib.php +++ b/mod/workshop/form/numerrors/backup/moodle1/lib.php @@ -49,9 +49,12 @@ class moodle1_workshopform_numerrors_handler extends moodle1_workshopform_handle /** * Converts into and stores it for later writing * + * @param array $data legacy element data + * @param array $raw raw element data + * * @return array to be written to workshop.xml */ - public function process_legacy_element($data, $raw) { + public function process_legacy_element(array $data, array $raw) { $workshop = $this->parenthandler->get_current_workshop(); diff --git a/mod/workshop/form/rubric/backup/moodle1/lib.php b/mod/workshop/form/rubric/backup/moodle1/lib.php index be0a6c6b11a..fe604f807d2 100644 --- a/mod/workshop/form/rubric/backup/moodle1/lib.php +++ b/mod/workshop/form/rubric/backup/moodle1/lib.php @@ -46,8 +46,11 @@ class moodle1_workshopform_rubric_handler extends moodle1_workshopform_handler { /** * Processes one + * + * @param array $data legacy element data + * @param array $raw raw element data */ - public function process_legacy_element($data, $raw) { + public function process_legacy_element(array $data, array $raw) { $this->elements[] = $data; $this->rubrics[$data['id']] = array(); }