tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '5.2' into 5

This commit is contained in:
github-actions 2024-05-04 14:25:17 +00:00
parent 142a318fa8 44f77ecdac
commit 9fc9d18c7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ORM/FieldType/DBDate.php
View File

@ -90,7 +90,7 @@ class DBDate extends DBField
/** /**
* Returns the standard localised medium date * Returns the standard localised medium date
* *
* @return string * @return ?string
*/ */
public function Nice() public function Nice()
{ {
@ -263,7 +263,7 @@ class DBDate extends DBField
* *
* @param string $format Format code string. See https://unicode-org.github.io/icu/userguide/format_parse/datetime * @param string $format Format code string. See https://unicode-org.github.io/icu/userguide/format_parse/datetime
* @param string $locale Custom locale to use (add to signature in 5.0) * @param string $locale Custom locale to use (add to signature in 5.0)
* @return string The date in the requested format * @return ?string The date in the requested format
*/ */
public function Format($format) public function Format($format)
{ {