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

src/Adapter/DbTable.php

@@ -371,18 +371,14 @@ public function authenticate()
             return $authResult;
         }
 
-        if (true === $this->getAmbiguityIdentity()) {
-            $validIdentities = array ();
-            $zendAuthCredentialMatchColumn = $this->_zendDb->foldCase('zend_auth_credential_match');
-            foreach ($resultIdentities as $identity) {
-                if (1 === (int) $identity[$zendAuthCredentialMatchColumn]) {
-                    $validIdentities[] = $identity;
-                }
+        // At this point, ambiguity is allready done. Loop, check and break on success.
+        foreach ($resultIdentities as $identity) {
+            $authResult = $this->_authenticateValidateResult($identity);
+            if ($authResult->isValid()) {
+                break;
             }
-            $resultIdentities = $validIdentities;
         }
-
-        $authResult = $this->_authenticateValidateResult(array_shift($resultIdentities));
+
         return $authResult;
     }
 

test/Adapter/DbTableTest.php

@@ -426,8 +426,8 @@ public function testEqualUsernamesDifferentPasswordShouldAuthenticateWhenFlagIsS
         $result2 = $this->_adapter->authenticate();
         $this->assertFalse(in_array('More than one record matches the supplied identity.',
             $result->getMessages()));
-        $this->assertTrue($result->isValid());
-        $this->assertEquals('my_username', $result->getIdentity());
+        $this->assertTrue($result2->isValid());
+        $this->assertEquals('my_username', $result2->getIdentity());
     }