Move source_module from Migrate to Migrate Drupal
2 unresolved threads
2 unresolved threads
Closes #3009349
Merge request reports
Activity
- Resolved by Alex Pott
- Resolved by Alex Pott
added 1 commit
- 89022df9 - Fix docs to use inheritdoc and fix my mistake :)
added 15 commits
-
89022df9...7dd6b190 - 9 commits from branch
project:11.x - d63ac0f7 - Convert patch #40
- e81247c7 - Apply 1 suggestion(s) to 1 file(s)
- 70b06499 - Apply 1 suggestion(s) to 1 file(s)
- b17fccee - Apply 1 suggestion(s) to 1 file(s)
- 22944c26 - Fix docs to use inheritdoc and fix my mistake :)
- d86998ec - Add test
Toggle commit list-
89022df9...7dd6b190 - 9 commits from branch
added 1 commit
- fc1e7678 - check the migration for the source_module definition
added 71 commits
-
fc1e7678...c41bea2d - 64 commits from branch
project:11.x - 0593d064 - Convert patch #40
- 495a1156 - Apply 1 suggestion(s) to 1 file(s)
- e9c2a445 - Apply 1 suggestion(s) to 1 file(s)
- 3459e9bc - Apply 1 suggestion(s) to 1 file(s)
- 87ee1180 - Fix docs to use inheritdoc and fix my mistake :)
- 576751ec - Add test
- 9793b8e7 - check the migration for the source_module definition
Toggle commit list-
fc1e7678...c41bea2d - 64 commits from branch
100 // source_module. 101 $source_id = $definition['source']['plugin']; 102 $source_definition = $this->sourceManager->getDefinition($source_id); 103 if (empty($source_definition['source_module'])) { 104 throw new BadPluginDefinitionException($source_id, 'source_module'); 99 // Confirm that source_module is defined for Drupal sourced migrations. 100 // If source_module is not defined in the migration then check for it in 101 // the source plugin. Throw an exception if the source plugin has 102 // migrate_drupal as a provider but does not define a source_module. 103 if (empty($definition['source']['source_module'])) { 104 $source_id = $definition['source']['plugin']; 105 $source_definition = $this->sourceManager->getDefinition($source_id); 106 if (in_array('migrate_drupal', $source_definition['provider'], TRUE) && empty($source_definition['source_module'])) { 107 throw new BadPluginDefinitionException($source_id, 'source_module'); 108 } 105 109 } - Comment on lines -99 to 105
100 // Confirm that source_module is defined for Drupal sourced migrations. 101 // If source_module is not defined in the migration then check for it in 102 // the source plugin. Throw an exception if the source plugin has 103 // migrate_drupal as a provider but does not define a source_module. 104 if (empty($definition['source']['source_module'])) { 105 $source_id = $definition['source']['plugin']; 106 $source_definition = $this->sourceManager->getDefinition($source_id); 107 if (in_array('migrate_drupal', $source_definition['provider'], TRUE) && empty($source_definition['source_module'])) { 108 throw new BadPluginDefinitionException($source_id, 'source_module'); 109 } 110 } 100 // Confirm that source_module is defined for Drupal sourced migrations. 101 $source_id = $definition['source']['plugin']; 102 $source_definition = $this->sourceManager->getDefinition($source_id); 103 if (in_array('migrate_drupal', $source_definition['provider'], TRUE) && empty($source_definition['source_module'])) { 104 throw new BadPluginDefinitionException($source_id, 'source_module'); 105 } 106 // Tell non-Drupal sourced migrations to remove the source_module. 107 if (!in_array('migrate_drupal', $source_definition['provider'], TRUE) && !empty($source_definition['source_module'])) { 108 @trigger_error("Plugin $source_id has unless source_module defined. See CR", E_USER_DEPRECATED); 109 } I think we should be triggering a deprecation something like the above.
Edited by Alex Pott changed this line in version 15 of the diff
added 85 commits
-
7ba502f8...cae640d3 - 77 commits from branch
project:11.x - a14db344 - Convert patch #40
- 5d22863d - Apply 1 suggestion(s) to 1 file(s)
- 7f214008 - Apply 1 suggestion(s) to 1 file(s)
- 0ffaf62b - Apply 1 suggestion(s) to 1 file(s)
- f1dbeba9 - Fix docs to use inheritdoc and fix my mistake :)
- 8c046a71 - Add test
- 8a7e8b5d - check the migration for the source_module definition
- f1b71f97 - add declare(strict_types=1);
Toggle commit list-
7ba502f8...cae640d3 - 77 commits from branch
added 1553 commits
-
f1b71f97...98f40c82 - 1544 commits from branch
project:11.x - e5cc4008 - Convert patch #40
- 5c5abe64 - Apply 1 suggestion(s) to 1 file(s)
- 93fd3672 - Apply 1 suggestion(s) to 1 file(s)
- 782ce59b - Apply 1 suggestion(s) to 1 file(s)
- adaf9acd - Fix docs to use inheritdoc and fix my mistake :)
- 28eac499 - Add test
- 74af5ccc - check the migration for the source_module definition
- 26e7a616 - add declare(strict_types=1);
- 4b4ef344 - Convert new test module to use attributes instead of annotations
Toggle commit list-
f1b71f97...98f40c82 - 1544 commits from branch
added 1 commit
- 0fc5dbb9 - Update plugin manager after changing to attributes from annotations
added 1 commit
- ce55824a - Update a test after changing plugin manager to attributes from annotations
added 4 commits
- bfcbbdb0 - Handle different definition structure for source plugins annotations vs. attributes
- 68460e53 - Trigger a deprecation error if source_module is used when not needed
- 2c966100 - Move source_module to a new Attribute class in migrate_drupal
- 8dcacf76 - Update most source plugins to use MigrateDrupalSource attribute
Toggle commit listadded 28 commits
-
8dcacf76...73613e52 - 14 commits from branch
project:11.x - 73613e52...279de759 - 4 earlier commits
- d71b2601 - Fix docs to use inheritdoc and fix my mistake :)
- 9bbc180e - Add test
- 45c7a0ab - check the migration for the source_module definition
- a60489ba - add declare(strict_types=1);
- ca09423f - Convert new test module to use attributes instead of annotations
- b4d9b12f - Add missing strict_types declaration
- c12775fe - Updates after changing to attributes from annotations
- 45d97895 - Trigger a deprecation error if source_module is used when not needed
- d420eb09 - Move source_module to a new Attribute class in migrate_drupal
- 8e68493f - Update most source plugins to use MigrateDrupalSource attribute
Toggle commit list-
8dcacf76...73613e52 - 14 commits from branch
added 1 commit
623 623 /** 624 624 * {@inheritdoc} 625 625 */ 626 626 public function getSourceModule() { -
At some point (can be a follow-up, or even in D12 after DrupalSqlBase is gone) We need to remove the getSourceModule() method from MigrateSourceInterface. Other than a couple migrate_drupal tests, it's only called in DrupalSqlBase checkRequirements(), and all of this logic should live there as a protected method that isn't on any interface.
added 131 commits
-
287a21a1...60ce3e07 - 108 commits from branch
project:11.x - 60ce3e07...a80a27d1 - 13 earlier commits
- 8fe29222 - Update most source plugins to use MigrateDrupalSource attribute
- a77abb2c - Restrict the new deprecation message
- 75f80312 - Revert most source plugins to use annotations
- 65270fa5 - Remove the MigrateDrupalSource attribute class
- dd5a17cc - Remove source_module from migrations in block_content module
- 2c7fa232 - Do not cause errors when migration_tags is not set
- 95c51304 - Revert some test changes from Issue #3421014
- 81b4c0bb - Revert "Remove source_module from migrations in block_content module"
- 490bb13a - Make sure that getEnforcedSourceModuleTags() works in this test
- 089db44f - Fix an @group annotation
Toggle commit list-
287a21a1...60ce3e07 - 108 commits from branch
added 1 commit
- 3668a002 - Update newly added source plugin after rebase
added 1 commit
- d561234a - Update newly added source plugin after rebase
Please register or sign in to reply