diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9999f173a8186c30befd9ec854d7dc7bbf6cb9f9..8012820a36f35d4063a3f8b5066f64b93665534b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ variables: # SKIP_ESLINT: '1' # OPT_IN_TEST_PREVIOUS_MINOR: '1' OPT_IN_TEST_NEXT_MINOR: '1' - # OPT_IN_TEST_NEXT_MAJOR: '1' + OPT_IN_TEST_NEXT_MAJOR: '1' ################################################################################### diff --git a/composer.json b/composer.json index d49fc0014ddd764fcc927ebbb126ddb82d9857cd..5692b79326dee400d8a440978d37cbbb0d26a951 100644 --- a/composer.json +++ b/composer.json @@ -15,13 +15,13 @@ }, "minimum-stability": "dev", "require": { - "drupal/core": "^10.3", - "drupal/field_group": "^3.1", - "drupal/entity": "^1.2", - "drupal/paragraphs": "^1.15", - "drupal/range": "^1.3", + "drupal/core": "^10.3 || ^11", + "drupal/field_group": "^3.6", + "drupal/entity": "^1.5", + "drupal/paragraphs": "^1.18", + "drupal/range": "^1.6", "drupal/rules": "^4.0", - "drupal/views_bulk_operations": "^4.0" + "drupal/views_bulk_operations": "^4.2" }, "require-dev": { "drupal/replicate": "^1.3" diff --git a/modules/ajax_quiz/ajax_quiz.info.yml b/modules/ajax_quiz/ajax_quiz.info.yml index e7e90b8d785bffe335d978dc4f3c213da5a62025..71feaffaca7d5b1a54173cf68c3a7f2dddaf52b4 100644 --- a/modules/ajax_quiz/ajax_quiz.info.yml +++ b/modules/ajax_quiz/ajax_quiz.info.yml @@ -2,6 +2,6 @@ name: 'AJAX Quiz' description: "This module doesn't degrade gracefully, and we don't recommend using it until it does. This module attempts to provide an AJAX version of quiz. Successive quiz questions will be loaded in the same page without page reload, but it doesn't work flawlessly at the moment." package: Quiz addon type: module -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 dependencies: - quiz:quiz diff --git a/modules/quiz_directions/quiz_directions.info.yml b/modules/quiz_directions/quiz_directions.info.yml index 8ce53e7b988207312b9394a994d17aee9019c49a..07de7f53223e96345588629f39e2c554c375226d 100644 --- a/modules/quiz_directions/quiz_directions.info.yml +++ b/modules/quiz_directions/quiz_directions.info.yml @@ -2,6 +2,6 @@ name: 'Quiz - Directions' type: module package: Quiz core description: 'Provide a slot to add directions for a quiz or some sub-portion of a quiz.' -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 dependencies: - quiz:quiz diff --git a/modules/quiz_long_answer/quiz_long_answer.info.yml b/modules/quiz_long_answer/quiz_long_answer.info.yml index 3f7bea82abcbeb2756883c34359665c7dfe9514d..7698a3b618b589753824137bbe27e0ef704e2d09 100644 --- a/modules/quiz_long_answer/quiz_long_answer.info.yml +++ b/modules/quiz_long_answer/quiz_long_answer.info.yml @@ -4,4 +4,4 @@ package: Quiz question description: 'This provides long answer (essay, multi-paragraph) question types for use by the Quiz module.' dependencies: - quiz:quiz -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 diff --git a/modules/quiz_matching/quiz_matching.info.yml b/modules/quiz_matching/quiz_matching.info.yml index 4f64a42dd76b3c493ab2e5fdcd790b99c94f5e0a..089c9dcc57f146f58e797fd7d262ad778aa07111 100644 --- a/modules/quiz_matching/quiz_matching.info.yml +++ b/modules/quiz_matching/quiz_matching.info.yml @@ -1,7 +1,7 @@ name: 'Quiz - Matching question' package: Quiz question description: 'Provide a way to create matching type of questions.' -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 type: module dependencies: - paragraphs:paragraphs diff --git a/modules/quiz_multichoice/quiz_multichoice.info.yml b/modules/quiz_multichoice/quiz_multichoice.info.yml index 8ae700a0309c9830d14d28c7697d5d000ec8ce60..7a1f71780e5d9fde73d6127d786c55247844e9d2 100644 --- a/modules/quiz_multichoice/quiz_multichoice.info.yml +++ b/modules/quiz_multichoice/quiz_multichoice.info.yml @@ -2,7 +2,7 @@ name: 'Quiz - Multichoice' package: Quiz question type: module description: 'Multiple choice question type for quiz.' -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 dependencies: - quiz:quiz - field_group:field_group diff --git a/modules/quiz_page/quiz_page.info.yml b/modules/quiz_page/quiz_page.info.yml index 5bc1a7418cea91afceaded538203dd2d80cd579e..cc435beac7786ce60fec6fd0a8b89887f5085079 100644 --- a/modules/quiz_page/quiz_page.info.yml +++ b/modules/quiz_page/quiz_page.info.yml @@ -2,6 +2,6 @@ name: 'Quiz - Pages' type: module package: Quiz core description: 'Provides support for pages of questions.' -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 dependencies: - quiz:quiz diff --git a/modules/quiz_short_answer/quiz_short_answer.info.yml b/modules/quiz_short_answer/quiz_short_answer.info.yml index e3cc49db75e52bf4c52aeb7629e9645403c01f30..fbe580a88abb44f2c17bfb82cae459d1f93e96b6 100644 --- a/modules/quiz_short_answer/quiz_short_answer.info.yml +++ b/modules/quiz_short_answer/quiz_short_answer.info.yml @@ -1,7 +1,7 @@ name: 'Quiz - Short answer' package: Quiz question description: 'Short answer question type for Quiz.' -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 type: module dependencies: - quiz:quiz diff --git a/modules/quiz_truefalse/quiz_truefalse.info.yml b/modules/quiz_truefalse/quiz_truefalse.info.yml index c9d17ff1c6f88315e3e1d7176345e91d3922bfa3..805022288342fb0a0aa71f8602b8ddbc5d224b29 100644 --- a/modules/quiz_truefalse/quiz_truefalse.info.yml +++ b/modules/quiz_truefalse/quiz_truefalse.info.yml @@ -2,6 +2,6 @@ name: 'Quiz - True false' type: module package: Quiz question description: 'Module to create True or False Kind of Questions' -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 dependencies: - quiz:quiz diff --git a/quiz.info.yml b/quiz.info.yml index 63a9664b4cca2f619b443bcc76e3b88e96b8e06d..7209c0cf89899e248f847226ced988278adc105d 100644 --- a/quiz.info.yml +++ b/quiz.info.yml @@ -2,7 +2,7 @@ name: Quiz type: module package: Quiz core description: Create interactive quizzes. This module must have at least one question type module enabled in order to function properly. -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 dependencies: - drupal:datetime - drupal:datetime_range diff --git a/src/Form/QuizAdminForm.php b/src/Form/QuizAdminForm.php index 54e37e22048fb31a924e37d12e61b98f4db82406..5e04283367676e11731f219a139393c0ff828ebc 100644 --- a/src/Form/QuizAdminForm.php +++ b/src/Form/QuizAdminForm.php @@ -3,6 +3,7 @@ namespace Drupal\quiz\Form; use Drupal\Core\Config\ConfigFactoryInterface; +use Drupal\Core\Config\TypedConfigManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; @@ -23,15 +24,15 @@ class QuizAdminForm extends ConfigFormBase { * The factory for configuration objects. * @param \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler * The Module handler service. - * @param \Drupal\Core\Config\TypedConfigManagerInterface|null $typedConfigManager + * @param \Drupal\Core\Config\TypedConfigManagerInterface $typedConfigManager * The typed config manager. */ public function __construct( ConfigFactoryInterface $config_factory, protected ModuleHandlerInterface $moduleHandler, - protected $typedConfigManager = NULL, + TypedConfigManagerInterface $typedConfigManager, ) { - parent::__construct($config_factory, $this->typedConfigManager); + parent::__construct($config_factory, $typedConfigManager); } /** diff --git a/tests/modules/quiz_test/quiz_test.info.yml b/tests/modules/quiz_test/quiz_test.info.yml index abe663a9ed327b1d2633ce96e0a1f932d0c0ad9d..cfaa18eaa996377de7d2899ff8e6812d317bd2c3 100644 --- a/tests/modules/quiz_test/quiz_test.info.yml +++ b/tests/modules/quiz_test/quiz_test.info.yml @@ -1,6 +1,6 @@ name: quiz test module type: module -core_version_requirement: ^10.3 +core_version_requirement: ^10.3 || ^11 dependencies: - quiz:quiz - drupal:views