Merge branch 'cs/zendframework/zendframework#7014-empty-return-instea…

…d-of-null-return' into develop Close zendframework/zendframework#7014
zendframework · Dec 16, 2014 · bf0e539 · bf0e539
3 parents 8ec7123 + 92967e1 + 90cdcd4
commit bf0e539
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -461,7 +461,7 @@ function ($r) {
             }
         }
 
-        return null;
+        return;
     }
 
     /**

diff --git a/src/View/Helper/AbstractTranslatorHelper.php b/src/View/Helper/AbstractTranslatorHelper.php
@@ -64,7 +64,7 @@ public function setTranslator(Translator $translator = null, $textDomain = null)
     public function getTranslator()
     {
         if (! $this->isTranslatorEnabled()) {
-            return null;
+            return;
         }
 
         return $this->translator;
-Original file line number
+Diff line change
@@ Expand Up / @@ -461,7 +461,7 @@ function ($r) { @@
                 }
             }
-            return null;
+            return;
         }
         /**
@@ Expand Down @@