Commit 80bc975c authored by Damião Silva's avatar Damião Silva Committed by Jeroen Tubex
Browse files

Issue #3268189 by fengtan, damiaosj, JeroenT: PHP & Drupal coding standards violations

parent 72c7ce31

menu_admin_per_menu.module

+3 −3
Changes for menu_admin_per_menu.module: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ function menu_admin_per_menu_form_node_form_alter(&$form, FormStateInterface $fo 
    $allowed_menus = $allowedMenusService->getPerMenuPermissions($account);



    $default_value = &$form['menu']['link']['menu_parent']['#default_value'];

    list($current_menu) = explode(':', $default_value ?? '', 2);

    [$current_menu] = explode(':', $default_value ?? '', 2);

    // Disallow editing the menu item if there is a pre-existing menu item

    // belonging to a menu the user does not have permission to access.

    if (!empty($current_menu) && !in_array($current_menu, $allowed_menus)) {
@@ -97,7 +97,7 @@ function menu_admin_per_menu_filter_parent_options(AccountInterface $account, ar 
  $allowed_menus = $allowedMenusService->getPerMenuPermissions($account);



  foreach ($options as $key => $option) {

    list($menu) = explode(':', $key, 2);

    [$menu] = explode(':', $key, 2);

    if (!in_array($menu, $allowed_menus)) {

      unset($options[$key]);

    }
@@ -150,7 +150,7 @@ function menu_admin_per_menu_field_widget_complete_form_alter(&$elements, FormSt 
  }



  // Hide the entity reference field from the frontend. When #access was used,

  // This also resetted the entity reference field value.

  // This also reset the entity reference field value.

  if ($access === FALSE) {

    $elements = [];

  }

src/Access/MenuAdminPerMenuAccess.php

+4 −4
Changes for src/Access/MenuAdminPerMenuAccess.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class MenuAdminPerMenuAccess implements MenuAdminPerMenuAccessInterface { 
    if ($account->hasPermission('administer menu')) {

      return AccessResult::allowed();

    }

    $permissions = $this::getPerMenuPermissions($account);

    $permissions = $this->getPerMenuPermissions($account);

    if ($account->hasPermission('administer menu') || $permissions) {

      return AccessResult::allowed();

    }
@@ -58,7 +58,7 @@ class MenuAdminPerMenuAccess implements MenuAdminPerMenuAccessInterface { 
   */

  public function menuAccess(AccountInterface $account, Menu $menu) {

    $permission = 'administer ' . $menu->get('id') . ' menu items';

    $permissions = $this::getPerMenuPermissions($account);

    $permissions = $this->getPerMenuPermissions($account);

    if ($account->hasPermission('administer menu')

      || isset($permissions[$permission])) {

      return AccessResult::allowed();
@@ -74,7 +74,7 @@ class MenuAdminPerMenuAccess implements MenuAdminPerMenuAccessInterface { 
      return AccessResult::neutral();

    }

    $permission = 'administer ' . $menu_link_content->getMenuName() . ' menu items';

    $permissions = $this::getPerMenuPermissions($account);

    $permissions = $this->getPerMenuPermissions($account);

    if ($account->hasPermission('administer menu')

      || isset($permissions[$permission])) {

      return AccessResult::allowed();
@@ -90,7 +90,7 @@ class MenuAdminPerMenuAccess implements MenuAdminPerMenuAccessInterface { 
      return AccessResult::neutral();

    }

    $permission = 'administer ' . $menu_link_plugin->getMenuName() . ' menu items';

    $permissions = $this::getPerMenuPermissions($account);

    $permissions = $this->getPerMenuPermissions($account);

    if ($account->hasPermission('administer menu')

      || isset($permissions[$permission])) {

      return AccessResult::allowed();