[zendframework/zendframework#5406] Logic and order-of-ops cleanup

weierophinney · weierophinney · commit 51e49f66e52c · 2014-01-03T14:03:36.000-06:00
- Prefer the MvcTranslator service over the translator service
- Applied object calisthenics and removed nested conditionals
diff --git a/src/HelperPluginManager.php b/src/HelperPluginManager.php
@@ -143,13 +143,24 @@ public function injectRenderer($helper)
      */
     public function injectTranslator($helper)
     {
-        if ($helper instanceof TranslatorAwareInterface) {
-            $locator = $this->getServiceLocator();
-            if ($locator && $locator->has('translator')) {
-                $helper->setTranslator($locator->get('translator'));
-            } elseif ($locator && $locator->has('MvcTranslator')) {
-                $helper->setTranslator($locator->get('MvcTranslator'));
-            }
+        if (!$helper instanceof TranslatorAwareInterface) {
+            return;
+        }
+
+        $locator = $this->getServiceLocator();
+
+        if (!$locator) {
+            return;
+        }
+
+        if ($locator->has('MvcTranslator')) {
+            $helper->setTranslator($locator->get('MvcTranslator'));
+            return;
+        }
+
+        if ($locator->has('translator')) {
+            $helper->setTranslator($locator->get('translator'));
+            return;
         }
     }
 
