diff --git a/filter_perms.info.yml b/filter_perms.info.yml
index d82f59b..84f4493 100644
--- a/filter_perms.info.yml
+++ b/filter_perms.info.yml
@@ -4,4 +4,4 @@ description: 'Provides role and module filters to simplify the user permissions
 package: 'Administration'
 core: 8.x
 dependencies:
- - user
+ - drupal:user
diff --git a/src/Form/PermissionsForm.php b/src/Form/PermissionsForm.php
index 9443ce0..df1fe66 100644
--- a/src/Form/PermissionsForm.php
+++ b/src/Form/PermissionsForm.php
@@ -64,62 +64,62 @@ class PermissionsForm extends UserPermissionsForm {
     // Render role/permission overview:
     $hide_descriptions = system_admin_compact_mode();
 
-    $form['system_compact_link'] = array(
+    $form['system_compact_link'] = [
       '#id' => FALSE,
       '#type' => 'system_compact_link',
-    );
+    ];
 
     $permissions = $this->permissionHandler->getPermissions();
 
-    $providers = array();
+    $providers = [];
     foreach ($permissions as $permission) {
       $providers[$permission['provider']] = $permission['provider'];
     }
 
     $roles = $this->getRoles();
 
-    $defined_roles = array();
+    $defined_roles = [];
     foreach ($roles as $role_name => $role) {
       $defined_roles[$role_name] = $role->label();
     }
 
     $filter = $this->getFilterSettings();
 
-    $form['filters'] = array(
+    $form['filters'] = [
       '#type' => 'details',
       '#title' => $this->t('Permission Filters'),
       '#open' => TRUE,
-    );
-    $form['filters']['container'] = array(
+    ];
+    $form['filters']['container'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('form--inline', 'clearfix')),
-    );
+      '#attributes' => ['class' => ['form--inline', 'clearfix']],
+    ];
     // Displays all user roles.
-    $form['filters']['container']['roles'] = array(
+    $form['filters']['container']['roles'] = [
       '#title' => $this->t('Roles to display'),
       '#type' => 'select',
-      '#options' => array(self::ALL_OPTIONS => '--All Roles') + $defined_roles,
+      '#options' => [self::ALL_OPTIONS => '--All Roles'] + $defined_roles,
       '#default_value' => $filter['roles'],
       '#size' => 8,
       '#multiple' => TRUE,
-    );
+    ];
     // Displays all modules which define permissions.
-    $form['filters']['container']['modules'] = array(
+    $form['filters']['container']['modules'] = [
       '#title' => $this->t('Modules to display'),
       '#type' => 'select',
-      '#options' => array(self::ALL_OPTIONS => '--All Modules') + $providers,
+      '#options' => [self::ALL_OPTIONS => '--All Modules'] + $providers,
       '#default_value' => $filter['modules'],
       '#size' => 8,
       '#multiple' => TRUE,
-    );
-    $form['filters']['action'] = array('#type' => 'actions');
-    $form['filters']['action']['submit'] = array(
+    ];
+    $form['filters']['action'] = ['#type' => 'actions'];
+    $form['filters']['action']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Filter Permissions'),
-      '#submit' => array('::submitFormFilter'),
-    );
+      '#submit' => ['::submitFormFilter'],
+    ];
 
