kadet/czydojade
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

50_make_frontend_part_independent #2

Closed
kadet wants to merge 78 commits from 50_make_frontend_part_independent into master
pull from: 50_make_frontend_part_independent
merge into: kadet:master
Conversation 0 Commits 78 Files Changed 405 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b7b59ce23 - Show all commits

6
src/Service/AggregateConverter.php
View File

@ -47,8 +47,10 @@ class AggregateConverter implements Converter, CacheableConverter
public function flushCache() public function flushCache()
{ {
$this->ensureCachedConverters();
$this $this
->converters ->cachedConverters
->filter(instance(CacheableConverter::class)) ->filter(instance(CacheableConverter::class))
->each(function (CacheableConverter $converter) { ->each(function (CacheableConverter $converter) {
$converter->flushCache(); $converter->flushCache();
@ -70,7 +72,7 @@ class AggregateConverter implements Converter, CacheableConverter
if (!$this->cachedConverters) { if (!$this->cachedConverters) {
$this->cachedConverters = collect($this->converters) $this->cachedConverters = collect($this->converters)
->filter(function (Converter $converter) { ->filter(function (Converter $converter) {
return $converter !== $this; return $converter !== $this && !$converter instanceof AggregateConverter;
}) })
->each(function (Converter $converter) { ->each(function (Converter $converter) {
if ($converter instanceof RecursiveConverter) { if ($converter instanceof RecursiveConverter) {