From 95a9f2b9bafc4279ee20835d8df73498a368a0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 21 May 2024 21:46:25 +0200 Subject: [PATCH] use early exit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Müller --- src/ValidatorPluginManager.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/ValidatorPluginManager.php b/src/ValidatorPluginManager.php index af7234d0..6d040862 100644 --- a/src/ValidatorPluginManager.php +++ b/src/ValidatorPluginManager.php @@ -585,17 +585,27 @@ public function injectTranslator($first, $second) $validator = $first; } + if (! $validator instanceof Translator\TranslatorAwareInterface) { + return; + } + // V2 means we pull it from the parent container if ($container === $this && method_exists($container, 'getServiceLocator') && $container->getServiceLocator()) { $container = $container->getServiceLocator(); } - if ($validator instanceof Translator\TranslatorAwareInterface && $container instanceof ContainerInterface) { - if ($container->has('MvcTranslator')) { - $validator->setTranslator($container->get('MvcTranslator')); - } elseif ($container->has(TranslatorInterface::class)) { - $validator->setTranslator($container->get(Translator\TranslatorInterface::class)); - } + if (! $container instanceof ContainerInterface) { + return; + } + + if ($container->has('MvcTranslator')) { + $validator->setTranslator($container->get('MvcTranslator')); + + return; + } + + if ($container->has(TranslatorInterface::class)) { + $validator->setTranslator($container->get(Translator\TranslatorInterface::class)); } }