Unverified Commit d5f2530f authored by José Francisco Sánchez Fernández's avatar José Francisco Sánchez Fernández Committed by Lucas Hedding
Browse files

Issue #3280239 by phoang, JoseFran, heddn: Compatibility with Migrate Tools & Migrate Plus ^6.0

parent c77e0c3f

src/Form/MigrateSourceUiForm.php

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ class MigrateSourceUiForm extends FormBase { 
    ];

    // Force updates or not.

    if ($form_state->getValue('update_existing_records')) {

      $options['update'] = TRUE;

      $options['update'] = 1;

    }



    $executable = new MigrateBatchExecutable($migration, new StubMigrationMessage(), $options);

src/MigrateBatchExecutable.php

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class MigrateBatchExecutable extends BaseMigrateBatchExecutable { 
   * @return array

   *   The batch operations to perform.

   */

  protected function batchOperations(array $migrations, $operation, array $options = []) {

  protected function batchOperations(array $migrations, string $operation, array $options = []): array {

    $operations = [];

    foreach ($migrations as $migration) {
@@ -81,7 +81,7 @@ class MigrateBatchExecutable extends BaseMigrateBatchExecutable { 
   * @param array|\DrushBatchContext $context

   *   The sandbox context.

   */

  public static function batchProcessImport($migration_id, array $options, &$context) {

  public static function batchProcessImport(string $migration_id, array $options, &$context): void {

    if (empty($context['sandbox'])) {

      $context['finished'] = 0;

      $context['sandbox'] = [];