From 8ef5ee04dd8177091215297efb096457f9d805a4 Mon Sep 17 00:00:00 2001
From: Derek Illchuk <dillchuk@gmail.com>
Date: Sat, 4 Apr 2015 17:29:09 -0500
Subject: [PATCH 1/3] findByUserId and findByRequestKey were calling wrong
 methods.

---
 src/GoalioForgotPassword/Mapper/Password.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/GoalioForgotPassword/Mapper/Password.php b/src/GoalioForgotPassword/Mapper/Password.php
index 145e13c..0de2db5 100644
--- a/src/GoalioForgotPassword/Mapper/Password.php
+++ b/src/GoalioForgotPassword/Mapper/Password.php
@@ -24,18 +24,16 @@ public function remove($passwordModel)
 
     public function findByUserId($userId)
     {
-        $select = $this->select()
-                       ->from($this->tableName)
+        $select = $this->getSelect()
                        ->where(array($this->userField => $userId));
-        return $this->selectWith($select)->current();
+        return $this->select($select)->current();
     }
 
     public function findByRequestKey($key)
     {
-        $select = $this->select()
-                       ->from($this->tableName)
+        $select = $this->getSelect()
                        ->where(array($this->keyField => $key));
-        return $this->selectWith($select)->current();
+        return $this->select($select)->current();
     }
 
     public function cleanExpiredForgotRequests($expiryTime=86400)

From ac0d87b0db703c1ad963c64496139d702eafd998 Mon Sep 17 00:00:00 2001
From: Derek Illchuk <derek@illchuk.com>
Date: Thu, 19 Oct 2017 11:54:05 -0500
Subject: [PATCH 2/3] Can we get this to ZfcUser 3?

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 23d9148..7277606 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "goalio/goalio-mailservice": "1.*",
-        "zf-commons/zfc-user": "1.*"
+        "zf-commons/zfc-user": "1.* || ^3.0"
     },
     "autoload": {
         "psr-0": {

From 4fdaf87dc4cd6e933ef7ab759f465858d5b9daec Mon Sep 17 00:00:00 2001
From: Derek Illchuk <derek@illchuk.com>
Date: Fri, 20 Oct 2017 18:15:51 -0500
Subject: [PATCH 3/3] Undoing last commit.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7277606..23d9148 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "goalio/goalio-mailservice": "1.*",
-        "zf-commons/zfc-user": "1.* || ^3.0"
+        "zf-commons/zfc-user": "1.*"
     },
     "autoload": {
         "psr-0": {