mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-04 07:52:48 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-83412-main' of https://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2024-11-28 12:11:58 +08:00
commit 0069dde1d9
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
9 changed files with 434 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/uploadcourse/tests/course_test.php
View File

@ -1504,7 +1504,7 @@ class course_test extends \advanced_testcase {
// Create our custom field.
$category = $this->get_customfield_generator()->create_category();
$this->create_custom_field($category, 'date', 'mydate',
['mindate' => strtotime('2020-04-01'), 'maxdate' => '2020-04-30']);
['mindate' => strtotime('2020-04-01'), 'maxdate' => strtotime('2020-04-30')]);
$mode = tool_uploadcourse_processor::MODE_UPDATE_ONLY;
$updatemode = tool_uploadcourse_processor::UPDATE_ALL_WITH_DATA_ONLY;

6
calendar/tests/calendartype_test.php
View File

@ -196,6 +196,12 @@ class calendartype_test extends \advanced_testcase {
$this->assertEquals($calendar->timestamp_to_date_string($this->user->timecreated, '', 99, true, true),
userdate($this->user->timecreated));
// Test the userdate function with a timezone.
$this->assertEquals(
$calendar->timestamp_to_date_string($this->user->timecreated, '', 'Australia/Sydney', true, true),
userdate($this->user->timecreated, timezone: 'Australia/Sydney'),
);
// Test the calendar/lib.php functions.
$this->assertEquals($calendar->get_weekdays(), calendar_get_days());
$this->assertEquals($calendar->get_starting_weekday(), calendar_get_starting_weekday());

80
calendar/type/gregorian/classes/structure.php
View File

@ -276,13 +276,6 @@ class structure extends type_base {
/**
* Returns a formatted string that represents a date in user time.
*
* Returns a formatted string that represents a date in user time
* <b>WARNING: note that the format is for strftime(), not date().</b>
* Because of a bug in most Windows time libraries, we can't use
* the nicer %e, so we have to use %d which has leading zeroes.
* A lot of the fuss in the function is just getting rid of these leading
* zeroes as efficiently as possible.
*
* If parameter fixday = true (default), then take off leading
* zero from %d, else maintain it.
*
@ -303,43 +296,62 @@ class structure extends type_base {
$format = get_string('strftimedaydatetime', 'langconfig');
}
if (!empty($CFG->nofixday)) { // Config.php can force %d not to be fixed.
$fixday = false;
} else if ($fixday) {
$formatnoday = str_replace('%d', 'DD', $format);
$fixday = ($formatnoday != $format);
$format = $formatnoday;
// Note: This historical logic was about fixing 12-hour time to remove
// unnecessary leading zero was required because on Windows, PHP strftime
// function did not support the correct 'hour without leading zero' parameter (%l).
// This is no longer required because we use IntlDateFormatter.
// Unfortunately though the original implementation was done incorrectly.
// The documentation for strftime notes that for the "%l" and "%e" specifiers where
// no leading zero is used, a space is used instead.
// As a result we switch to the new format specifiers "%l" and "%e", wrap them in placeholders
// and then remove the spaces.
if (empty($CFG->nofixday) && $fixday) {
// Config.php can force %d not to be fixed, but only if the format did not specify it.
$format = str_replace(
'%d',
'DDHH%eHHDD',
$format,
);
}
// Note: This logic about fixing 12-hour time to remove unnecessary leading
// zero is required because on Windows, PHP strftime function does not
// support the correct 'hour without leading zero' parameter (%l).
if (!empty($CFG->nofixhour)) {
// Config.php can force %I not to be fixed.
$fixhour = false;
} else if ($fixhour) {
$formatnohour = str_replace('%I', 'HH', $format);
$fixhour = ($formatnohour != $format);
$format = $formatnohour;
if (empty($CFG->nofixhour) && $fixhour) {
$format = str_replace(
'%I',
'DDHH%lHHDD',
$format,
);
}
$time = (int)$time; // Moodle allows rubbish in input...
$datestring = date_format_string($time, $format, $timezone);
if (is_string($time) && !is_numeric($time)) {
debugging(
"Invalid time passed to timestamp_to_date_string: '{$time}'",
DEBUG_DEVELOPER,
);
$time = 0;
}
if ($time === null || $time === '') {
$time = 0;
}
$time = new \DateTime("@{$time}", new \DateTimeZone(date_default_timezone_get()));
date_default_timezone_set(\core_date::get_user_timezone($timezone));
if ($fixday) {
$daystring = ltrim(str_replace(array(' 0', ' '), '', date(' d', $time)));
$datestring = str_replace('DD', $daystring, $datestring);
}
if ($fixhour) {
$hourstring = ltrim(str_replace(array(' 0', ' '), '', date(' h', $time)));
$datestring = str_replace('HH', $hourstring, $datestring);
}
$formattedtime = \core_date::strftime(
$format,
$time,
get_string('locale', 'langconfig'),
);
\core_date::set_default_server_timezone();
return $datestring;
// Use a simple regex to remove the placeholders and any leading spaces to match the historically
// generated format.
$formattedtime = preg_replace('/DDHH ?(\d{1,2})HHDD/', '$1', $formattedtime);
return $formattedtime;
}
/**

193
calendar/type/gregorian/tests/structure_test.php Normal file
View File

@ -0,0 +1,193 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace calendartype_gregorian;
/**
* Tests for Gregorian calendar type
*
* @package calendartype_gregorian
* @category test
* @copyright Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \calendartype_gregorian\structure
*/
final class structure_test extends \advanced_testcase {
public function tearDown(): void {
parent::tearDown();
get_string_manager(true);
}
/**
* Test the timestamp_to_date_string method with different input values.
*
* @dataProvider timestamp_to_date_string_provider
* @param string $locale
* @param int $timestamp
* @param string $format
* @param string $timezone
* @param bool $fixday
* @param bool $fixhour
* @param string $expected
*/
public function test_timestamp_to_date_string(
string $locale,
int $timestamp,
string $format,
string $timezone,
bool $fixday,
bool $fixhour,
string $expected,
): void {
$this->resetAfterTest();
$stringmanager = $this->get_mocked_string_manager();
$stringmanager->mock_string('locale', 'langconfig', $locale);
$structure = new structure();
$this->assertEquals(
$expected,
$structure->timestamp_to_date_string(
$timestamp,
$format,
$timezone,
$fixday,
$fixhour,
),
);
}
/**
* Data provider for timestamp_to_date_string tests.
*
* @return array
*/
public static function timestamp_to_date_string_provider(): array {
return [
'English with UTC timezone' => [
'en',
0,
'%Y-%m-%d %H:%M:%S',
'UTC',
false,
false,
'1970-01-01 00:00:00',
],
'English with London timezone' => [
'en',
1728487003,
"%d %B %Y",
'Europe/London',
false,
false,
"09 October 2024",
],
'English with Sydney (+11) timezone' => [
'en',
1728487003,
"%d %B %Y",
'Australia/Sydney',
false,
false,
"10 October 2024",
],
'Russian with Sydney (+11) timezone' => [
'ru',
1728487003,
"%d %B %Y %H:%M:%S",
'Australia/Sydney',
false,
false,
'10 октября 2024 02:16:43',
],
'Russian %B %Y (Genitive) with Sydney (+11) timezone' => [
'ru',
1728487003,
"%B %Y",
'Australia/Sydney',
false,
false,
"октябрь 2024",
],
'Russian %d %B %Y (Nominative) with London timezone' => [
'ru',
1728487003,
"%d %B %Y",
'Europe/London',
false,
false,
"09 октября 2024",
],
'Russian %d %B %Y (Nominative) with London timezone fixing leading zero' => [
'ru',
1728487003,
"%d %B %Y",
'Europe/London',
true,
false,
"9 октября 2024",
],
'Russian %e %B %Y (Nominative) with London timezone' => [
'ru',
1728487003,
"%e %B %Y",
'Europe/London',
false,
false,
" 9 октября 2024",
],
'Time %I without fixing leading zero' => [
'ru',
1728487003,
"%I:%M:%S",
'Australia/Sydney',
false,
false
,
"02:16:43",
],
'Time %I fixing leading zero' => [
'ru',
1728487003,
"%I:%M:%S",
'Australia/Sydney',
false,
true
,
"2:16:43",
],
'Time %l without fixing leading zero' => [
'ru',
1728487003,
"%l:%M:%S",
'Australia/Sydney',
false,
false,
" 2:16:43",
],
'Time %l fixing leading zero' => [
'ru',
1728487003,
"%l:%M:%S",
'Australia/Sydney',
false,
true,
" 2:16:43",
],
];
}
}

24
lib/classes/date.php
View File

@ -741,13 +741,14 @@ class core_date {
$intl_formats = [
'%a' => 'EEE', // An abbreviated textual representation of the day Sun through Sat
'%A' => 'EEEE', // A full textual representation of the day Sunday through Saturday
'%b' => 'MMM', // Abbreviated month name, based on the locale Jan through Dec
'%B' => 'MMMM', // Full month name, based on the locale January through December
'%h' => 'MMM', // Abbreviated month name, based on the locale (an alias of %b) Jan through Dec
];
$intl_formatter = function (DateTimeInterface $timestamp, string $format) use ($intl_formats, $locale) {
$originalformat = $format;
$intl_formatter = function (DateTimeInterface $timestamp, string $format) use (
$intl_formats,
$locale,
$originalformat,
) {
// Map IANA timezone DB names (used by PHP) to those used internally by the "intl" extension. The extension uses its
// own data based on ICU timezones, which may not necessarily be in-sync with IANA depending on the version installed
// on the local system. See: https://unicode-org.github.io/icu/userguide/datetime/timezone/#updating-the-time-zone-data
@ -789,6 +790,19 @@ class core_date {
$time_type = IntlDateFormatter::MEDIUM;
break;
case "%B":
case "%b":
case "%h":
// Check for any day (%d, or %e) in the string.
if (preg_match('/%[de]/', $originalformat)) {
// The day is present so use the standard format.
$pattern = $format === '%B' ? 'MMMM' : 'MMM';
} else {
// The day is not present so use the stand-alone format.
$pattern = $format === '%B' ? 'LLLL' : 'LLL';
}
break;
default:
$pattern = $intl_formats[$format];
}

14
lib/phpunit/classes/advanced_testcase.php
View File

@ -912,4 +912,18 @@ abstract class advanced_testcase extends base_testcase {
'handlerstack' => $handlerstack,
];
}
/**
* Get a copy of the mocked string manager.
*
* @return \core\tests\mocking_string_manager
*/
protected function get_mocked_string_manager(): \core\tests\mocking_string_manager {
global $CFG;
$this->resetAfterTest();
$CFG->config_php_settings['customstringmanager'] = \core\tests\mocking_string_manager::class;
return get_string_manager(true);
}
}

54
lib/tests/classes/mocking_string_manager.php Normal file
View File

@ -0,0 +1,54 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core\tests;
/**
* A string manager which supports mocking individual strings.
*
* @package core
* @copyright Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mocking_string_manager extends \core_string_manager_standard {
/** @var array<string, string> The list of strings */
private $strings = [];
#[\Override]
public function get_string($identifier, $component = '', $a = null, $lang = null) {
if (isset($this->strings["{$component}/{$identifier}"])) {
return $this->strings["{$component}/{$identifier}"];
}
return parent::get_string($identifier, $component, $a, $lang);
}
/**
* Mock a string.
*
* @param string $identifier
* @param string $component
* @param string $value
* @return void
*/
public function mock_string(
string $identifier,
string $component,
string $value,
): void {
$this->strings["{$component}/{$identifier}"] = $value;
}
}

96
lib/tests/date_test.php
View File

@ -627,6 +627,36 @@ class date_test extends advanced_testcase {
"%c",
"20 February 2024 at 1:09 pm",
],
'Month Year only' => [
"1708405742",
"%B %Y",
"February 2024",
],
'Abbreviated Month Year only' => [
"1708405742",
"%b %Y",
"Feb 2024",
],
'DD Month Year' => [
"1708405742",
"%d %B %Y",
"20 February 2024",
],
'D Month Year' => [
"1708405742",
"%e %B %Y",
"20 February 2024",
],
'Abbreviated DD Month Year' => [
"1708405742",
"%d %b %Y",
"20 Feb 2024",
],
'Abbreviated D Month Year' => [
"1708405742",
"%e %b %Y",
"20 Feb 2024",
],
'numeric_c' => [
1708405742,
"%c",
@ -666,4 +696,70 @@ class date_test extends advanced_testcase {
public function test_strftime(mixed $input, string $format, string $expected): void {
$this->assertEqualsIgnoringWhitespace($expected, core_date::strftime($format, $input));
}
/**
* Data provider for ::test_strftime_locale.
*
* @return array[]
*/
public static function get_strftime_locale_provider(): array {
return [
'Month Year only' => [
"1728487000",
'ru_RU.UTF-8',
"%B %Y",
"октябрь 2024",
],
'DD Month Year' => [
"1728487000",
'ru_RU.UTF-8',
"%d %B %Y",
"09 октября 2024",
],
'D Month Year' => [
"1728487000",
'ru_RU.UTF-8',
"%e %B %Y",
" 9 октября 2024",
],
'Abbreviated Month Year only' => [
"1728487000",
'ru_RU.UTF-8',
"%b %Y",
"окт. 2024",
],
'Abbreviated DD Month Year' => [
"1728487000",
'ru_RU.UTF-8',
"%d %b %Y",
"09 окт. 2024",
],
'Abbreviated D Month Year' => [
"1728487000",
'ru_RU.UTF-8',
"%e %b %Y",
" 9 окт. 2024",
],
];
}
/**
* Test \core_date::strftime function with alternate languages.
*
* @dataProvider get_strftime_locale_provider
* @param mixed $input Input passed to strftime
* @param string $locale The locale
* @param string $format The date format to pass to strftime, falls back to '%c' if null
* @param string $expected The output generated by strftime
*/
public function test_strftime_locale(
mixed $input,
string $locale,
string $format,
string $expected,
): void {
$this->assertEqualsIgnoringWhitespace(
$expected,
core_date::strftime($format, $input, $locale));
}
}

9
lib/xapi/tests/privacy/provider_test.php
View File

@ -158,16 +158,17 @@ class provider_test extends provider_testcase {
$info = (object) reset($result);
// Ensure the correct data has been returned.
$this->assertNotEmpty($info->statedata);
$this->assertNotEmpty(transform::datetime($info->timecreated));
$this->assertNotEmpty(transform::datetime($info->timemodified));
$this->assertNotEmpty($info->timecreated);
$this->assertNotEmpty($info->timemodified);
// Get the states info for user2 in the system context.
$result = provider::get_xapi_states_for_user($user2->id, 'fake_component', $systemcontext->id);
$info = (object) reset($result);
// Ensure the correct data has been returned.
$this->assertNotEmpty($info->statedata);
$this->assertNotEmpty(transform::datetime($info->timecreated));
$this->assertNotEmpty(transform::datetime($info->timemodified));
$this->assertNotEmpty($info->timecreated);
$this->assertNotEmpty($info->timemodified);
// Get the states info for user3 in the system context (it should be empty).
$info = provider::get_xapi_states_for_user($user3->id, 'fake_component', $systemcontext->id);