From 24dcecf99ea4c356b98240015db3d8839656ca6c Mon Sep 17 00:00:00 2001
From: Stephen Mustgrave <38930-smustgrave@users.noreply.drupalcode.org>
Date: Thu, 15 Aug 2024 21:18:27 +0000
Subject: [PATCH] Resolve #3465087 "D11 support"
---
.gitlab-ci.yml | 2 +-
composer.json | 12 ++++++------
modules/ajax_quiz/ajax_quiz.info.yml | 2 +-
modules/quiz_directions/quiz_directions.info.yml | 2 +-
modules/quiz_long_answer/quiz_long_answer.info.yml | 2 +-
modules/quiz_matching/quiz_matching.info.yml | 2 +-
modules/quiz_multichoice/quiz_multichoice.info.yml | 2 +-
modules/quiz_page/quiz_page.info.yml | 2 +-
modules/quiz_short_answer/quiz_short_answer.info.yml | 2 +-
modules/quiz_truefalse/quiz_truefalse.info.yml | 2 +-
quiz.info.yml | 2 +-
src/Form/QuizAdminForm.php | 7 ++++---
tests/modules/quiz_test/quiz_test.info.yml | 2 +-
13 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9999f173..8012820a 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 d49fc001..5692b793 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 e7e90b8d..71feaffa 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 8ce53e7b..07de7f53 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 3f7bea82..7698a3b6 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 4f64a42d..089c9dcc 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 8ae700a0..7a1f7178 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 5bc1a741..cc435bea 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 e3cc49db..fbe580a8 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 c9d17ff1..80502228 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 63a9664b..7209c0cf 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 54e37e22..5e042833 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 abe663a9..cfaa18ea 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
--
GitLab