Merge branch '4.6' into 4

docs/en/04_Changelogs/4.6.0.md

@@ -283,19 +283,21 @@ Then you just need to remove the reference to `silverstripe/mimevalidator`.
 Beware that this will make future upgrade more difficult because you will have
 to manually edit each module constraint.
 
-## File status icons in the file manager
+## File indicators in the File manager
 
-![File status icons](https://raw.githubusercontent.com/silverstripe/silverstripe-framework/4/docs/en/04_Changelogs/_images/file-status-icons.png "A screenshot of file status icons being displayed in the file manager")
+![File indicators](_images/file-indicators.png "A screenshot of file indicators being displayed in the file manager")
 
 Files and folders with permissions of either "Logged in users" or "Only these
 groups (choose from list)" now show a "Restricted access" icon in the file
-manager.  These permissions can either be directly on the DataObject or they can
+manager. These permissions can either be directly on the DataObject or they can
 be inherited from the parent folder.
 
 Websites with the optional [UserForms](https://github.com/silverstripe/silverstripe-userforms)
 module installed will show a "Form submission" icon on files uploaded through a
-UserForm.  UserForm uploaded files without a "Restricted access" icon show a
+UserForm. UserForm uploaded files without a "Restricted access" icon show a
 "Form submission, unrestricted access" icon instead.
+For more information about File indicators and how they work in conjunction with UserForms and the File manager refer to
+[Silverstripe CMS User help guides](https://userhelp.silverstripe.org/en/4/optional_features/forms/form-submissions/#file-upload-field).
 
 ## Solr no longer indexes draft/restricted content {#solr-updates}
 

src/Security/PermissionRole.php

@@ -31,11 +31,11 @@ class PermissionRole extends DataObject
     ];
 
     private static $has_many = [
-        "Codes" => "SilverStripe\\Security\\PermissionRoleCode",
+        "Codes" => PermissionRoleCode::class,
     ];
 
     private static $belongs_many_many = [
-        "Groups" => "SilverStripe\\Security\\Group",
+        "Groups" => Group::class,
     ];
 
     private static $table_name = "PermissionRole";