Issue #3474908 by japerry, hswong3i: Remove the now defunct menu items for Drupal 11 sites

.gitlab-ci.yml

@@ -12,7 +12,8 @@
 # To test a Drupal 7 project, change the first include filename from .main.yml to .main-d7.yml
 include:
   - project: $_GITLAB_TEMPLATES_REPO
-    ref: $_GITLAB_TEMPLATES_REF
+    # Keep reference on 1.5.10 to support testing against actual current versions of Drupal.
+    ref: "1.5.10"
     file:
       - "/includes/include.drupalci.main.yml"
       - "/includes/include.drupalci.variables.yml"

admin_toolbar.module

@@ -5,10 +5,10 @@
  * This is the module to create a drop-down menu for the core toolbar.
  */
 
-use Drupal\admin_toolbar\Render\Element\AdminToolbar;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
+use Drupal\admin_toolbar\Render\Element\AdminToolbar;
 
 /**
  * Implements hook_toolbar_alter().

admin_toolbar_search/src/Controller/AdminToolbarSearchController.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\admin_toolbar_search\Controller;
 
-use Drupal\admin_toolbar_search\SearchLinks;
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\admin_toolbar_search\SearchLinks;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 

admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarToolsSearchTest.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\admin_toolbar_search\FunctionalJavascript;
 
-use Drupal\media\Entity\MediaType;
 use Drupal\Tests\media\Traits\MediaTypeCreationTrait;
+use Drupal\media\Entity\MediaType;
 
 /**
  * Test the functionality of admin toolbar search.

admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php

@@ -486,21 +486,25 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface {
 
     // If module Update Manager is enabled.
     if ($this->moduleHandler->moduleExists('update')) {
-      $links['update.module_install'] = [
-        'title' => $this->t('Install new module'),
-        'route_name' => 'update.module_install',
-        'parent' => 'system.modules_list',
-      ] + $base_plugin_definition;
+      if (version_compare(\Drupal::VERSION, '11.0.0', '<')) {
+        $links['update.module_install'] = [
+          'title' => $this->t('Install new module'),
+          'route_name' => 'update.module_install',
+          'parent' => 'system.modules_list',
+        ] + $base_plugin_definition;
+      }
       $links['update.module_update'] = [
         'title' => $this->t('Update'),
         'route_name' => 'update.module_update',
         'parent' => 'system.modules_list',
       ] + $base_plugin_definition;
-      $links['update.theme_install'] = [
-        'title' => $this->t('Install new theme'),
-        'route_name' => 'update.theme_install',
-        'parent' => 'system.themes_page',
-      ] + $base_plugin_definition;
+      if (version_compare(\Drupal::VERSION, '11.0.0', '<')) {
+        $links['update.theme_install'] = [
+          'title' => $this->t('Install new theme'),
+          'route_name' => 'update.theme_install',
+          'parent' => 'system.themes_page',
+        ] + $base_plugin_definition;
+      }
       $links['update.theme_update'] = [
         'title' => $this->t('Update'),
         'route_name' => 'update.theme_update',

tests/src/Functional/AdminToolbarToolsSortTest.php

@@ -2,9 +2,9 @@
 
 namespace Drupal\Tests\admin_toolbar\Functional;
 
+use Drupal\Tests\BrowserTestBase;
 use Drupal\media\Entity\MediaType;
 use Drupal\system\Entity\Menu;
-use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests Admin Toolbar tools functionality.