Add support for Drupal 10

district09 · Jun 9, 2023 · 70af50f · 70af50f
1 parent 5861a0a
commit 70af50f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All Notable changes to **Digipolis DG Cookiebot** module.
 
+## [1.3.0]
+
+### Added
+
+* Add support for Drupal 10.
+
+## [1.2.0]
+
+### Added
+
+* Add support for phpunit 9.
+
 ## [1.0.1]
 
 ### Fixed
@@ -28,6 +40,8 @@ All Notable changes to **Digipolis DG Cookiebot** module.
 * CCM-30: Added the proper data-cookieconsent level to video_embed_field when
   the privacy option is enabled.
 
+[1.3.0]: https://github.com/digipolisgent/drupal_module_dg-cookiebot/compare/1.2.0...1.3.0
+[1.2.0]: https://github.com/digipolisgent/drupal_module_dg-cookiebot/compare/1.1.0...1.2.0
 [1.0.1]: https://github.com/digipolisgent/drupal_module_dg-cookiebot/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/digipolisgent/drupal_module_dg-cookiebot/compare/1.0.0-alpha2...1.0.0
 [1.0.0-alpha2]: https://github.com/digipolisgent/drupal_module_dg-cookiebot/compare/1.0.0-alpha1...1.0.0-alpha2

diff --git a/composer.json b/composer.json
@@ -21,12 +21,12 @@
         "source": "https://github.com/digipolisgent/drupal_module_dg-cookiebot"
     },
     "require": {
-        "php": "^7.3 || ^8.1",
+        "php": "^8.1",
         "drupal/cookiebot": "^1.0@alpha",
-        "drupal/core": "^8.8 || ^9.0"
+        "drupal/core": "^9.4 || ^10.0"
     },
     "require-dev": {
-        "digipolisgent/qa-drupal": "^1.4"
+        "digipolisgent/qa-drupal": "^2.0"
     },
     "repositories": {
         "drupal": {

diff --git a/dg_cookiebot.info.yml b/dg_cookiebot.info.yml
@@ -4,9 +4,8 @@ description: 'Provides extra functionality on top of the Cookiebot module.'
 package: Digipolis
 configure: dg_cookiebot.config
 
-core: 8.x
-core_version_requirement: ^8 || ^9
-php: 7.2
+core_version_requirement: ^9.4 || ^10
+php: 8.1
 
 dependencies:
   - cookiebot:cookiebot

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -132,7 +132,7 @@ function drupal_phpunit_populate_class_loader() {
 
 // Ensure we have the correct PHPUnit version for the version of PHP.
 if (class_exists('\PHPUnit_Runner_Version')) {
-  $phpunit_version = \PHPUnit_Runner_Version::id();
+  $phpunit_version = \PHPUnit\Runner\Version::id();
 }
 else {
   $phpunit_version = Version::id();

diff --git a/tests/src/Unit/Plugin/Filter/CookiebotDeclarationFilterTest.php b/tests/src/Unit/Plugin/Filter/CookiebotDeclarationFilterTest.php
@@ -12,6 +12,7 @@
 use Drupal\dg_cookiebot\Plugin\Filter\CookiebotDeclarationFilter;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -21,6 +22,8 @@
  */
 class CookiebotDeclarationFilterTest extends UnitTestCase {
 
+  use ProphecyTrait;
+
   /**
    * Proper dependencies are injected.
    *