alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename SECONDOFMINUTE into SECOND for consistency

This commit is contained in:
Adrien Crivelli 2016-10-02 09:43:13 +09:00
parent b5af5a772e
commit 8061f7516e
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/FunctionListByCategory.txt
View File

@ -34,7 +34,7 @@ CATEGORY_DATE_AND_TIME
MONTH PHPExcel_Calculation_DateTime::MONTHOFYEAR MONTH PHPExcel_Calculation_DateTime::MONTHOFYEAR
NETWORKDAYS PHPExcel_Calculation_DateTime::NETWORKDAYS NETWORKDAYS PHPExcel_Calculation_DateTime::NETWORKDAYS
NOW PHPExcel_Calculation_DateTime::DATETIMENOW NOW PHPExcel_Calculation_DateTime::DATETIMENOW
SECOND PHPExcel_Calculation_DateTime::SECONDOFMINUTE SECOND PHPExcel_Calculation_DateTime::SECOND
TIME PHPExcel_Calculation_DateTime::TIME TIME PHPExcel_Calculation_DateTime::TIME
TIMEVALUE PHPExcel_Calculation_DateTime::TIMEVALUE TIMEVALUE PHPExcel_Calculation_DateTime::TIMEVALUE
TODAY PHPExcel_Calculation_DateTime::DATENOW TODAY PHPExcel_Calculation_DateTime::DATENOW

2
Documentation/FunctionListByName.txt
View File

@ -302,7 +302,7 @@ RTD CATEGORY_LOOKUP_AND_REFERENCE *** Not yet Implemented
SEARCH CATEGORY_TEXT_AND_DATA PHPExcel_Calculation_TextData::SEARCHINSENSITIVE SEARCH CATEGORY_TEXT_AND_DATA PHPExcel_Calculation_TextData::SEARCHINSENSITIVE
SEARCHB CATEGORY_TEXT_AND_DATA PHPExcel_Calculation_TextData::SEARCHINSENSITIVE SEARCHB CATEGORY_TEXT_AND_DATA PHPExcel_Calculation_TextData::SEARCHINSENSITIVE
SECOND CATEGORY_DATE_AND_TIME PHPExcel_Calculation_DateTime::SECONDOFMINUTE SECOND CATEGORY_DATE_AND_TIME PHPExcel_Calculation_DateTime::SECOND
SERIESSUM CATEGORY_MATH_AND_TRIG PHPExcel_Calculation_MathTrig::SERIESSUM SERIESSUM CATEGORY_MATH_AND_TRIG PHPExcel_Calculation_MathTrig::SERIESSUM
SIGN CATEGORY_MATH_AND_TRIG PHPExcel_Calculation_MathTrig::SIGN SIGN CATEGORY_MATH_AND_TRIG PHPExcel_Calculation_MathTrig::SIGN
SIN CATEGORY_MATH_AND_TRIG sin SIN CATEGORY_MATH_AND_TRIG sin

4
Documentation/markdown/CalculationEngine/FunctionReference/03-03-Date-and-Time-Functions.md
View File

