Skip to content
Snippets Groups Projects
Commit 1e3562ae authored by Sandeep Reddy's avatar Sandeep Reddy
Browse files

Issue #3297636: Automated Drupal 10 compatibility fixes

parent 035c4885
No related branches found
No related tags found
1 merge request!8Issue #3297636: Automated Drupal 10 compatibility fixes
......@@ -3,5 +3,5 @@ type: module
description: 'This module exports and imports menus and menu links.'
package: Development
core: 8.x
core_version_requirement: ^8 || ^9
core_version_requirement: ^8 || ^9 || ^10
#configure: maintenance_notifications.form
......@@ -34,7 +34,7 @@ class MenuExportConfigurationForm extends ConfigFormBase {
*/
public function buildForm(array $form, FormStateInterface $form_state) {
$config = $this->config('menu_export.settings');
$menuIds = \Drupal::entityQuery('menu')->execute();
$menuIds = \Drupal::entityQuery('menu')->accessCheck(FALSE)->execute();
$menuEntities = Menu::loadMultiple($menuIds);
foreach ($menuEntities as $menu) {
$menuNames[$menu->id()] = $menu->label();
......@@ -84,6 +84,7 @@ class MenuExportConfigurationForm extends ConfigFormBase {
}
foreach ($menus as $menu) {
$menuLinkIds = \Drupal::entityQuery('menu_link_content')
->accessCheck(FALSE)
->condition('menu_name', $menu)
->execute();
$menuLinks = MenuLinkContent::loadMultiple($menuLinkIds);
......
......@@ -79,6 +79,7 @@ class MenuExportForm extends ConfigFormBase {
$config->delete()->save();
foreach($menus as $menu){
$menuLinkIds = \Drupal::entityQuery('menu_link_content')
->accessCheck(FALSE)
->condition('menu_name',$menu)
->execute();
$menuLinks = MenuLinkContent::loadMultiple($menuLinkIds);
......
......@@ -75,6 +75,7 @@ public function submitForm(array &$form, FormStateInterface $form_state)
unset($menu['id']);
unset($menu['revision_id']);
$menuLinkEntity = \Drupal::entityQuery('menu_link_content')
->accessCheck(FALSE)
->condition('uuid', $menu['uuid'])
->execute();
if (!$menuLinkEntity) {
......
......@@ -10,7 +10,12 @@ use Drupal\Tests\BrowserTestBase;
*/
class MenuExportConfigurationFormTest extends BrowserTestBase {
public static $modules = ['menu_export'];
protected static $modules = ['menu_export'];
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
public function testFormLoad(){
$user = $this->drupalCreateUser();
......@@ -25,8 +30,8 @@ class MenuExportConfigurationFormTest extends BrowserTestBase {
$this->assertSession()->statusCodeEquals(403);
$user = $this->drupalCreateUser(['export and import menu links']);
$this->drupalLogin($user);
$this->drupalGet("/admin/config/development/menu_export");
$this->drupalLogin($user);
$this->drupalGet("/admin/config/development/menu_export");
$this->assertSession()->statusCodeEquals(200);
$this->drupalGet("/admin/config/development/menu_export/import");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment