Fixes jhedstrom#210: Don't throw exception when deleting non-existant…

… role
bkosborne · Oct 8, 2019 · 55070f0 · 55070f0
1 parent 65d70d0
commit 55070f0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/Drupal/Driver/Cores/Drupal8.php b/src/Drupal/Driver/Cores/Drupal8.php
@@ -13,6 +13,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\TermInterface;
+use Drupal\user\RoleInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -168,12 +169,9 @@ public function roleCreate(array $permissions) {
    */
   public function roleDelete($role_name) {
     $role = user_role_load($role_name);
-
-    if (!$role) {
-      throw new \RuntimeException(sprintf('No role "%s" exists.', $role_name));
+    if ($role instanceof RoleInterface) {
+      $role->delete();
     }
-
-    $role->delete();
   }
 
   /**