merged master

2025-07-30 21:20:24 +02:00 · 2018-05-14 09:23:06 +02:00
parent c7f1529333 c2d4d13529
commit 19645785a3
55 changed files with 262 additions and 190 deletions
--- a/framework/core/tests/Test/Concerns/RetrievesAuthorizedUsers.php
+++ b/framework/core/tests/Test/Concerns/RetrievesAuthorizedUsers.php
@@ -28,10 +28,10 @@ trait RetrievesAuthorizedUsers

    public function getNormalUser()
    {
-        User::unguard();
-
-        return User::firstOrCreate([
-            'username' => $this->userAttributes['username']
-        ], $this->userAttributes);
+        User::unguarded(function () {
+            return User::firstOrCreate([
+                'username' => $this->userAttributes['username']
+            ], $this->userAttributes);
+        });
    }
 }