Merge branch 'hotfix/3286'

Close zendframework/zendframework#3286

src/Helper/Navigation/AbstractHelper.php

@@ -541,9 +541,9 @@ public function findActive($container, $minDepth = null, $maxDepth = -1)
 
         if ($found) {
             return array('page' => $found, 'depth' => $foundDepth);
-        } else {
-            return array();
         }
+
+        return array();
     }
 
     /**

src/Helper/Navigation/Breadcrumbs.php

@@ -291,8 +291,8 @@ public function render($container = null)
         $partial = $this->getPartial();
         if ($partial) {
             return $this->renderPartial($container, $partial);
-        } else {
-            return $this->renderStraight($container);
         }
+
+        return $this->renderStraight($container);
     }
 }

src/Model/JsonModel.php

@@ -69,8 +69,7 @@ public function serialize()
 
         if (!is_null($this->jsonpCallback)) {
             return $this->jsonpCallback.'('.Json::encode($variables).');';
-        } else {
-            return Json::encode($variables);
         }
+        return Json::encode($variables);
     }
 }

src/Model/ViewModel.php

@@ -222,9 +222,9 @@ public function getVariable($name, $default = null)
         $name = (string) $name;
         if (array_key_exists($name, $this->variables)) {
             return $this->variables[$name];
-        } else {
-            return $default;
         }
+
+        return $default;
     }
 
     /**