diff --git a/src/UwRoles/UwRoles.php b/src/UwRoles/UwRoles.php index 855ef0fbc21066d4eca1e72a2dda6444f8bc7709..68035e029f441a5a6ee5c8592df0e7a1b8d3ff10 100644 --- a/src/UwRoles/UwRoles.php +++ b/src/UwRoles/UwRoles.php @@ -3,6 +3,7 @@ namespace Drupal\uw_cfg_common\UwRoles; use Drupal\user\Entity\Role; +use Drupal\Component\Serialization\Yaml; /** * Class UwRoles. @@ -131,10 +132,10 @@ class UwRoles { public static function getUwPermissions(string $rid): array { // Get the file to the user role permissions yml file. - $file = drupal_get_path('module', 'uw_cfg_common') . '/src/UwRoles/yml/user.role.' . $rid . '.yml'; + $file = __DIR__ . '/user.role.' . $rid . '.yml'; // Parse the yml file to get the permissions. - $permissions = yaml_parse_file($file); + $permissions = Yaml::decode(file_get_contents($file)); // Return the permissions for the specific user. return $permissions['permissions']; diff --git a/src/UwRoles/yml/user.role.anonymous.yml b/src/UwRoles/user.role.anonymous.yml similarity index 100% rename from src/UwRoles/yml/user.role.anonymous.yml rename to src/UwRoles/user.role.anonymous.yml diff --git a/src/UwRoles/yml/user.role.authenticated.yml b/src/UwRoles/user.role.authenticated.yml similarity index 100% rename from src/UwRoles/yml/user.role.authenticated.yml rename to src/UwRoles/user.role.authenticated.yml diff --git a/src/UwRoles/yml/user.role.uw_role_content_author.yml b/src/UwRoles/user.role.uw_role_content_author.yml similarity index 100% rename from src/UwRoles/yml/user.role.uw_role_content_author.yml rename to src/UwRoles/user.role.uw_role_content_author.yml diff --git a/src/UwRoles/yml/user.role.uw_role_content_editor.yml b/src/UwRoles/user.role.uw_role_content_editor.yml similarity index 100% rename from src/UwRoles/yml/user.role.uw_role_content_editor.yml rename to src/UwRoles/user.role.uw_role_content_editor.yml diff --git a/src/UwRoles/yml/user.role.uw_role_form_editor.yml b/src/UwRoles/user.role.uw_role_form_editor.yml similarity index 100% rename from src/UwRoles/yml/user.role.uw_role_form_editor.yml rename to src/UwRoles/user.role.uw_role_form_editor.yml diff --git a/src/UwRoles/yml/user.role.uw_role_form_results_access.yml b/src/UwRoles/user.role.uw_role_form_results_access.yml similarity index 100% rename from src/UwRoles/yml/user.role.uw_role_form_results_access.yml rename to src/UwRoles/user.role.uw_role_form_results_access.yml diff --git a/src/UwRoles/yml/user.role.uw_role_site_manager.yml b/src/UwRoles/user.role.uw_role_site_manager.yml similarity index 100% rename from src/UwRoles/yml/user.role.uw_role_site_manager.yml rename to src/UwRoles/user.role.uw_role_site_manager.yml diff --git a/src/UwRoles/yml/user.role.uw_role_site_owner.yml b/src/UwRoles/user.role.uw_role_site_owner.yml similarity index 100% rename from src/UwRoles/yml/user.role.uw_role_site_owner.yml rename to src/UwRoles/user.role.uw_role_site_owner.yml