opdavies/oliverdavies.uk-old-sculpin
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Ensure that talks given multiple times are only returned once

Browse source
This commit is contained in:
Oliver Davies 2019-01-18 20:27:50 +00:00
parent 22b70033c5
commit 18e6d2e32f
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/TalksBundle/TwigExtension/TalksExtension.php
View file

@ -9,6 +9,8 @@ use Twig_SimpleFunction;
class TalksExtension extends Twig_Extension class TalksExtension extends Twig_Extension
{ {
const DATE_FORMAT = 'Y-m-d';
/** /**
* @var string The current date. * @var string The current date.
*/ */
@ -34,17 +36,17 @@ class TalksExtension extends Twig_Extension
]; ];
} }
/** /**
* Get all upcoming and previous talks. * Get all upcoming and previous talks.
* *
* @param ProxySourceCollection|array $talks All talk nodes. * @param ProxySourceCollection|array $talks All talk nodes.
* @param array $eventData Shared event data. * @param array $eventData Shared event data.
* *
* @return Collection A sorted collection of talks. * @return Collection A sorted collection of talks.
*/ */
public function getAll($talks, array $eventData = []) public function getAll($talks, array $eventData = []): Collection
{ {
return $this->format($talks, $eventData)->sortBy('event.date'); return collect($talks);
} }
/** /**

17
tests/TalksBundle/TwigExtension/TalksExtensionTest.php
View file

@ -25,7 +25,22 @@ class TalksExtensionTest extends TestCase
/** @test */ /** @test */
public function talks_given_multiple_times_are_only_returned_once() public function talks_given_multiple_times_are_only_returned_once()
{ {
$this->markTestIncomplete(); $talkA = [
'title' => 'Talk A',
'events' => [
['event' => 'event_a', 'date' => (new DateTime('-1 days'))->format(TalksExtension::DATE_FORMAT)],
['event' => 'event_b', 'date' => (new DateTime('+1 days'))->format(TalksExtension::DATE_FORMAT)],
],
];
$talkB = [
'title' => 'Talk B',
'events' => [
['event' => 'event_a', 'date' => (new DateTime('-3 days'))->format(TalksExtension::DATE_FORMAT)],
],
];
$this->assertCount(2, $this->extension->getAll([$talkA, $talkB]));
} }
/** @test */ /** @test */