diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php index 5fec407..8fee2e2 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php @@ -21,7 +21,7 @@ class BlockLanguageCacheTest extends WebTestBase { * * @var array */ - public static $modules = array('block', 'language', 'menu'); + public static $modules = array('block', 'language', 'menu_ui'); /** * List of langcodes. diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php index 03ba59b..925d5c1 100644 --- a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php +++ b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationListUiTest.php @@ -30,7 +30,7 @@ class ConfigTranslationListUiTest extends WebTestBase { 'custom_block', 'field', 'field_ui', - 'menu', + 'menu_ui', 'node', 'shortcut', 'taxonomy', diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php index d7f8dd0..267cca7 100644 --- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php +++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php @@ -20,7 +20,7 @@ class ForumTest extends WebTestBase { * * @var array */ - public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu', 'help'); + public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu_ui', 'help'); /** * A user with various administrative privileges. diff --git a/core/modules/menu/config/schema/menu_ui.schema.yml b/core/modules/menu/config/schema/menu_ui.schema.yml index 5431b7b..d5dfd64 100644 --- a/core/modules/menu/config/schema/menu_ui.schema.yml +++ b/core/modules/menu/config/schema/menu_ui.schema.yml @@ -1,6 +1,6 @@ # Schema for configuration files of the Menu module. -menu.settings: +menu_ui.settings: type: mapping label: 'Menu settings' mapping: diff --git a/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuNodeTest.php b/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuNodeTest.php index ffef571..9c1c67e 100644 --- a/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuNodeTest.php +++ b/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuNodeTest.php @@ -19,7 +19,7 @@ class MenuNodeTest extends WebTestBase { * * @var array */ - public static $modules = array('menu', 'test_page_test', 'node'); + public static $modules = array('menu_ui', 'test_page_test', 'node'); public static function getInfo() { return array( diff --git a/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuUninstallTest.php b/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuUninstallTest.php index 8767600..ed92f28 100644 --- a/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuUninstallTest.php +++ b/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuUninstallTest.php @@ -19,7 +19,7 @@ class MenuUninstallTest extends WebTestBase { * * @var array */ - public static $modules = array('menu'); + public static $modules = array('menu_ui'); public static function getInfo() { return array( @@ -33,7 +33,7 @@ public static function getInfo() { * Tests Menu uninstall. */ public function testMenuUninstall() { - \Drupal::moduleHandler()->uninstall(array('menu')); + \Drupal::moduleHandler()->uninstall(array('menu_ui')); $this->assertTrue(entity_load('menu', 'admin', TRUE), 'The \'admin\' menu still exists after uninstalling menu module.'); } diff --git a/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuWebTestBase.php b/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuWebTestBase.php index 19909f1..a8dda4b 100644 --- a/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuWebTestBase.php +++ b/core/modules/menu/lib/Drupal/menu_ui/Tests/MenuWebTestBase.php @@ -19,7 +19,7 @@ class MenuWebTestBase extends WebTestBase { * * @var array */ - public static $modules = array('menu'); + public static $modules = array('menu_ui'); /** * Fetchs the menu item from the database and compares it to expected item. diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php index 36705d5..c7011c9 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php @@ -111,7 +111,7 @@ class MenuLink extends Entity implements \ArrayAccess, MenuLinkInterface { * * @var string */ - public $module = 'menu'; + public $module = 'menu_ui'; /** * A flag for whether the link should be rendered in menus. diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php index 85cc796..dd3d897 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php @@ -31,7 +31,7 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A case 'delete': // Only items created by the menu module can be deleted. - return $entity->module == 'menu' || $entity->updated == 1; + return $entity->module == 'menu_ui' || $entity->updated == 1; } } diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php index c07a213..083173f 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php @@ -98,7 +98,7 @@ public function form(array $form, array &$form_state) { if (isset($menu_link->options['fragment'])) { $path .= '#' . $menu_link->options['fragment']; } - if ($menu_link->module == 'menu') { + if ($menu_link->module == 'menu_ui') { $form['link_path'] = array( '#type' => 'textfield', '#title' => t('Path'), diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module index 0c513be..7dee7ae 100644 --- a/core/modules/menu_link/menu_link.module +++ b/core/modules/menu_link/menu_link.module @@ -14,7 +14,7 @@ function menu_link_help($path, $arg) { case 'admin/help#menu_link': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Menu Link module allows users to create menu links. It is required by the Menu module, which provides an interface for managing menus. See the Menu module help page for more information.', array('!menu-help' => \Drupal::url('help.page', array('name' => 'menu')))) . '

'; + $output .= '

' . t('The Menu Link module allows users to create menu links. It is required by the Menu module, which provides an interface for managing menus. See the Menu module help page for more information.', array('!menu-help' => \Drupal::url('help.page', array('name' => 'menu_ui')))) . '

'; return $output; } } diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php index ee96563..ef71619 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateMenuConfigsTest.php @@ -21,7 +21,7 @@ class MigrateMenuConfigsTest extends MigrateDrupalTestBase { * * @var array */ - public static $modules = array('menu'); + public static $modules = array('menu_ui'); /** * {@inheritdoc} diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php index 082a6a7..1b1956d 100644 --- a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php +++ b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php @@ -53,7 +53,7 @@ class ToolbarAdminMenuTest extends WebTestBase { * * @var array */ - public static $modules = array('node', 'block', 'menu', 'user', 'taxonomy', 'toolbar', 'language', 'test_page_test', 'locale'); + public static $modules = array('node', 'block', 'menu_ui', 'user', 'taxonomy', 'toolbar', 'language', 'test_page_test', 'locale'); public static function getInfo() { return array( diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php index bbe5a71..706db7a 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php @@ -19,7 +19,7 @@ class UserAccountLinksTests extends WebTestBase { * * @var array */ - public static $modules = array('menu', 'block', 'test_page_test'); + public static $modules = array('menu_ui', 'block', 'test_page_test'); public static function getInfo() { return array( diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php index 31b1ff2..8435589 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php @@ -59,7 +59,7 @@ public function testDeleteWithNoPath() { * Tests the menu and tab option form. */ public function testMenuOptions() { - $this->container->get('module_handler')->install(array('menu')); + $this->container->get('module_handler')->install(array('menu_ui')); $this->drupalGet('admin/structure/views/view/test_view'); // Add a new page display.