mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-57730 core_calendar: fixed incompatibility with PHP 5.x

Browse Source 
Also removed unused function and fixed PHPDocs.

Part of MDL-55611 epic.
This commit is contained in:
Mark Nelson 2017-02-20 16:17:28 +08:00 committed by Damyon Wiese
parent aa457b7dee
commit 5e6e3babf4
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
calendar/classes/local/event/data_access/event_vault.php
View File

@ -59,10 +59,10 @@ class event_vault implements event_vault_interface {
/**
* Retrieve an event for the given id.
*
* @param in $id The event id
* @param int $id The event id
* @return event_interface
*/
public function get_event_by_id(int $id) {
public function get_event_by_id($id) {
global $DB;
if ($record = $DB->get_record('event', ['id' => $id])) {
@ -80,14 +80,16 @@ class event_vault implements event_vault_interface {
* @param int|null $timesortto Events with timesort until this value (inclusive)
* @param event_interface|null $afterevent Only return events after this one
* @param int $limitnum Return at most this number of events
* @throws timesort_invalid_parameter_exception
* @throws limit_invalid_parameter_exception
* @return action_event_interface
*/
public function get_action_events_by_timesort(
\stdClass $user,
int $timesortfrom = null,
int $timesortto = null,
$timesortfrom = null,
$timesortto = null,
event_interface $afterevent = null,
int $limitnum = 20
$limitnum = 20
) {
global $DB;
@ -154,21 +156,4 @@ class event_vault implements event_vault_interface {
private function transform_from_database_record(\stdClass $record) {
return $this->factory->create_instance($record);
}
/**
* Create an array of events from an array of database records.
*
* @param array $records The database records
* @return array
*/
private function transform_from_database_records(array $records) {
$events = [];
foreach ($records as $record) {
if ($event = $this->transform_from_database_record($record)) {
$events[] = $event;
}
}
return $events;
}
}

10
calendar/classes/local/interfaces/event_vault_interface.php
View File

@ -34,10 +34,10 @@ interface event_vault_interface {
/**
* Retrieve an event for the given id.
*
* @param in $id The event id
* @param int $id The event id
* @return event_interface|false
*/
public function get_event_by_id(int $id);
public function get_event_by_id($id);
/**
* Retrieve an array of events for the given user and time constraints.
@ -51,9 +51,9 @@ interface event_vault_interface {
*/
public function get_action_events_by_timesort(
\stdClass $user,
int $timesortfrom,
int $timesortto,
$timesortfrom,
$timesortto,
event_interface $afterevent,
int $limitnum
$limitnum
);
}