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 TimeZone issue #55

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+1 −6
Open

Fix TimeZone issue #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7995daa
Update PeriodAbstract.php
jpottier Jan 30, 2019
a8374a0
Fix Period::containsEvent() method when period start after event begi…
jpottier Jan 30, 2019
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
7 changes: 1 addition & 6 deletions src/Period/PeriodAbstract.php
View file
Original file line number Diff line number Diff line change
@@ -117,12 +117,7 @@ public function includes(PeriodInterface $period, $strict = true)
*/
public function containsEvent(EventInterface $event)
{
return
$event->containsPeriod($this) ||
$event->isDuring($this) ||
$this->contains($event->getBegin()) ||
($event->getEnd() && $this->contains($event->getEnd()) && $event->getEnd()->format('c') !== $this->begin->format('c'))
;
return $event->getBegin() < $this->getEnd() && $event->getEnd() > $this->getBegin();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have any unit test about this expected behavior is same as actual?

I think it needs some tests to present that this can fix the timezone issue :).

}

/**