From 31fdfafe7f3582e80c22897c3c02aa3508455e77 Mon Sep 17 00:00:00 2001
From: HongPong <hongpong@hongpong.com>
Date: Sun, 24 Sep 2023 03:01:45 -0400
Subject: [PATCH] Issue #3326717 by HongPong, jefflogan, jamesgrobertson,
circuscowboy, jwilson3: Drupal 10 compatibility and PHPCBF stylistic fixes
---
composer.json | 8 ++++----
src/WordPressMigrationGenerator.php | 1 +
wordpress_migrate.info.yml | 3 +--
wordpress_migrate_ui/src/Form/ImageSelectForm.php | 4 ++--
wordpress_migrate_ui/src/Form/ReviewForm.php | 4 ++--
wordpress_migrate_ui/wordpress_migrate_ui.info.yml | 3 +--
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/composer.json b/composer.json
index 046addb..35a429d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "drupal/wordpress_migrate",
"description": "wordpress_migrate supports migrating WordPress blog exports (WXR format) into Drupal using the Migrate module.",
"type": "drupal-module",
- "homepage": "https://www.drupal.org/project/wordpress_migrate",
+ "homepage": "https://drupal.org/project/wordpress_migrate",
"authors": [
{
"name": "Dan Feidt (hongpong)",
@@ -12,12 +12,12 @@
],
"support": {
"issues": "https://www.drupal.org/project/issues/wordpress_migrate",
- "source": "https://cgit.drupalcode.org/wordpress_migrate"
+ "source": "https://git.drupalcode.org/project/wordpress_migrate"
},
"license": "GPL-2.0-or-later",
"minimum-stability": "dev",
"require": {
- "drupal/migrate_plus": "~5.0",
- "drupal/ctools": "~3.4"
+ "drupal/migrate_plus": "~6.0",
+ "drupal/ctools": "~4.0"
}
}
diff --git a/src/WordPressMigrationGenerator.php b/src/WordPressMigrationGenerator.php
index a0f2504..dc292dc 100644
--- a/src/WordPressMigrationGenerator.php
+++ b/src/WordPressMigrationGenerator.php
@@ -68,6 +68,7 @@ class WordPressMigrationGenerator {
* - [post|page]: Associative array of type-specific configuration:
* - type: Machine name of Drupal node bundle to hold content.
* - text_format: Machine name of text format for body field.
+ *
* @todo: Validate inputs (e.g., make sure post type exists).
* @link https://www.drupal.org/node/2742283
*/
diff --git a/wordpress_migrate.info.yml b/wordpress_migrate.info.yml
index 47a2c05..1b90eba 100644
--- a/wordpress_migrate.info.yml
+++ b/wordpress_migrate.info.yml
@@ -2,7 +2,6 @@ name: 'WordPress Migrate Support'
description: 'Support for importing WordPress sites into Drupal'
type: module
package: Migration
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
dependencies:
- migrate_plus:migrate_plus
diff --git a/wordpress_migrate_ui/src/Form/ImageSelectForm.php b/wordpress_migrate_ui/src/Form/ImageSelectForm.php
index 9920729..84d3a7b 100644
--- a/wordpress_migrate_ui/src/Form/ImageSelectForm.php
+++ b/wordpress_migrate_ui/src/Form/ImageSelectForm.php
@@ -33,9 +33,9 @@ class ImageSelectForm extends FormBase {
// @todo this should be dependency injection.
$field_map = \Drupal::service('entity_field.manager')->getFieldMap();
$options = ['' => $this->t('Do not import')];
- foreach($field_map as $entity_type => $fields) {
+ foreach ($field_map as $entity_type => $fields) {
if ($entity_type == 'node') {
- foreach($fields as $field_name => $field_settings) {
+ foreach ($fields as $field_name => $field_settings) {
if ($field_settings['type'] == 'image') {
$options[$field_name] = $field_name;
}
diff --git a/wordpress_migrate_ui/src/Form/ReviewForm.php b/wordpress_migrate_ui/src/Form/ReviewForm.php
index d4699aa..6554bd5 100644
--- a/wordpress_migrate_ui/src/Form/ReviewForm.php
+++ b/wordpress_migrate_ui/src/Form/ReviewForm.php
@@ -91,7 +91,7 @@ class ReviewForm extends FormBase {
* Determines if the migration group already exists.
*
* @param string $id
- * The migration group ID
+ * The migration group ID.
*
* @return bool
* TRUE if the migration group exists, FALSE otherwise.
@@ -108,7 +108,7 @@ class ReviewForm extends FormBase {
* Determines if the migration with prefix already exists.
*
* @param string $prefix
- * The migration prefix
+ * The migration prefix.
*
* @return bool
* TRUE if the migration with prefix exists, FALSE otherwise.
diff --git a/wordpress_migrate_ui/wordpress_migrate_ui.info.yml b/wordpress_migrate_ui/wordpress_migrate_ui.info.yml
index a540831..715694a 100644
--- a/wordpress_migrate_ui/wordpress_migrate_ui.info.yml
+++ b/wordpress_migrate_ui/wordpress_migrate_ui.info.yml
@@ -2,8 +2,7 @@ name: 'WordPress Migrate UI'
description: 'Wizard UI for configuring WordPress imports into Drupal'
type: module
package: Migration
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
dependencies:
- ctools:ctools
- wordpress_migrate:wordpress_migrate
--
GitLab