Merge branch '5.6' of github.com:laravel/framework into 5.6

DominicGebhart · Mar 28, 2018 · fba33e5 · fba33e5
2 parents 1371583 + 4ee07dd
commit fba33e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/Illuminate/Auth/Authenticatable.php b/src/Illuminate/Auth/Authenticatable.php
@@ -2,8 +2,6 @@
 
 namespace Illuminate\Auth;
 
-use Illuminate\Support\Facades\Hash;
-
 trait Authenticatable
 {
     /**

diff --git a/src/Illuminate/Auth/SessionGuard.php b/src/Illuminate/Auth/SessionGuard.php
@@ -550,7 +550,7 @@ public function logoutOtherDevices($password, $attribute = 'password')
         }
 
         return tap($this->user()->forceFill([
-            $attribute => Hash::make($password)
+            $attribute => Hash::make($password),
         ]))->save();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ @@
     namespace Illuminate\Auth;
-    use Illuminate\Support\Facades\Hash;
     trait Authenticatable
     {
         /**
@@ Expand Down @@