use early exit

Signed-off-by: Thomas Müller <[email protected]>
laminas · May 21, 2024 · 95a9f2b · 95a9f2b
1 parent 1701f70
commit 95a9f2b
Showing 1 changed file with 16 additions and 6 deletions.
diff --git 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));
         }
     }