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

Specific event URLs override global URLs

Browse source
This commit is contained in:
Oliver Davies 2020-01-28 22:34:11 +00:00
parent fe67b623b8
commit e43bfb30d2
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/Talk/TwigExtension/TalksExtension.php
View file

@ -94,7 +94,7 @@ class TalksExtension extends AbstractExtension
{
return (new Collection($talk['events']))
->map(function (array $event) use ($eventData): Collection {
return (new Collection($event))->merge($eventData[$event['event']]);
return (new Collection($eventData[$event['event']]))->merge($event);
})
->filter(function (Collection $event): bool {
return !empty($event->get('date'));

6
app/tests/Talk/TwigExtension/RetrievingEventsTest.php
View file

@ -150,4 +150,10 @@ class RetrievingEventsTest extends TestCase
$this->assertCount(1, $events);
$this->assertSame('drupal_developer_days_2018', $events->pluck('event')->first());
}
/** @test */
public function specific_event_urls_override_global_urls()
{
$this->markTestSkipped();
}
}