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

Fix unit tests for WEEKNUM()

Browse Source
This commit is contained in:
Adrien Crivelli 2016-10-01 22:27:41 +09:00
parent 10da9b3620
commit 23fbc845dd
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
3 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,10 +1242,14 @@ class DateTime
$PHPDateObject = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($dateValue); $PHPDateObject = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($dateValue);
$dayOfYear = $PHPDateObject->format('z'); $dayOfYear = $PHPDateObject->format('z');
$PHPDateObject->modify('-' . $dayOfYear . ' days'); $PHPDateObject->modify('-' . $dayOfYear . ' days');
$dow = $PHPDateObject->format('w'); $firstDayOfFirstWeek = $PHPDateObject->format('w');
$daysInFirstWeek = 7 - (($dow + (2 - $method)) % 7); $daysInFirstWeek = (6 - $firstDayOfFirstWeek + $method) % 7;
$dayOfYear -= $daysInFirstWeek; $interval = $dayOfYear - $daysInFirstWeek;
$weekOfYear = ceil($dayOfYear / 7) + 1; $weekOfYear = floor($interval / 7) + 1;
if ($daysInFirstWeek) {
++$weekOfYear;
}
return (int) $weekOfYear; return (int) $weekOfYear;
} }

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

@ -140,12 +140,9 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
/** /**
* @dataProvider providerWEEKNUM * @dataProvider providerWEEKNUM
* @group fail19
*/ */
public function testWEEKNUM() public function testWEEKNUM()
{ {
$this->markTestIncomplete('TODO: This test should be fixed');
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array([DateTime::class, 'WEEKOFYEAR'], $args); $result = call_user_func_array([DateTime::class, 'WEEKOFYEAR'], $args);

42
tests/data/Calculation/DateTime/WEEKNUM.php
View File

@ -6,14 +6,54 @@ return [
1, 1,
52, 52,
], ],
[
'2000-01-01',
1,
1,
],
[
'2000-01-02',
1,
2,
],
[
'2000-01-01',
2,
1,
],
[
'2000-01-03',
2,
2,
],
[ [
'1995-01-01', '1995-01-01',
1, 1,
1, 1,
], ],
[
'1995-01-07',
1,
1,
],
[
'1995-01-08',
1,
2,
],
[
'1995-01-01',
2,
1,
],
[
'1995-01-02',
2,
2,
],
[ [
'3/7/1977', '3/7/1977',
27, 28,
], ],
[ [
'3/7/1977', '3/7/1977',