Commit f6c0cdbf authored by jithin varghese Jose's avatar jithin varghese Jose Committed by Tara Wijayagunawardana
Browse files

Issue #3316700 by jithinvarghese, tarawij, pandaski: Drupal 10 compatibility

parent 06016e45

module_permissions.info.yml

+1 −1
Original line number Diff line number Diff line 
name: 'Module Permissions'

type: module

description: 'Protects a site with the managed allow/disallow list of modules, permissions and paths.'

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^9 || ^10

package: 'Administration'

module_permissions_ui/module_permissions_ui.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ package: 'Administration' 
configure: module_permissions_ui.settings

dependencies:

  - module_permissions:module_permissions

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^9 || ^10

hidden: true

module_permissions_ui/src/Form/ProtectedModulesForm.php

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Drupal\Core\Form\ConfigFormBase; 
use Drupal\Core\Form\FormStateInterface;

use Drupal\module_permissions\Helper;

use Symfony\Component\DependencyInjection\ContainerInterface;

Use Drupal\Core\Update\UpdateHookRegistry;



/**

 * Protected Modules config form for Module Permissions.
@@ -161,7 +162,7 @@ class ProtectedModulesForm extends ConfigFormBase { 


    $form['modules'] = [];



    uasort($modules, 'system_sort_modules_by_info_name');

    uasort($modules, [ModuleExtensionList::class, 'sortByName']);



    $form['selected_modules'] = ['#tree' => TRUE];
@@ -188,7 +189,7 @@ class ProtectedModulesForm extends ConfigFormBase { 
        }



        foreach (array_keys($module->required_by) as $dependent) {

          if (drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) {

          if (\Drupal::service('update.update_hook_registry')->getInstalledVersion($dependent) != UpdateHookRegistry::SCHEMA_UNINSTALLED) {

            $name = isset($modules[$dependent]->info['name']) ? $modules[$dependent]->info['name'] : $dependent;

            $form['modules'][$module->getName()]['#required_by'][] = $name;

          }