Merge branch 'ZF-11946' of https://github.com/sgehrig/zf2 into hotfix…

…/zf-11946
zendframework · Feb 1, 2012 · 4ae1fe7 · 4ae1fe7
commit 4ae1fe7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/Collection/DefaultIterator.php b/src/Collection/DefaultIterator.php
@@ -262,7 +262,7 @@ public function key()
      */
     public function next()
     {
-        if (is_resource($this->_current)) {
+        if (is_resource($this->_current) && $this->_itemCount > 0) {
             $this->_current = @ldap_next_entry($this->_ldap->getResource(), $this->_current);
             if ($this->_current === false) {
                 $msg = $this->_ldap->getLastError($code);
@@ -273,6 +273,8 @@ public function next()
                      throw new Ldap\Exception($this->_ldap, 'getting next entry (' . $msg . ')');
                 }
             }
+        } else {
+            $this->_current = false;
         }
     }
 

diff --git a/test/OnlineTestCase.php b/test/OnlineTestCase.php
@@ -46,7 +46,7 @@ abstract class OnlineTestCase extends TestCase
     private $_nodes;
 
     /**
-     * @return Zend_LDAP
+     * @return \Zend\Ldap\Ldap
      */
     protected function _getLDAP()
     {

diff --git a/test/SearchTest.php b/test/SearchTest.php
@@ -133,7 +133,7 @@ public function testSearchEntriesShortcut()
     {
         $entries=$this->_getLDAP()->searchEntries('(objectClass=organizationalUnit)',
             TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, Ldap\Ldap::SEARCH_SCOPE_SUB);
-        $this->assertType("array", $entries);
+        $this->assertInternalType("array", $entries);
         $this->assertEquals(9, count($entries));
     }
 
@@ -232,7 +232,7 @@ public function testSearchEntriesShortcutWithDnObjectAndFilterObject()
         $filter=Filter::equals('objectClass', 'organizationalUnit');
 
         $entries=$this->_getLDAP()->searchEntries($filter, $dn, Ldap\Ldap::SEARCH_SCOPE_SUB);
-        $this->assertType("array", $entries);
+        $this->assertInternalType("array", $entries);
         $this->assertEquals(9, count($entries));
     }
 
@@ -442,7 +442,7 @@ public function testInnerIteratorIsOfRequiredType()
     {
         $items = $this->_getLDAP()->search('(objectClass=organizationalUnit)',
             TESTS_ZEND_LDAP_WRITEABLE_SUBTREE, Ldap\Ldap::SEARCH_SCOPE_SUB);
-        $this->assertType('\Zend\Ldap\Collection\DefaultIterator', $items->getInnerIterator());
+        $this->assertInstanceOf('\Zend\Ldap\Collection\DefaultIterator', $items->getInnerIterator());
     }
 
     /**