Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken month view if last week of December is in next year #9

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Fix broken month view if last week of December is in next year #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Domain/Model/Month.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function getWeeks(): array
while ($currentDay <= $lastDay) {
$this->weeks[] = new Week(
(int) $currentDay->format('W'),
(int) $currentDay->format('Y')
(int) $currentDay->format('o')
);

$currentDay = $currentDay->modify('+7 days');
Expand Down
4 changes: 2 additions & 2 deletions Classes/Domain/Model/Week.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function getPreviousWeek(): Week

return new self(
(int) $newDay->format('W'),
(int) $newDay->format('Y')
(int) $newDay->format('o')
);
}

Expand All @@ -90,7 +90,7 @@ public function getNextWeek(): Week

return new self(
(int) $newDay->format('W'),
(int) $newDay->format('Y')
(int) $newDay->format('o')
);
}

Expand Down
7 changes: 6 additions & 1 deletion Documentation/Changelog/1.1.1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ Nothing
Fixes
-----

Nothing
* Fix broken month view if last week of December is in next year.

The cause was using the wrong character in formatting the year.
We now switch from `Y` to `o` which will work based on the week instead of date.
This is necessary as we provide this year to the week,
and therefore need the year of the week, not day.

Tasks
-----
Expand Down
22 changes: 22 additions & 0 deletions Tests/Unit/Domain/Model/MonthTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,28 @@ public function returnsAllDaysOfTheFebruaryMonth2021(): void
self::assertSame('2021-02-28', $result[27]->getDateTimeInstance()->format('Y-m-d'));
}

/**
* @test
*/
public function returnsWeeksIfLastDecemberWeekIsInNextYear(): void
{
$subject = new Month(12, 2024);

$result = $subject->getWeeks();

self::assertCount(6, $result);

$week = array_pop($result);
$days = $week->getDays();
self::assertSame('2024-12-30', $days[0]->getDateTimeInstance()->format('Y-m-d'));
self::assertSame('2025-01-05', $days[6]->getDateTimeInstance()->format('Y-m-d'));

$week = array_pop($result);
$days = $week->getDays();
self::assertSame('2024-12-23', $days[0]->getDateTimeInstance()->format('Y-m-d'));
self::assertSame('2024-12-29', $days[6]->getDateTimeInstance()->format('Y-m-d'));
}

/**
* @test
*/
Expand Down
Loading