diff --git a/framework/core/src/Extend/Conditional.php b/framework/core/src/Extend/Conditional.php index 55584beeb..b74ce9c85 100644 --- a/framework/core/src/Extend/Conditional.php +++ b/framework/core/src/Extend/Conditional.php @@ -81,14 +81,15 @@ class Conditional implements ExtenderInterface if ($condition['condition']) { $extenders = $condition['extenders']; + $resolvedExtenders = []; - if (is_string($extenders)) { - $extenders = $container->call($extenders); - } elseif (is_callable($extenders)) { - $extenders = $container->call($extenders); + if (is_string($extenders) || is_callable($extenders)) { + $resolvedExtenders = $container->call($extenders); + } else { + $resolvedExtenders = $extenders; } - foreach ($extenders as $extender) { + foreach ($resolvedExtenders as $extender) { $extender->extend($container, $extension); } }