@ -846,7 +846,7 @@ $retVal = $worksheet->getCell('B4')->getCalculatedValue();
```php ```php
$retVal = call_user_func_array( $retVal = call_user_func_array(
array('PHPExcel_Calculation_Functions', 'SECONDOFMINUTE'), array('PHPExcel_Calculation_Functions', 'SECOND'),
array('09:30:17') array('09:30:17')
); );
// $retVal = 17 // $retVal = 17
@ -854,7 +854,7 @@ $retVal = call_user_func_array(
##### Notes ##### Notes
Note that the PHPExcel function is PHPExcel_Calculation_Functions::SECONDOFMINUTE() when the method is called statically. Note that the PHPExcel function is PHPExcel_Calculation_Functions::SECOND() when the method is called statically.
#### TIME #### TIME

2
Documentation/markdown/Functions/FunctionListByCategory.md
View File

@ -43,7 +43,7 @@
MONTH | PHPExcel_Calculation_DateTime::MONTHOFYEAR MONTH | PHPExcel_Calculation_DateTime::MONTHOFYEAR
NETWORKDAYS | PHPExcel_Calculation_DateTime::NETWORKDAYS NETWORKDAYS | PHPExcel_Calculation_DateTime::NETWORKDAYS
NOW | PHPExcel_Calculation_DateTime::DATETIMENOW NOW | PHPExcel_Calculation_DateTime::DATETIMENOW
SECOND | PHPExcel_Calculation_DateTime::SECONDOFMINUTE SECOND | PHPExcel_Calculation_DateTime::SECOND
TIME | PHPExcel_Calculation_DateTime::TIME TIME | PHPExcel_Calculation_DateTime::TIME
TIMEVALUE | PHPExcel_Calculation_DateTime::TIMEVALUE TIMEVALUE | PHPExcel_Calculation_DateTime::TIMEVALUE
TODAY | PHPExcel_Calculation_DateTime::DATENOW TODAY | PHPExcel_Calculation_DateTime::DATENOW

2
Documentation/markdown/Functions/FunctionListByName.md
View File

@ -378,7 +378,7 @@
--------------------|--------------------------------|------------------------------------------- --------------------|--------------------------------|-------------------------------------------
SEARCH | CATEGORY_TEXT_AND_DATA | PHPExcel_Calculation_TextData::SEARCHINSENSITIVE SEARCH | CATEGORY_TEXT_AND_DATA | PHPExcel_Calculation_TextData::SEARCHINSENSITIVE
SEARCHB | CATEGORY_TEXT_AND_DATA | PHPExcel_Calculation_TextData::SEARCHINSENSITIVE SEARCHB | CATEGORY_TEXT_AND_DATA | PHPExcel_Calculation_TextData::SEARCHINSENSITIVE
SECOND | CATEGORY_DATE_AND_TIME | PHPExcel_Calculation_DateTime::SECONDOFMINUTE SECOND | CATEGORY_DATE_AND_TIME | PHPExcel_Calculation_DateTime::SECOND
SERIESSUM | CATEGORY_MATH_AND_TRIG | PHPExcel_Calculation_MathTrig::SERIESSUM SERIESSUM | CATEGORY_MATH_AND_TRIG | PHPExcel_Calculation_MathTrig::SERIESSUM
SIGN | CATEGORY_MATH_AND_TRIG | PHPExcel_Calculation_MathTrig::SIGN SIGN | CATEGORY_MATH_AND_TRIG | PHPExcel_Calculation_MathTrig::SIGN
SIN | CATEGORY_MATH_AND_TRIG | sin SIN | CATEGORY_MATH_AND_TRIG | sin

2
src/PhpSpreadsheet/Calculation.php
View File

@ -1670,7 +1670,7 @@ class Calculation
], ],
'SECOND' => [ 'SECOND' => [
'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME,
'functionCall' => '\\PhpOffice\\PhpSpreadsheet\\Calculation\\DateTime::SECONDOFMINUTE', 'functionCall' => '\\PhpOffice\\PhpSpreadsheet\\Calculation\\DateTime::SECOND',
'argumentCount' => '1', 'argumentCount' => '1',
], ],
'SERIESSUM' => [ 'SERIESSUM' => [

4
src/PhpSpreadsheet/Calculation/DateTime.php
View File

@ -1398,7 +1398,7 @@ class DateTime
} }
/** /**
* SECONDOFMINUTE * SECOND
* *
* Returns the seconds of a time value. * Returns the seconds of a time value.
* The second is given as an integer in the range 0 (zero) to 59. * The second is given as an integer in the range 0 (zero) to 59.
@ -1410,7 +1410,7 @@ class DateTime
* PHP DateTime object, or a standard time string * PHP DateTime object, or a standard time string
* @return int Second * @return int Second
*/ */
public static function SECONDOFMINUTE($timeValue = 0) public static function SECOND($timeValue = 0)
{ {
$timeValue = Functions::flattenSingleValue($timeValue); $timeValue = Functions::flattenSingleValue($timeValue);

2
tests/PhpSpreadsheetTests/Calculation/DateTimeTest.php
View File

@ -299,7 +299,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
{ {
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array([DateTime::class, 'SECONDOFMINUTE'], $args); $result = call_user_func_array([DateTime::class, 'SECOND'], $args);
$this->assertEquals($expectedResult, $result, null, 1E-8); $this->assertEquals($expectedResult, $result, null, 1E-8);
} }