From 8451a353ad6f8dc02b5e4a9de76419dfb5a34457 Mon Sep 17 00:00:00 2001 From: Jay Hariani Date: Fri, 18 Apr 2014 14:51:18 -0400 Subject: [PATCH] Updates to support Laravel 4.1.25+ --- .travis.yml | 2 +- composer.json | 2 +- .../LaravelKinvey/Database/Eloquent/Builder.php | 2 +- .../LaravelKinvey/Database/Eloquent/User.php | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f49d0c7..fbe392b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ php: env: global: - - secure: RAGFum6F/yXPnbBNSdS4lzqKR+uvg4lXhsWTQPhwJIG+hYO5AECGyIf9oi1RKbAxSslAEOvmM+dXC5WFSki057BOzszRG9ZgtfCkk8PfMutZFyOz8lppRO2llfl0+aZ2+zDRQXFRZueNYunTzPLLqS5nx0wsYs2LWxr4/2gwZ/Q= + - secure: iyrSK5ab4TjqA2YVil/V+ccjU/uTVrsEVyht0wGzcbkMxPtsJxZTvyvjFYeFJ5JOE+zKORZEKIrMKdiYEvjHcHuGF5K5gmRQYkC3LALM4QKVfxnDhxX/LFCXcFMviTxNzwuDv3i/TcNo19RpceH/hhTNLYU+jMwMUbLdk4K+U1I= - secure: ZTF0DcZLxcme4okeBz2p6V/EDq2XXRAx/lq1K6C3aWOy5DgP4uGH8QfFFoxEQQDSmRSpMfYqzAPg2bO18A4a66WLejeKk5dOBX/sKDt+Nugi5h4RdgGq2RNlCeuDdFlKA+nanRdNvCVKK1CIQorZUzlqNmFl2vbP+hnYGrqBdlg= - secure: Rry8rpIrNBLL6Hqx0FDxCaIxVmWVO2wlOk2ArrgjaA6EzTuzh9ynjMq7nEvWmnYwyBLSCEUoNEeIXTdjVZFxfQPKDDZhzVfrGiJErPfpfnw/6p0s/QR0UUNQCVxQqQ8T1qJ91tubpDHUZhSBQs0ErR8sEh8gT25/1LG3wlPxKhg= - secure: iq7TMuOPG6xzUYCQGea566tP19bPEVbdy58KgmLr2YqfZOhB3qFDGUQ7w6SJML2q5wFJ0SB/zPZ7cWx/CrkyjG3Yh4rWaBU4AR2AzYWnbD2mTziemKzblVyp+2alSboGxuPxG05+hA3tKoxKG8Ikw09b7kfS9vv83DcUujVY+FQ= diff --git a/composer.json b/composer.json index bd26c0f..7bb8409 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "php": ">=5.4.0", "guzzle/guzzle": "~3.8", - "jenssegers/mongodb": "1.1.3", + "jenssegers/mongodb": "1.2.8", "illuminate/support": "4.1.x", "illuminate/cache": "4.1.x", "illuminate/auth": "4.1.x", diff --git a/src/GovTribe/LaravelKinvey/Database/Eloquent/Builder.php b/src/GovTribe/LaravelKinvey/Database/Eloquent/Builder.php index 73d96cb..980b73c 100644 --- a/src/GovTribe/LaravelKinvey/Database/Eloquent/Builder.php +++ b/src/GovTribe/LaravelKinvey/Database/Eloquent/Builder.php @@ -25,7 +25,7 @@ public function __construct(Connection $connection) * @param mixed $id * @return mixed */ - protected function convertKey($id) + public function convertKey($id) { // As Kinvey doesn't use MongoIDs, just return the string id. if ($id instanceof \MongoId) $id = $id->__toString(); diff --git a/src/GovTribe/LaravelKinvey/Database/Eloquent/User.php b/src/GovTribe/LaravelKinvey/Database/Eloquent/User.php index 519fd0a..efa85bb 100644 --- a/src/GovTribe/LaravelKinvey/Database/Eloquent/User.php +++ b/src/GovTribe/LaravelKinvey/Database/Eloquent/User.php @@ -64,4 +64,19 @@ public function getReminderEmail() { return $this->email; } + + public function getRememberToken() + { + return $this->remember_token; + } + + public function setRememberToken($value) + { + $this->remember_token = $value; + } + + public function getRememberTokenName() + { + return 'remember_token'; + } } \ No newline at end of file