diff --git a/src/FormatTalksBundle/Twig/FormatTalksExtension.php b/src/FormatTalksBundle/Twig/FormatTalksExtension.php index fc6a8232..361827ab 100644 --- a/src/FormatTalksBundle/Twig/FormatTalksExtension.php +++ b/src/FormatTalksBundle/Twig/FormatTalksExtension.php @@ -54,10 +54,10 @@ class FormatTalksExtension extends Twig_Extension public function getUpcoming($talks, array $eventData = []) { return $this->format($talks, $eventData) - ->filter(function ($talk) { - return $talk['event']['date'] >= $this->today; - }) - ->sortBy('event.date'); + ->filter(function ($talk) { + return $talk['event']['date'] >= $this->today; + }) + ->sortBy('event.date'); } /** @@ -72,10 +72,10 @@ class FormatTalksExtension extends Twig_Extension public function getPast($talks, array $eventData = []) { return $this->format($talks, $eventData) - ->filter(function ($talk) { - return $talk['event']['date'] < $this->today; - }) - ->sortByDesc('event.date'); + ->filter(function ($talk) { + return $talk['event']['date'] < $this->today; + }) + ->sortByDesc('event.date'); } /** @@ -93,12 +93,13 @@ class FormatTalksExtension extends Twig_Extension // Build an associative array with the talk, as well as the // specified event data (e.g. date and time) as well as the shared // event data (e.g. event name and website). - return collect($talk['events'])->map(function ($event) use ($talk, $event_data) { - $event = collect($event); - $event = $event->merge($event_data->get($event->get('event')))->all(); + return collect($talk['events']) + ->map(function ($event) use ($talk, $event_data) { + $event = collect($event); + $event = $event->merge($event_data->get($event->get('event')))->all(); - return compact('event', 'talk'); - }); + return compact('event', 'talk'); + }); }); } diff --git a/tests/FormatTalksBundle/Twig/FormatTalksTest.php b/tests/FormatTalksBundle/Twig/FormatTalksTest.php index 9edef2d5..eeec8f2b 100644 --- a/tests/FormatTalksBundle/Twig/FormatTalksTest.php +++ b/tests/FormatTalksBundle/Twig/FormatTalksTest.php @@ -28,32 +28,32 @@ class FormatTalksTest extends TestCase public function testFormat() { $event_data = [ - 'event-a' => [ - 'name' => 'Event A', - 'location' => 'Somewhere', - 'website' => 'http://event-a.com', - ], - 'event-b' => [ - 'name' => 'Event B', - 'location' => 'Somewhere else', - 'website' => 'http://event-b.com', - ], - ]; + 'event-a' => [ + 'name' => 'Event A', + 'location' => 'Somewhere', + 'website' => 'http://event-a.com', + ], + 'event-b' => [ + 'name' => 'Event B', + 'location' => 'Somewhere else', + 'website' => 'http://event-b.com', + ], + ]; $talks = [ - [ - 'title' => 'Talk A', - 'events' => [ - ['event' => 'event-a', 'date' => '2018-01-01', 'time' => '09:00'], - ['event' => 'event-b', 'date' => '2018-01-30', 'time' => '12:00'], - ], + [ + 'title' => 'Talk A', + 'events' => [ + ['event' => 'event-a', 'date' => '2018-01-01', 'time' => '09:00'], + ['event' => 'event-b', 'date' => '2018-01-30', 'time' => '12:00'], ], - [ - 'title' => 'Talk B', - 'events' => [ - ['event' => 'event-b', 'date' => '2018-01-31', 'time' => '17:00'], - ], + ], + [ + 'title' => 'Talk B', + 'events' => [ + ['event' => 'event-b', 'date' => '2018-01-31', 'time' => '17:00'], ], + ], ]; $results = $this->extension->format($talks, $event_data)->all();