Specific event URLs override global URLs

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

View file

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

View file

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

View file

@ -16,11 +16,13 @@ events:
date: 2019-07-23 date: 2019-07-23
- event: drupalcon_eu_19 - event: drupalcon_eu_19
date: 2019-10-30 date: 2019-10-30
- event: bristol_devops
date: 2020-01-30
url: https://www.meetup.com/Bristol-Cloud-Native-DevOps/events/266609627
- event: drupal_edinburgh - event: drupal_edinburgh
date: 2020-03-12 date: 2020-03-12
online: true online: true
- event: bristol_devops url: https://www.meetup.com/Drupal-Edinburgh/events/267905594
date: 2020-01-30
--- ---
Great! Youve built your website, and now you just need to deploy it. There are various ways that this could be done - from (S)FTP, to SCP and rsync, to running commands like `git pull` and `composer install` directly on the server which is not ideal. Great! Youve built your website, and now you just need to deploy it. There are various ways that this could be done - from (S)FTP, to SCP and rsync, to running commands like `git pull` and `composer install` directly on the server which is not ideal.