Merge branch 'hotfix/7476'

Close zendframework/zendframework#7476
zendframework · May 4, 2015 · 61e9069 · 61e9069
2 parents aeee471 + 47347d6
commit 61e9069
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/test/BindTest.php b/test/BindTest.php
@@ -264,7 +264,7 @@ public function testResourceIsAlwaysReturned()
     {
         $ldap = new Ldap\Ldap($this->options);
         $this->assertNotNull($ldap->getResource());
-        $this->assertTrue(is_resource($ldap->getResource()));
+        $this->assertInternalType('resource', $ldap->getResource());
         $this->assertEquals(TESTS_ZEND_LDAP_USERNAME, $ldap->getBoundUser());
     }
 

diff --git a/test/CanonTest.php b/test/CanonTest.php
@@ -117,7 +117,7 @@ public function testMismatchDomainBind()
             $ldap->bind('BOGUS\\doesntmatter', 'doesntmatter');
             $this->fail('Expected exception not thrown');
         } catch (Exception\LdapException $zle) {
-            $this->assertTrue($zle->getCode() == Exception\LdapException::LDAP_X_DOMAIN_MISMATCH);
+            $this->assertEquals(Exception\LdapException::LDAP_X_DOMAIN_MISMATCH, $zle->getCode());
         }
     }
 

diff --git a/test/Dn/ExplodingTest.php b/test/Dn/ExplodingTest.php
@@ -59,7 +59,7 @@ public static function explodeDnOperationProvider()
     public function testExplodeDnOperation($input, $expected)
     {
         $ret = Ldap\Dn::checkDn($input);
-        $this->assertTrue($ret === $expected);
+        $this->assertEquals($expected, $ret);
     }
 
     public function testExplodeDnCaseFold()