Merge branch '3487617-drupal-11-testing' into '2.0.x'

Resolve #3487617 "Drupal 11 testing"

See merge request !7

.gitlab-ci.yml

@@ -30,6 +30,7 @@ include:
 variables:
    SKIP_PHPCS: '1'
    SKIP_PHPSTAN: '1'
+   OPT_IN_TEST_PREVIOUS_MAJOR: '1'
 phpunit:
   extends: .phpunit-base
   services:

src/Form/WorkbenchMenuAccessMenuForm.php

@@ -4,6 +4,7 @@ namespace Drupal\workbench_menu_access\Form;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -29,11 +30,13 @@ class WorkbenchMenuAccessMenuForm extends ConfigFormBase {
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
+   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typedConfigManager
+   *   The typed config manager.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($config_factory, $typed_config);
     $this->entityTypeManager = $entity_type_manager;
   }
 
@@ -49,6 +52,7 @@ class WorkbenchMenuAccessMenuForm extends ConfigFormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get('entity_type.manager'),
     );
   }

src/Form/WorkbenchMenuAccessSettingsForm.php

@@ -3,6 +3,7 @@
 namespace Drupal\workbench_menu_access\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -26,11 +27,13 @@ class WorkbenchMenuAccessSettingsForm extends ConfigFormBase {
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
+   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typedConfigManager
+   *   The typed config manager.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($config_factory, $typed_config);
     $this->entityTypeManager = $entity_type_manager;
   }
 
@@ -46,6 +49,7 @@ class WorkbenchMenuAccessSettingsForm extends ConfigFormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get('entity_type.manager'),
     );
   }

workbench_menu_access.info.yml

 name: Workbench Menu Access
 type: module
 description: Adds Workbench Access controls to menus.
-core_version_requirement: ^9.1 || ^10
+core_version_requirement: ^10 || ^11
 configure: workbench_menu_access.admin
 package: Workbench
 dependencies:
   - workbench_access:workbench_access
 test_dependencies:
-  - workbench_access:workbench_access
\ No newline at end of file
+  - workbench_access:workbench_access