mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
MINOR Code formatting for Date::past_date() and phpDoc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71611 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
5312773e18
commit
bf07ed2d87
@ -250,28 +250,29 @@ class Date extends DBField {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the nearest date in the past, based on day and month. Automatically attaches the correct year.
|
* Return the nearest date in the past, based on day and month.
|
||||||
* Useful for determining a financial year start date.
|
* Automatically attaches the correct year.
|
||||||
*
|
*
|
||||||
* @param $fmonth int
|
* This is useful for determining a financial year start or end date.
|
||||||
* @param $fday int
|
*
|
||||||
|
* @param $fmonth int The number of the month (e.g. 3 is March, 4 is April)
|
||||||
|
* @param $fday int The day of the month
|
||||||
* @param $fyear int Determine historical value
|
* @param $fyear int Determine historical value
|
||||||
|
* @return string Date in YYYY-MM-DD format
|
||||||
*/
|
*/
|
||||||
static function past_date($fmonth, $fday = 1, $fyear = null) {
|
static function past_date($fmonth, $fday = 1, $fyear = null) {
|
||||||
if(!$fyear) $fyear = date('Y');
|
if(!$fyear) $fyear = date('Y');
|
||||||
$fday = (int)$fday;
|
$fday = (int) $fday;
|
||||||
$fmonth = (int)$fmonth;
|
$fmonth = (int) $fmonth;
|
||||||
$fyear = (int)$fyear;
|
$fyear = (int) $fyear;
|
||||||
|
|
||||||
$pastDate = mktime(0,0,0, $fmonth,$fday,$fyear);
|
$pastDate = mktime(0, 0, 0, $fmonth, $fday, $fyear);
|
||||||
$curDate = mktime(0,0,0,date('m'), date('d'),$fyear);
|
$curDate = mktime(0, 0, 0, date('m'), date('d'), $fyear);
|
||||||
|
|
||||||
// if the pastdate is actually past, select it with the current year
|
|
||||||
// otherwise substract a year
|
|
||||||
if($pastDate < $curDate) {
|
if($pastDate < $curDate) {
|
||||||
return date("Y-m-d", mktime(0,0,0,$fmonth,$fday,$fyear));
|
return date('Y-m-d', mktime(0, 0, 0, $fmonth, $fday, $fyear));
|
||||||
} else {
|
} else {
|
||||||
return date("Y-m-d", mktime(0,0,0,$fmonth,$fday,$fyear-1));
|
return date('Y-m-d', mktime(0, 0, 0, $fmonth, $fday, $fyear - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user