Issue #3363604: Add Drupal 11 support

admin_toolbar.info.yml

@@ -3,6 +3,6 @@ description: Provides an improved drop-down menu interface to the site Toolbar.
 package: Administration
 type: module
 configure: admin_toolbar.settings
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10 || ^11
 dependencies:
   - drupal:toolbar

admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml

@@ -2,6 +2,6 @@ name: Admin Toolbar Links Access Filter
 description: Provides a workaround for the common problem that users with 'Use the administration pages and help' permission see menu links they don't have access permission for. Once the issue <a href='https://www.drupal.org/node/296693'>https://www.drupal.org/node/296693</a> be solved, this module will be deprecated.
 package: Administration
 type: module
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10
 dependencies:
   - admin_toolbar:admin_toolbar

admin_toolbar_search/admin_toolbar_search.info.yml

@@ -2,7 +2,7 @@ name: Admin Toolbar Search
 description: Provides search of Admin Toolbar items.
 package: Administration
 type: module
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10 || ^11
 configure: admin_toolbar_search.settings
 dependencies:
   - admin_toolbar:admin_toolbar_tools

admin_toolbar_search/src/SearchLinks.php

@@ -120,7 +120,7 @@ class SearchLinks {
       $content_entity = $entities['content_entity'];
       // Load the remaining items that were not loaded by the toolbar.
       $content_entity_bundle_storage = $this->entityTypeManager->getStorage($content_entity_bundle);
-      $bundles_ids = $content_entity_bundle_storage->getQuery()->sort('weight')->range($max_bundle_number)->execute();
+      $bundles_ids = $content_entity_bundle_storage->getQuery()->accessCheck()->sort('weight')->range($max_bundle_number)->execute();
       if (!empty($bundles_ids)) {
         $bundles = $this->entityTypeManager
           ->getStorage($content_entity_bundle)

admin_toolbar_tools/admin_toolbar_tools.info.yml

@@ -3,6 +3,6 @@ description: Adds menu links like Flush cache, Run cron, Run updates, and Logout
 package: Administration
 configure: admin_toolbar_tools.settings
 type: module
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10 || ^11
 dependencies:
   - admin_toolbar:admin_toolbar

admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php

@@ -30,31 +30,14 @@ class AdminToolbarToolsSettingsForm extends ConfigFormBase {
    */
   protected $menuLinkManager;
 
-  /**
-   * AdminToolbarToolsSettingsForm constructor.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
-   *   The factory for configuration objects.
-   * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menuLinkManager
-   *   A menu link manager instance.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cacheMenu
-   *   A cache menu instance.
-   */
-  public function __construct(ConfigFactoryInterface $configFactory, MenuLinkManagerInterface $menuLinkManager, CacheBackendInterface $cacheMenu) {
-    parent::__construct($configFactory);
-    $this->cacheMenu = $cacheMenu;
-    $this->menuLinkManager = $menuLinkManager;
-  }
-
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('plugin.manager.menu.link'),
-      $container->get('cache.menu')
-    );
+    $instance = parent::create($container);
+    $instance->cacheMenu = $container->get('plugin.manager.menu.link');
+    $instance->menuLinkManager = $container->get('cache.menu');
+    return $instance;
   }
 
   /**

admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php

@@ -111,7 +111,7 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface {
       $content_entity_bundle = $entities['content_entity_bundle'];
       $content_entity = $entities['content_entity'];
       $content_entity_bundle_storage = $this->entityTypeManager->getStorage($content_entity_bundle);
-      $bundles_ids = $content_entity_bundle_storage->getQuery()->sort('weight')->pager($max_bundle_number)->execute();
+      $bundles_ids = $content_entity_bundle_storage->getQuery()->accessCheck()->sort('weight')->pager($max_bundle_number)->execute();
       $bundles = $this->entityTypeManager->getStorage($content_entity_bundle)->loadMultiple($bundles_ids);
       if (count($bundles) == $max_bundle_number && $this->routeExists('entity.' . $content_entity_bundle . '.collection')) {
         $links[$content_entity_bundle . '.collection'] = [

js/jquery.hoverIntent.js

@@ -92,10 +92,10 @@
     var cfg = $.extend({}, _cfg);
     if ( $.isPlainObject(handlerIn) ) {
       cfg = $.extend(cfg, handlerIn);
-      if ( !$.isFunction(cfg.out) ) {
+      if (!typeof cfg.out === 'function') {
         cfg.out = cfg.over;
       }
-    } else if ( $.isFunction(handlerOut) ) {
+    } else if (typeof handlerOut === 'function') {
       cfg = $.extend(cfg, { over: handlerIn, out: handlerOut, selector: selector } );
     } else {
       cfg = $.extend(cfg, { over: handlerIn, out: handlerIn, selector: handlerOut } );

src/Form/AdminToolbarSettingsForm.php

@@ -30,31 +30,14 @@ class AdminToolbarSettingsForm extends ConfigFormBase {
    */
   protected $menuLinkManager;
 
-  /**
-   * AdminToolbarSettingsForm constructor.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory for the form.
-   * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menuLinkManager
-   *   A menu link manager instance.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cacheMenu
-   *   A cache menu instance.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, MenuLinkManagerInterface $menuLinkManager, CacheBackendInterface $cacheMenu) {
-    parent::__construct($config_factory);
-    $this->cacheMenu = $cacheMenu;
-    $this->menuLinkManager = $menuLinkManager;
-  }
-
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('plugin.manager.menu.link'),
-      $container->get('cache.menu')
-    );
+    $instance = parent::create($container);
+    $instance->cacheMenu = $container->get('plugin.manager.menu.link');
+    $instance->menuLinkManager = $container->get('cache.menu');
+    return $instance;
   }
 
   /**