From cf4c12d2ef570bf188809a8f07adb58e4ebc32d3 Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Mon, 26 Jul 2021 16:18:18 -0400
Subject: [PATCH] ISTWCMS-4954: changing getting yaml to use Drupal's function
and moving yml files into root
---
src/UwRoles/UwRoles.php | 5 +++--
src/UwRoles/{yml => }/user.role.anonymous.yml | 0
src/UwRoles/{yml => }/user.role.authenticated.yml | 0
src/UwRoles/{yml => }/user.role.uw_role_content_author.yml | 0
src/UwRoles/{yml => }/user.role.uw_role_content_editor.yml | 0
src/UwRoles/{yml => }/user.role.uw_role_form_editor.yml | 0
.../{yml => }/user.role.uw_role_form_results_access.yml | 0
src/UwRoles/{yml => }/user.role.uw_role_site_manager.yml | 0
src/UwRoles/{yml => }/user.role.uw_role_site_owner.yml | 0
9 files changed, 3 insertions(+), 2 deletions(-)
rename src/UwRoles/{yml => }/user.role.anonymous.yml (100%)
rename src/UwRoles/{yml => }/user.role.authenticated.yml (100%)
rename src/UwRoles/{yml => }/user.role.uw_role_content_author.yml (100%)
rename src/UwRoles/{yml => }/user.role.uw_role_content_editor.yml (100%)
rename src/UwRoles/{yml => }/user.role.uw_role_form_editor.yml (100%)
rename src/UwRoles/{yml => }/user.role.uw_role_form_results_access.yml (100%)
rename src/UwRoles/{yml => }/user.role.uw_role_site_manager.yml (100%)
rename src/UwRoles/{yml => }/user.role.uw_role_site_owner.yml (100%)
diff --git a/src/UwRoles/UwRoles.php b/src/UwRoles/UwRoles.php
index 855ef0fb..68035e02 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
--
GitLab