Merge branch 'v23.02-branch' into release

Author: ssddanbrown

app/Http/Controllers/RoleController.php

@@ -151,7 +151,8 @@ public function delete(Request $request, string $id)
         $this->checkPermission('user-roles-manage');
 
         try {
-            $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id', 0));
+            $migrateRoleId = intval($request->get('migrate_role_id') ?: "0");
+            $this->permissionsRepo->deleteRole($id, $migrateRoleId);
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());
 

composer.json

@@ -49,7 +49,7 @@
         "nunomaduro/larastan": "^2.4",
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.7",
-        "ssddanbrown/asserthtml": "^1.0"
+        "ssddanbrown/asserthtml": "^2.0"
     },
     "autoload": {
         "psr-4": {