-    $role_names = $role_permissions = $admin_roles = array();
+    $role_names = $role_permissions = $admin_roles = [];
 
     foreach ($roles as $role_name => $role) {
       if (in_array(self::ALL_OPTIONS, $filter['roles']) || in_array($role_name, $filter['roles'])) {
@@ -132,26 +132,26 @@ class PermissionsForm extends UserPermissionsForm {
     }
 
     // Store $role_names for use when saving the data.
-    $form['role_names'] = array(
+    $form['role_names'] = [
       '#type' => 'value',
       '#value' => $role_names,
-    );
+    ];
 
-    $permissions_by_provider = array();
+    $permissions_by_provider = [];
     foreach ($permissions as $permission_name => $permission) {
       if (in_array(self::ALL_OPTIONS, $filter['modules']) || in_array($permission['provider'], $filter['modules'])) {
         $permissions_by_provider[$permission['provider']][$permission_name] = $permission;
       }
     }
 
-    $form['permissions'] = array(
+    $form['permissions'] = [
       '#type' => 'table',
-      '#header' => array($this->t('Permission')),
+      '#header' => [$this->t('Permission')],
       '#id' => 'permissions',
       '#attributes' => ['class' => ['permissions', 'js-permissions']],
       '#sticky' => TRUE,
       '#empty' => $this->t('Please select at least one value from both the Roles and Modules select boxes above and then click the "Filter Permissions" button.'),
-    );
+    ];
 
     // Only build the rest of the form if there are any filter settings.
     if (empty($role_names) || empty($permissions_by_provider)) {
@@ -159,53 +159,55 @@ class PermissionsForm extends UserPermissionsForm {
     }
 
     foreach ($role_names as $name) {
-      $form['permissions']['#header'][] = array(
+      $form['permissions']['#header'][] = [
         'data' => $name,
-        'class' => array('checkbox'),
-      );
+        'class' => ['checkbox'],
+      ];
     }
 
     foreach ($permissions_by_provider as $provider => $permissions) {
       // Module name.
-      $form['permissions'][$provider] = array(array(
-        '#wrapper_attributes' => array(
-          'colspan' => count($role_names) + 1,
-          'class' => array('module'),
-          'id' => 'module-' . $provider,
-        ),
-        '#markup' => $this->moduleHandler->getName($provider),
-      ));
+      $form['permissions'][$provider] = [
+        [
+          '#wrapper_attributes' => [
+            'colspan' => count($role_names) + 1,
+            'class' => ['module'],
+            'id' => 'module-' . $provider,
+          ],
+          '#markup' => $this->moduleHandler->getName($provider),
+        ],
+      ];
       foreach ($permissions as $perm => $perm_item) {
         // Fill in default values for the permission.
-        $perm_item += array(
+        $perm_item += [
           'description' => '',
           'restrict access' => FALSE,
           'warning' => !empty($perm_item['restrict access']) ? $this->t('Warning: Give to trusted roles only; this permission has security implications.') : '',
-        );
-        $form['permissions'][$perm]['description'] = array(
+        ];
+        $form['permissions'][$perm]['description'] = [
           '#type' => 'inline_template',
           '#template' => '<div class="permission"><span class="title">{{ title }}</span>{% if description or warning %}<div class="description">{% if warning %}<em class="permission-warning">{{ warning }}</em> {% endif %}{{ description }}</div>{% endif %}</div>',
-          '#context' => array(
+          '#context' => [
             'title' => $perm_item['title'],
-          ),
-        );
+          ],
+        ];
         // Show the permission description.
         if (!$hide_descriptions) {
           $form['permissions'][$perm]['description']['#context']['description'] = $perm_item['description'];
           $form['permissions'][$perm]['description']['#context']['warning'] = $perm_item['warning'];
         }
         foreach ($role_names as $rid => $name) {
-          $form['permissions'][$perm][$rid] = array(
+          $form['permissions'][$perm][$rid] = [
             '#title' => $name . ': ' . $perm_item['title'],
             '#title_display' => 'invisible',
-            '#wrapper_attributes' => array(
-              'class' => array('checkbox'),
-            ),
+            '#wrapper_attributes' => [
+              'class' => ['checkbox'],
+            ],
             '#type' => 'checkbox',
             '#default_value' => in_array($perm, $role_permissions[$rid]) ? 1 : 0,
-            '#attributes' => array('class' => array('rid-' . $rid, 'js-rid-' . $rid)),
-            '#parents' => array($rid, $perm),
-          );
+            '#attributes' => ['class' => ['rid-' . $rid, 'js-rid-' . $rid]],
+            '#parents' => [$rid, $perm],
+          ];
           // Show a column of disabled but checked checkboxes.
           if ($admin_roles[$rid]) {
             $form['permissions'][$perm][$rid]['#disabled'] = TRUE;
@@ -215,12 +217,12 @@ class PermissionsForm extends UserPermissionsForm {
       }
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save permissions'),
       '#button_type' => 'primary',
-    );
+    ];
 
     $form['#attached']['library'][] = 'user/drupal.user.permissions';
 
@@ -243,7 +245,7 @@ class PermissionsForm extends UserPermissionsForm {
    *   The modules to filter by.
    */
   protected function saveFilterSettings(array $roles, array $modules) {
-    $values = array('roles' => $roles, 'modules' => $modules);
+    $values = ['roles' => $roles, 'modules' => $modules];
     $this->keyValueExpirable->setWithExpire($this->currentUser()->id(), $values, 3600);
   }
 
@@ -254,7 +256,7 @@ class PermissionsForm extends UserPermissionsForm {
    *   The filter setting for the current user.
    */
   protected function getFilterSettings() {
-    $default = array('roles' => array(), 'modules' => array());
+    $default = ['roles' => [], 'modules' => []];
     return $this->keyValueExpirable->get($this->currentUser()->id(), $default);
   }
 
diff --git a/src/Form/PermissionsRoleSpecificForm.php b/src/Form/PermissionsRoleSpecificForm.php
index 14e594c..d80aee8 100644
--- a/src/Form/PermissionsRoleSpecificForm.php
+++ b/src/Form/PermissionsRoleSpecificForm.php
@@ -12,9 +12,6 @@ class PermissionsRoleSpecificForm extends PermissionsForm {
 
   /**
    * {@inheritdoc}
-   *
-   * @param \Drupal\user\RoleInterface $user_role
-   *   The user role used for this form.
    */
   public function buildForm(array $form, FormStateInterface $form_state, RoleInterface $user_role = NULL) {
     $this->saveFilterSettings((array) $user_role->id(), (array) self::ALL_OPTIONS);