diff --git a/composer.json b/composer.json index 046addbe385d1a7b628e69ce4077e02b8c95d0bc..35a429df054c7bb0110026560a40a82c05313b20 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 a0f2504a3bf52a86da04188e49d8de7c3158b4b8..dc292dc2f3b14b3b720a9f37d01a0247f1313c00 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 47a2c05e0d4fa122c123f6d6aab6a216b51c4113..1b90eba40579796ee4965e731eb045cd9667b935 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 99207294aad2052c29eb287f4270304024504a53..84d3a7b3a531f1cec08373b6d5053cd5a95f35b1 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 d4699aabf1ce3d71363a98f018a38f1909b44e80..6554bd540f319385884cf16158ef55f85a2892ba 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 a5408315d6271d7e5279a5ad18b521204f38307a..715694aa7b57a7bca53cc5b56efca041edf56b04 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