Update to Drupal 8.0.0 beta 14. For more information, see https://drupal.org/node/2544542

core/modules/menu_ui/menu_ui.module

@@ -415,7 +415,7 @@ function menu_ui_form_node_type_form_alter(&$form, FormStateInterface $form_stat
   );
   $options_cacheability->applyTo($form['menu']['menu_parent']);
 
-  $form['actions']['submit']['#validate'][] = 'menu_ui_form_node_type_form_validate';
+  $form['#validate'][] = 'menu_ui_form_node_type_form_validate';
   $form['#entity_builders'][] = 'menu_ui_form_node_type_form_builder';
 }
 

core/modules/menu_ui/menu_ui.permissions.yml

@@ -1,2 +0,0 @@
-administer menu:
-  title: 'Administer menus and menu items'

core/modules/menu_ui/migration_templates/d6_menu_settings.yml

@@ -0,0 +1,17 @@
+id: d6_menu_settings
+label: Drupal 6 menu configuration
+migration_tags:
+  - Drupal 6
+source:
+  plugin: variable
+  variables:
+    - menu_primary_links_source
+    - menu_secondary_links_source
+    - menu_override_parent_selector
+process:
+  main_links: menu_primary_links_source
+  secondary_links: menu_secondary_links_source
+  override_parent_selector: menu_override_parent_selector
+destination:
+  plugin: config
+  config_name: menu_ui.settings

core/modules/menu_ui/src/Controller/MenuController.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\menu_ui\Controller;
 
-use Drupal\Component\Utility\Xss;
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Menu\MenuParentFormSelectorInterface;
 use Drupal\system\MenuInterface;
@@ -77,7 +77,7 @@ class MenuController extends ControllerBase {
    *   The menu label.
    */
   public function menuTitle(MenuInterface $menu) {
-    return Xss::filter($menu->label());
+    return SafeMarkup::xssFilter($menu->label());
   }
 
 }

core/modules/menu_ui/src/MenuListBuilder.php

@@ -39,7 +39,7 @@ class MenuListBuilder extends ConfigEntityListBuilder {
       'data' => $this->getLabel($entity),
       'class' => array('menu-label'),
     );
-    $row['description'] = Xss::filterAdmin($entity->getDescription());
+    $row['description']['data'] = ['#markup' => $entity->getDescription()];
     return $row + parent::buildRow($entity);
   }
 

core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php

@@ -8,7 +8,7 @@
 namespace Drupal\menu_ui\Plugin\Menu\LocalAction;
 
 use Drupal\Core\Menu\LocalActionDefault;
-use Drupal\Core\Routing\RedirectDestination;
+use Drupal\Core\Routing\RedirectDestinationInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,7 +21,7 @@ class MenuLinkAdd extends LocalActionDefault {
   /**
    * The redirect destination.
    *
-   * @var \Drupal\Core\Routing\RedirectDestination
+   * @var \Drupal\Core\Routing\RedirectDestinationInterface
    */
   private $redirectDestination;
 
@@ -36,10 +36,10 @@ class MenuLinkAdd extends LocalActionDefault {
    *   The plugin implementation definition.
    * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
    *   The route provider to load routes by name.
-   * @param \Drupal\Core\Routing\RedirectDestination $redirect_destination
+   * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination
    *   The redirect destination.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, RedirectDestination $redirect_destination) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, RedirectDestinationInterface $redirect_destination) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $route_provider);
 
     $this->redirectDestination = $redirect_destination;

core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php

@@ -110,7 +110,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
     $this->verifyPageCache($url, 'MISS');
 
     // Verify a cache hit.
-    $this->verifyPageCache($url, 'HIT', ['config:block_list', 'rendered']);
+    $this->verifyPageCache($url, 'HIT', ['config:block_list', 'config:user.role.anonymous', 'rendered']);
   }
 
 }

core/modules/menu_ui/src/Tests/MenuTest.php

@@ -219,6 +219,7 @@ class MenuTest extends MenuWebTestBase {
 
     // Confirm that the custom menu block is available.
     $this->drupalGet('admin/structure/block/list/' . $this->config('system.theme')->get('default'));
+    $this->clickLinkPartialName('Place block');
     $this->assertText($label);
 
     // Enable the block.
@@ -532,6 +533,7 @@ class MenuTest extends MenuWebTestBase {
     // Make sure menu shows up with new name in block addition.
     $default_theme = $this->config('system.theme')->get('default');
     $this->drupalget('admin/structure/block/list/' . $default_theme);
+    $this->clickLinkPartialName('Place block');
     $this->assertText($edit['label']);
   }
 

core/modules/menu_ui/src/Tests/Migrate/d6/MigrateMenuConfigsTest.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_ui\Tests\Migrate\d6\MigrateMenuConfigsTest.
+ */
+
+namespace Drupal\menu_ui\Tests\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to menu_ui.settings.yml.
+ *
+ * @group menu_ui
+ */
+class MigrateMenuConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('menu_ui');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_menu_settings');
+  }
+
+  /**
+   * Tests migration of variables for the Menu UI module.
+   */
+  public function testMenuSettings() {
+    $config = $this->config('menu_ui.settings');
+    $this->assertIdentical(FALSE, $config->get('override_parent_selector'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'menu_ui.settings', $config->get());
+  }
+
+}