Some fixes for Drupal 11.0.x compatibility

.gitignore

@@ -16,4 +16,5 @@ tagfile
 /tests/reports
 /web
 .phpunit.result.cache
+.phpunit.cache
 docs/build

composer.json

@@ -27,13 +27,13 @@
         "getdkan/pdlt": "^0.1.7",
         "getdkan/procrastinator": "^5.0.3",
         "getdkan/rooted-json-data": "^0.2.2",
-        "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
+        "guzzlehttp/guzzle": "^6.5.8 || ^7",
         "ilbee/csv-response": "^1.2.0",
         "justinrainbow/json-schema": "^5.2",
         "m1x0n/opis-json-schema-error-presenter": "^0.5.3",
-        "npm-asset/select2": "^4.0",
+        "npm-asset/select2": "^4.0 || dev-develop",
         "oomphinc/composer-installers-extender": "^2.0",
-        "ramsey/uuid": "^3.8.0",
+        "ramsey/uuid": "^3.8.0 || ^4",
         "stolt/json-merge-patch": "^2.0",
         "symfony/polyfill-php80": "^1.27"
     },

dkan.info.yml

@@ -1,7 +1,7 @@
 name: DKAN
 description: 'DKAN Open Data Portal'
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 package: DKAN
 dependencies:
   - dkan:metastore

modules/common/common.info.yml

@@ -1,5 +1,5 @@
 name: Common
 description: Provides common utilities, functions, and base api endpoints used by other DKAN modules.
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 package: DKAN

modules/common/tests/src/Unit/Connection.php

@@ -27,6 +27,10 @@ class Connection extends CoreConnection {
    */
   protected $statementClass;
 
+  public function upsert($table, array $options = []) { }
+
+  public function schema() { }
+
   /**
    * {@inheritdoc}
    */

modules/common/tests/src/Unit/Events/EventTest.php

@@ -4,10 +4,10 @@
 
 use Drupal\common\EventDispatcherTrait;
 use Drupal\common\Events\Event;
-use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use MockChain\Chain;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class EventTest extends TestCase
 {
@@ -19,7 +19,7 @@ public function testDataIntegrityAcrossEventSubscribers() {
       ->add(Container::class)
       ->getMock();
 
-    $dispatcher = new ContainerAwareEventDispatcher($containerx);
+    $dispatcher = new EventDispatcher($containerx);
     $dispatcher->addListener('test_event', function(Event $event) {
       $event->setData(1);
     });

modules/common/tests/src/Unit/Storage/QueryDataProvider.php

@@ -24,7 +24,7 @@ class QueryDataProvider {
   /**
    *
    */
-  public function getAllData($return): array {
+  public static function getAllData(): array {
     $tests = [
       'noPropertiesQuery',
       'propertiesQuery',

modules/data_dictionary_widget/data_dictionary_widget.info.yml

@@ -2,7 +2,7 @@ name: 'Data Dictionary Widget'
 description: 'Provides a field widget to generate a data-dictionary form'
 package: DKAN
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^9.4 || ^10 || ^11
 dependencies:
   - drupal:field
   - metastore

modules/datastore/datastore.info.yml

@@ -1,7 +1,7 @@
 name: Datastore
 description: Provides integration with the datastore library.
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 package: DKAN
 dependencies:
   - dkan:common

modules/datastore/modules/datastore_mysql_import/datastore_mysql_import.info.yml

@@ -1,7 +1,7 @@
 name: Datastore MySQL Import
 description: Provides a MySQL Importer class.
 type: module
-core_version_requirement: ^10
+core_version_requirement: ^10 || ^11
 package: DKAN
 configure: datastore.mysql_import.settings
 dependencies: