From 7db951784047c0bc3ea9c06d31301496ba79c719 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sun, 3 May 2020 00:03:54 +0200 Subject: [PATCH] (Hot) Fix Aggregate Converter loop --- src/Service/AggregateConverter.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Service/AggregateConverter.php b/src/Service/AggregateConverter.php index f9e6dff..1b22c84 100644 --- a/src/Service/AggregateConverter.php +++ b/src/Service/AggregateConverter.php @@ -47,8 +47,10 @@ class AggregateConverter implements Converter, CacheableConverter public function flushCache() { + $this->ensureCachedConverters(); + $this - ->converters + ->cachedConverters ->filter(instance(CacheableConverter::class)) ->each(function (CacheableConverter $converter) { $converter->flushCache(); @@ -70,7 +72,7 @@ class AggregateConverter implements Converter, CacheableConverter if (!$this->cachedConverters) { $this->cachedConverters = collect($this->converters) ->filter(function (Converter $converter) { - return $converter !== $this; + return $converter !== $this && !$converter instanceof AggregateConverter; }) ->each(function (Converter $converter) { if ($converter instanceof RecursiveConverter) {