From e68df237553cf6d9ecbd92d28d7b9c9416e7483e Mon Sep 17 00:00:00 2001
From: lucashedding <lucashedding@1463982.no-reply.drupal.org>
Date: Tue, 22 Feb 2022 07:38:08 -0600
Subject: [PATCH] Issue #3265865 by heddn: Support Drupal 10
---
composer.json | 4 ++--
migrate_source_csv.info.yml | 3 +--
.../csv_source_yield_test/csv_source_yield_test.info.yml | 2 --
.../migrate_source_csv_test/migrate_source_csv_test.info.yml | 2 --
.../migrate_source_csv_test/migrate_source_csv_test.module | 3 ++-
tests/src/Kernel/Plugin/migrate/source/CSVTest.php | 2 +-
6 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/composer.json b/composer.json
index dc706ef..0b7d4fa 100644
--- a/composer.json
+++ b/composer.json
@@ -22,10 +22,10 @@
},
"require": {
"php": ">=7.1",
- "drupal/core": "^8.7 || ^9.0",
+ "drupal/core": ">=9.1",
"league/csv": "^9.1"
},
"require-dev": {
- "drupal/migrate_plus": "5.x-dev"
+ "drupal/migrate_plus": ">=5.0"
}
}
diff --git a/migrate_source_csv.info.yml b/migrate_source_csv.info.yml
index 9502e98..b6ebead 100644
--- a/migrate_source_csv.info.yml
+++ b/migrate_source_csv.info.yml
@@ -2,8 +2,7 @@ type: module
name: Migrate Source CSV
description: 'CSV source migration.'
package: Migration
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: '>=9.1'
dependencies:
- drupal:migrate
test_dependencies:
diff --git a/tests/modules/csv_source_yield_test/csv_source_yield_test.info.yml b/tests/modules/csv_source_yield_test/csv_source_yield_test.info.yml
index 4115c28..9b0e094 100644
--- a/tests/modules/csv_source_yield_test/csv_source_yield_test.info.yml
+++ b/tests/modules/csv_source_yield_test/csv_source_yield_test.info.yml
@@ -1,7 +1,5 @@
name: Source plugin using yield
type: module
package: Testing
-core: 8.x
-core_version_requirement: ^8 || ^9
dependencies:
- drupal:migrate
diff --git a/tests/modules/migrate_source_csv_test/migrate_source_csv_test.info.yml b/tests/modules/migrate_source_csv_test/migrate_source_csv_test.info.yml
index 87a4c63..2395b95 100644
--- a/tests/modules/migrate_source_csv_test/migrate_source_csv_test.info.yml
+++ b/tests/modules/migrate_source_csv_test/migrate_source_csv_test.info.yml
@@ -1,8 +1,6 @@
name: Migrate Source CSV Test
type: module
package: Testing
-core: 8.x
-core_version_requirement: ^8 || ^9
dependencies:
- drupal:migrate
- migrate_source_csv:migrate_source_csv
diff --git a/tests/modules/migrate_source_csv_test/migrate_source_csv_test.module b/tests/modules/migrate_source_csv_test/migrate_source_csv_test.module
index aa7441e..4a87175 100644
--- a/tests/modules/migrate_source_csv_test/migrate_source_csv_test.module
+++ b/tests/modules/migrate_source_csv_test/migrate_source_csv_test.module
@@ -9,5 +9,6 @@
* Implements hook_migration_plugins_alter().
*/
function migrate_source_csv_test_migration_plugins_alter(&$definitions) {
- $definitions['migrate_csv_test']['source']['path'] = drupal_get_path('module', 'migrate_source_csv_test') . $definitions['migrate_csv_test']['source']['path'];
+ $path = \Drupal::service('extension.list.module')->getPath('migrate_source_csv_test');
+ $definitions['migrate_csv_test']['source']['path'] = $path . $definitions['migrate_csv_test']['source']['path'];
}
diff --git a/tests/src/Kernel/Plugin/migrate/source/CSVTest.php b/tests/src/Kernel/Plugin/migrate/source/CSVTest.php
index 03ae607..941e56b 100644
--- a/tests/src/Kernel/Plugin/migrate/source/CSVTest.php
+++ b/tests/src/Kernel/Plugin/migrate/source/CSVTest.php
@@ -15,7 +15,7 @@ class CSVTest extends MigrateTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = [
+ protected static $modules = [
'system',
'field',
'user',
--
GitLab