Removed migrate_plus and migrate_tools dependencies

City-of-Helsinki · Jan 19, 2021 · 91a38ac · 91a38ac
1 parent 7519a3b
commit 91a38ac
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -5,8 +5,7 @@
     "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "require": {
-        "drupal/api_tools": "~1.0.0",
-        "drupal/migrate_plus": "~5.0"
+        "drupal/api_tools": "~1.0.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",

diff --git a/helfi_api_base.info.yml b/helfi_api_base.info.yml
@@ -6,4 +6,3 @@ core_version_requirement: ^8 || ^9
 dependencies:
   - api_tools
   - migrate
-  - migrate_plus
diff --git a/src/Plugin/Action/MigrationUpdateAction.php b/src/Plugin/Action/MigrationUpdateAction.php
@@ -10,10 +10,10 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\helfi_api_base\Entity\RemoteEntityBase;
 use Drupal\helfi_api_base\MigrateTrait;
+use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessage;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
-use Drupal\migrate_tools\MigrateExecutable;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

diff --git a/tests/src/Functional/MigrationTestBase.php b/tests/src/Functional/MigrationTestBase.php
@@ -21,7 +21,6 @@ abstract class MigrationTestBase extends BrowserTestBase implements MigrateMessa
    */
   protected static $modules = [
     'migrate',
-    'migrate_plus',
     'language',
     'content_translation',
   ];

diff --git a/tests/src/Kernel/MigrationSubscriberTest.php b/tests/src/Kernel/MigrationSubscriberTest.php
@@ -25,7 +25,6 @@ class MigrationSubscriberTest extends ApiKernelTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
-    'migrate_plus',
     'migrate',
     'system',
     'remote_entity_test',

diff --git a/tests/src/Kernel/MigrationTestBase.php b/tests/src/Kernel/MigrationTestBase.php
@@ -20,7 +20,6 @@ abstract class MigrationTestBase extends ApiKernelTestBase implements MigrateMes
    */
   protected static $modules = [
     'migrate',
-    'migrate_plus',
     'language',
     'content_translation',
   ];
@@ -31,7 +30,7 @@ abstract class MigrationTestBase extends ApiKernelTestBase implements MigrateMes
   public function setUp() : void {
     parent::setUp();
 
-    $this->installConfig(['language', 'content_translation', 'migrate_plus']);
+    $this->installConfig(['language', 'content_translation']);
 
     foreach (['fi', 'sv'] as $langcode) {
       ConfigurableLanguage::createFromLangcode($langcode)->save();

diff --git a/tests/src/Kernel/Plugin/migrate/process/EntityChangedTest.php b/tests/src/Kernel/Plugin/migrate/process/EntityChangedTest.php
@@ -29,7 +29,6 @@ class EntityChangedTest extends ApiKernelTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
-    'migrate_plus',
     'migrate',
     'system',
     'remote_entity_test',