Merge branch 'hotfix/3286'

Close zendframework/zendframework#3286
zendframework · Jan 3, 2013 · ebdb37c · ebdb37c
commit ebdb37c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Definition/ClassDefinition.php b/src/Definition/ClassDefinition.php
@@ -187,9 +187,9 @@ public function hasMethod($class, $method)
 
         if (is_array($this->methods)) {
             return array_key_exists($method, $this->methods);
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**

diff --git a/src/InstanceManager.php b/src/InstanceManager.php
@@ -335,9 +335,9 @@ public function getConfig($aliasOrClass)
         $key = ($this->hasAlias($aliasOrClass)) ? 'alias:' . $this->getBaseAlias($aliasOrClass) : $aliasOrClass;
         if (isset($this->configurations[$key])) {
             return $this->configurations[$key];
-        } else {
-            return $this->configurationTemplate;
         }
+
+        return $this->configurationTemplate;
     }
 
     /**