Page MenuHomeDevCentral
Files F4033377

D423.diff
No OneTemporary
Actions

D423.diff
View Options

diff --git a/app/Console/Commands/AccountReset.php b/app/Console/Commands/AccountReset.php
--- a/app/Console/Commands/AccountReset.php
+++ b/app/Console/Commands/AccountReset.php
@@ -4,7 +4,9 @@
use Illuminate\Console\Command;
use Illuminate\Contracts\Auth\PasswordBroker;
+use Illuminate\Mail\Message;
use Illuminate\Support\Facades\Password;
+
use AuthGrove\Console\Services\AccountHelpers;
class AccountReset extends Command
@@ -66,7 +68,7 @@
];
//Tries to send the mail
- $response = Password::sendResetLink($credentials, function($m) use ($subject)
+ $response = Password::sendResetLink($credentials, function(Message $m) use ($subject)
{
$m->subject($subject);
});
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -1,6 +1,8 @@
<?php namespace AuthGrove\Http\Middleware;
use Closure;
+
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class Authenticate {
@@ -12,7 +14,7 @@
* @param string|null $guard
* @return mixed
*/
- public function handle($request, Closure $next, $guard = null) {
+ public function handle(Request $request, Closure $next, $guard = null) {
if (Auth::guard($guard)->guest()) {
if ($request->ajax()) {
return response('Unauthorized.', 401);
diff --git a/app/Services/ResetsPasswords.php b/app/Services/ResetsPasswords.php
--- a/app/Services/ResetsPasswords.php
+++ b/app/Services/ResetsPasswords.php
@@ -5,6 +5,7 @@
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use Illuminate\Mail\Message;
+use Illuminate\Contracts\Auth\CanResetPassword;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Illuminate\Foundation\Auth\RedirectsUsers;
@@ -296,7 +297,7 @@
* @param string $password
* @return void
*/
- protected function resetPassword($user, $password) {
+ protected function resetPassword(CanResetPassword $user, $password) {
$user->forceFill([
'password' => bcrypt($password),
'remember_token' => Str::random(60),

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 10:36 (20 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2368691
Default Alt Text
D423.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator