Merge branch 'master' of git://github.com/zendframework/zf2 into feat…

…ure/view-helper-nav-escapeLabel

src/ServiceManager.php

@@ -489,22 +489,12 @@ public function canCreate($name, $checkAbstractFactories = true)
             $cName = $this->canonicalizeName($rName);
         }
 
-        $has = (
+        if (
             isset($this->invokableClasses[$cName])
             || isset($this->factories[$cName])
             || isset($this->aliases[$cName])
             || isset($this->instances[$cName])
-        );
-
-        if ($has) {
-            return true;
-        }
-
-        if (isset($this->factories[$cName])) {
-            return true;
-        }
-
-        if (isset($this->invokableClasses[$cName])) {
+        ) {
             return true;
         }