From 7d8c7fbc8119861fa27e5f47608136e3832ac7fd Mon Sep 17 00:00:00 2001 From: Noel Chiasson Date: Thu, 8 Feb 2024 12:50:24 -0400 Subject: [PATCH 1/4] Correcting a namespacing issue with MigrateToolsCommands --- src/.DS_Store | Bin 0 -> 6148 bytes src/Drush/Commands/MigrateCommands.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/.DS_Store diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0f98bab37f3441b1055e72b0787e32f68377ac0f GIT binary patch literal 6148 zcmeHKOHRWu5PdG8RIup=i527uy+K-qt}D7>iJ(%8Xh=or4xwz=a0etV09y`FaUYJr z8{4#T(~2EJFeBM7nU81uqd^r*j;ZROlA?M3cIY?d!Gud|1FW!tEuhcWj(#3inS+~$71YA@%1>b4)I zcXQc$utvFtO+G;#wP!AY9h`9gGu%oY7zUM~Ca3I*N4b{M!_HSN6|W^Do4ta1Y#)%4 zRQ>@2?AaoXJ%>6g1ImChuwX#WhnPb!@mM&tM+YZ+1t3OLTj8_qt;ARq#KdFakQ$0{ zp+pyI{1wCa7GzvF?TPm<9J+8Ao0;qQ%*NkPjLlAcY~5iJhdL_*%0S4#mV0eV|3BV* z{||%oO&L%I{uBcyO8aStTk^fNvN`FsF~=E)i1-x_Z3rjdj_rfA;sXvVw8ip3Ogt72 RsiEkPfTckvW#C5{_ym-uguVa( literal 0 HcmV?d00001 diff --git a/src/Drush/Commands/MigrateCommands.php b/src/Drush/Commands/MigrateCommands.php index 9c8b68b..b798c7f 100644 --- a/src/Drush/Commands/MigrateCommands.php +++ b/src/Drush/Commands/MigrateCommands.php @@ -7,7 +7,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\dgi_migrate\MigrateBatchExecutable; use Drupal\migrate\Plugin\MigrationInterface; -use Drupal\migrate_tools\Drush\MigrateToolsCommands; +use Drupal\migrate_tools\Drush\Commands\MigrateToolsCommands; use Drupal\migrate_tools\Drush9LogMigrateMessage; use Drupal\migrate_tools\MigrateTools; use Psr\Log\LoggerInterface; From 44d0268dff78220685ab37a51bc53ef083b05a85 Mon Sep 17 00:00:00 2001 From: Noel Chiasson Date: Thu, 8 Feb 2024 14:27:18 -0400 Subject: [PATCH 2/4] Constraing to migrate_tools >=6.0.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7ccbf6b..93ceb60 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "drupal/imagemagick": "^3.2", "drupal/migrate_directory": "^1 || ^2", "drupal/migrate_plus": "^5.1 || ^6", - "drupal/migrate_tools": "^6", + "drupal/migrate_tools": "^6 >= 6.0.4", "drupal/paragraphs": "^1", "drupal/pathauto": "^1.8", "islandora/controlled_access_terms": "^2", From 47319e83cebe66c40450136c1c401b99d5a8492c Mon Sep 17 00:00:00 2001 From: Noel Chiasson Date: Thu, 8 Feb 2024 14:28:39 -0400 Subject: [PATCH 3/4] Removing accidentally included file --- src/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/.DS_Store diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 0f98bab37f3441b1055e72b0787e32f68377ac0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5PdG8RIup=i527uy+K-qt}D7>iJ(%8Xh=or4xwz=a0etV09y`FaUYJr z8{4#T(~2EJFeBM7nU81uqd^r*j;ZROlA?M3cIY?d!Gud|1FW!tEuhcWj(#3inS+~$71YA@%1>b4)I zcXQc$utvFtO+G;#wP!AY9h`9gGu%oY7zUM~Ca3I*N4b{M!_HSN6|W^Do4ta1Y#)%4 zRQ>@2?AaoXJ%>6g1ImChuwX#WhnPb!@mM&tM+YZ+1t3OLTj8_qt;ARq#KdFakQ$0{ zp+pyI{1wCa7GzvF?TPm<9J+8Ao0;qQ%*NkPjLlAcY~5iJhdL_*%0S4#mV0eV|3BV* z{||%oO&L%I{uBcyO8aStTk^fNvN`FsF~=E)i1-x_Z3rjdj_rfA;sXvVw8ip3Ogt72 RsiEkPfTckvW#C5{_ym-uguVa( From 27962685e847904c7eaa3ef22fef981e99366c20 Mon Sep 17 00:00:00 2001 From: Noel Chiasson Date: Thu, 8 Feb 2024 14:50:32 -0400 Subject: [PATCH 4/4] Constrainging migrate_tools to >=6.0.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 93ceb60..9b49799 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "drupal/imagemagick": "^3.2", "drupal/migrate_directory": "^1 || ^2", "drupal/migrate_plus": "^5.1 || ^6", - "drupal/migrate_tools": "^6 >= 6.0.4", + "drupal/migrate_tools": "^6.0.4", "drupal/paragraphs": "^1", "drupal/pathauto": "^1.8", "islandora/controlled_access_terms": "^2",