Merge pull request #1 from psecio/master

Sync from original

3 files changed, 5 insertions, 4 deletions

diff --git a/docs/installation-and-configuration.md b/docs/installation-and-configuration.md
index d5dc9ba..89180a9 100644
--- a/docs/installation-and-configuration.md
+++ b/docs/installation-and-configuration.md
@@ -26,7 +26,8 @@ There's a "quick start" method for getting Gatekeeper up and running in two step
 
 ```
 create database gatekeeper;
-grant all on gatekeeper.* to 'gk-user'@'localhost' identified by 'some-password-here';
+CREATE USER 'gk-user'@'localhost' IDENTIFIED BY 'some-password-here';
+grant all on gatekeeper.* to 'gk-user'@'localhost';
 flush privileges;
 ```
 
diff --git a/src/Psecio/Gatekeeper/Handler/FindBy.php b/src/Psecio/Gatekeeper/Handler/FindBy.php
index a2504e8..f943315 100644
--- a/src/Psecio/Gatekeeper/Handler/FindBy.php
+++ b/src/Psecio/Gatekeeper/Handler/FindBy.php
@@ -86,7 +86,7 @@ class FindBy extends \Psecio\Gatekeeper\Handler
         $model = substr($name, 0, strlen($name) - 1);
         $collectionNs = '\\Psecio\\Gatekeeper\\'.$model.'Collection';
         if (!class_exists($collectionNs)) {
-            throw new \Psecio\Gatekepper\Exception\ModelNotFoundException('Collection type '.$model.' could not be found');
+            throw new \Psecio\Gatekeeper\Exception\ModelNotFoundException('Collection type '.$model.' could not be found');
         }
         $model = g::modelFactory($model.'Model');
         $collection = new $collectionNs($this->getDb());
@@ -94,4 +94,4 @@ class FindBy extends \Psecio\Gatekeeper\Handler
 
         return $collection;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Psecio/Gatekeeper/Session/RememberMe.php b/src/Psecio/Gatekeeper/Session/RememberMe.php
index 1402ef0..de603e9 100644
--- a/src/Psecio/Gatekeeper/Session/RememberMe.php
+++ b/src/Psecio/Gatekeeper/Session/RememberMe.php
@@ -188,7 +188,7 @@ class RememberMe
      */
     public function isExpired(\Psecio\Gatekeeper\AuthTokenModel $token, $delete = true)
     {
-        if (new \Datetime() > new \DateTime($token->expires)) {
+        if ($token->expires !== null && new \Datetime() > new \DateTime($token->expires)) {
             if ($delete === true) {
                 $this->deleteToken($token->token);
             }