Skip to content

Commit b9af755

Browse files
authored
Merge branch 'main' into 2fa_v9
2 parents a7cbb18 + 617eba4 commit b9af755

File tree

11 files changed

+123
-127
lines changed

11 files changed

+123
-127
lines changed

app/Services/UserService.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,10 @@ public function create(string $user_name, string $real_name, string $email, #[\S
336336
*/
337337
public function delete(User $user): void
338338
{
339+
DB::table('session')
340+
->where('user_id', '=', $user->id())
341+
->delete();
342+
339343
// Don't delete the logs, just set the user to null.
340344
DB::table('log')
341345
->where('user_id', '=', $user->id())

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252
"fisharebest/ext-calendar": "2.6.0",
5353
"fisharebest/localization": "1.17.0",
5454
"guzzlehttp/guzzle": "7.9.3",
55-
"illuminate/database": "12.18.0",
56-
"illuminate/support": "12.18.0",
55+
"illuminate/database": "12.19.3",
56+
"illuminate/support": "12.19.3",
5757
"intervention/image": "3.11.3",
5858
"league/commonmark": "2.7.0",
5959
"league/flysystem": "3.29.1",
6060
"league/flysystem-path-prefixing": "3.28.0",
6161
"league/flysystem-ziparchive": "3.29.0",
6262
"middlewares/client-ip": "2.1.0",
6363
"mlocati/ip-lib": "1.20.0",
64-
"nesbot/carbon": "3.9.1",
64+
"nesbot/carbon": "3.10.0",
6565
"nyholm/psr7": "1.8.2",
6666
"nyholm/psr7-server": "1.1.0",
6767
"pragmarx/google2fa": "^8.0",
@@ -90,8 +90,8 @@
9090
"phpstan/phpstan-deprecation-rules": "2.0.3",
9191
"phpstan/phpstan-phpunit": "2.0.6",
9292
"phpstan/phpstan-strict-rules": "2.0.4",
93-
"phpunit/phpunit": "12.2.1",
94-
"squizlabs/php_codesniffer": "4.0.0beta1"
93+
"phpunit/phpunit": "12.2.3",
94+
"squizlabs/php_codesniffer": "4.0.0-RC1"
9595
},
9696
"suggest": {
9797
"ext-imagick": "Required to generate thumbnail images",

composer.lock

Lines changed: 56 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)