Merge branch 'psr2' into develop
This commit is contained in:
commit
4f6d009ba5
|
@ -374,6 +374,12 @@ class PHPExcel_Shared_Date
|
||||||
return $dateValueNew;
|
return $dateValueNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a month name (either a long or a short name) to a month number
|
||||||
|
*
|
||||||
|
* @param string $month Month name or abbreviation
|
||||||
|
* @return integer|string Month number (1 - 12), or the original string argument if it isn't a valid month name
|
||||||
|
*/
|
||||||
public static function monthStringToNumber($month)
|
public static function monthStringToNumber($month)
|
||||||
{
|
{
|
||||||
$monthIndex = 1;
|
$monthIndex = 1;
|
||||||
|
@ -386,11 +392,17 @@ class PHPExcel_Shared_Date
|
||||||
return $month;
|
return $month;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Strips an ordinal froma numeric value
|
||||||
|
*
|
||||||
|
* @param string $day Day number with an ordinal
|
||||||
|
* @return integer|string The integer value with any ordinal stripped, or the original string argument if it isn't a valid numeric
|
||||||
|
*/
|
||||||
public static function dayStringToNumber($day)
|
public static function dayStringToNumber($day)
|
||||||
{
|
{
|
||||||
$strippedDayValue = (str_replace(self::$numberSuffixes, '', $day));
|
$strippedDayValue = (str_replace(self::$numberSuffixes, '', $day));
|
||||||
if (is_numeric($strippedDayValue)) {
|
if (is_numeric($strippedDayValue)) {
|
||||||
return $strippedDayValue;
|
return (integer) $strippedDayValue;
|
||||||
}
|
}
|
||||||
return $day;
|
return $day;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue