Merge branch 'master' of https://github.com/Yousha/zf2 into release

src/Collection.php

@@ -88,9 +88,8 @@ public function getFirst()
         if ($this->count() > 0) {
             $this->rewind();
             return $this->current();
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -135,9 +134,8 @@ public function current()
                 $this->cache[$this->current] = $this->createEntry($current);
             }
             return $this->cache[$this->current];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -163,9 +161,8 @@ public function dn()
                 $this->rewind();
             }
             return $this->iterator->key();
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -181,9 +178,8 @@ public function key()
                 $this->rewind();
             }
             return $this->current;
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -221,8 +217,7 @@ public function valid()
     {
         if (isset($this->cache[$this->current])) {
             return true;
-        } else {
-            return $this->iterator->valid();
         }
+        return $this->iterator->valid();
     }
 }

src/Dn.php

@@ -57,9 +57,8 @@ public static function factory($dn, $caseFold = null)
             return self::fromArray($dn, $caseFold);
         } elseif (is_string($dn)) {
             return self::fromString($dn, $caseFold);
-        } else {
-            throw new Exception\LdapException(null, 'Invalid argument type for $dn');
         }
+        throw new Exception\LdapException(null, 'Invalid argument type for $dn');
     }
 
     /**
@@ -168,9 +167,8 @@ public function get($index, $length = 1, $caseFold = null)
         }
         if ($length === 1) {
             return self::caseFoldRdn($this->dn[$index], $caseFold);
-        } else {
-            return self::caseFoldDn(array_slice($this->dn, $index, $length, false), $caseFold);
         }
+        return self::caseFoldDn(array_slice($this->dn, $index, $length, false), $caseFold);
     }
 
     /**
@@ -325,9 +323,8 @@ public function toArray($caseFold = null)
 
         if ($caseFold === self::ATTR_CASEFOLD_NONE) {
             return $this->dn;
-        } else {
-            return self::caseFoldDn($this->dn, $caseFold);
         }
+        return self::caseFoldDn($this->dn, $caseFold);
     }
 
     /**
@@ -387,9 +384,8 @@ public function offsetExists($offset)
         $offset = (int)$offset;
         if ($offset < 0 || $offset >= count($this->dn)) {
             return false;
-        } else {
-            return true;
         }
+        return true;
     }
 
     /**

src/Ldap.php

@@ -982,9 +982,8 @@ public function count($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB)
         } catch (Exception\LdapException $e) {
             if ($e->getCode() === Exception\LdapException::LDAP_NO_SUCH_OBJECT) {
                 return 0;
-            } else {
-                throw $e;
             }
+            throw $e;
         }
 
         return $result->count();

src/Node.php

@@ -395,9 +395,9 @@ public function willBeMoved()
             return false;
         } elseif ($this->newDn !== null) {
             return ($this->dn != $this->newDn);
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -995,12 +995,10 @@ public function hasChildren()
         if (!is_array($this->children)) {
             if ($this->isAttached()) {
                 return ($this->countChildren() > 0);
-            } else {
-                return false;
             }
-        } else {
-            return (count($this->children) > 0);
+            return false;
         }
+        return (count($this->children) > 0);
     }
 
     /**