Merge branch 'port-2.x-bugfixes' into slim-3.x

jeremykendall · Jan 18, 2016 · 1f2d0bb · 1f2d0bb
2 parents acf8905 + e8323e6
commit 1f2d0bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 build
 composer.lock
+vendor/
diff --git a/src/Adapter/Db/PdoAdapter.php b/src/Adapter/Db/PdoAdapter.php
@@ -86,7 +86,7 @@ public function authenticate()
         }
 
         $validationResult = $this->passwordValidator->isValid(
-            $this->credential, $user[$this->credentialColumn], $user['id']
+            $this->credential, $user[$this->credentialColumn], $user[$this->identityColumn]
         );
 
         if ($validationResult->isValid()) {

diff --git a/tests/Adapter/Db/PdoAdapterTest.php b/tests/Adapter/Db/PdoAdapterTest.php
@@ -65,7 +65,7 @@ public function testAuthenticationSuccess()
             ->with(
                 $this->plainTextPassword,
                 $this->identity['hashed_password'],
-                $this->identity['id']
+                $this->identity['email_address']
             )
             ->will($this->returnValue(new ValidationResult(ValidationResult::SUCCESS)));
 
@@ -90,7 +90,7 @@ public function testAuthenticationFailsBadPassword()
             ->with(
                 'bad password',
                 $this->identity['hashed_password'],
-                $this->identity['id']
+                $this->identity['email_address']
             )
             ->will($this->returnValue(
                 new ValidationResult(ValidationResult::FAILURE_PASSWORD_INVALID)
@@ -130,7 +130,7 @@ public function testIssue13()
             ->with(
                 $this->plainTextPassword,
                 $this->identity['hashed_password'],
-                $this->identity['id']
+                $this->identity['email_address']
             )
             ->will($this->returnValue(new ValidationResult(ValidationResult::SUCCESS)));