Enable usage with Laravel 5.2

rydurham · Jan 20, 2016 · 33fcdde · 33fcdde
1 parent 5666b59
commit 33fcdde
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -12,13 +12,13 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "illuminate/support": "5.1.*@dev",
-        "illuminate/contracts": "5.1.*@dev",
+        "illuminate/support": "5.2.*@dev",
+        "illuminate/contracts": "5.2.*@dev",
         "cartalyst/sentry": "2.1.*",
         "vinkla/hashids": "~2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "3.1.x@dev",
+        "orchestra/testbench": "3.2.*",
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~4.0"
     },

diff --git a/src/Sentinel/Models/User.php b/src/Sentinel/Models/User.php
@@ -26,6 +26,16 @@ public function getAuthIdentifier()
         return $this->getKey();
     }
 
+    /**
+     * Get the name of the unique identifier for the user.
+     *
+     * @return string
+     */
+    public function getAuthIdentifierName()
+    {
+        return $this->getKey();
+    }
+
     /**
      * Get the password for the user.
      *

diff --git a/tests/SentinelTestCase.php b/tests/SentinelTestCase.php
@@ -39,7 +39,7 @@ protected function getEnvironmentSetUp($app)
             'database' => __DIR__ . '/_data/db.sqlite',
             'prefix'   => '',
         ]);
-        $app['config']->set('mail.pretend', true);
+        $app['config']->set('mail.driver', 'log');
         $app['config']->set('mail.from', ['from' => 'noreply@example.com', 'name' => null]);
 
         // Prepare the sqlite database