diff --git a/composer.json b/composer.json index c339b9ba1d53e4f7c197dedadbb404fa2039cc27..9fdef68caa45069cf478a2bf41035985522f58e8 100644 --- a/composer.json +++ b/composer.json @@ -273,6 +273,9 @@ "drupal/honeypot": { "2811189": "https://www.drupal.org/files/issues/2019-08-08/honeypot_field_weight_2811189-18.patch" }, + "drupal/inline_entity_form": { + "3208279": "https://www.drupal.org/files/issues/2021-05-08/inline_entity_form-n3208279-13.patch" + }, "drupal/linkit": { "2712951": "https://www.drupal.org/files/issues/2019-11-27/linkit_for_link_field-2712951-140.patch" }, diff --git a/composer.lock b/composer.lock index 926678b571a6c0711e9f31c8165e54c79c90cb30..6ea91c658948f03c0cddf0f066dd490d8c940fff 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4f162d7bd155c17ba0c04ebcb49b185b", + "content-hash": "2576518bd480624e8c309acc094a6aae", "packages": [ { "name": "alchemy/zippy", diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index a2871d3d1d1dc20bfd7fe048199453e4bf3e6bb6..f0ceb2ec409c5abab54fbf4eb54fa13c28aad359 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -19,7 +19,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => 'd4b4464a481d2dcac95e7ed82f8694d976fd33fe', + 'reference' => '54d0d08aec4764c465ecc36c938c1b3cf80098a9', 'name' => 'osu-asc-webservices/d8-upstream', ), 'versions' => @@ -2276,7 +2276,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => 'd4b4464a481d2dcac95e7ed82f8694d976fd33fe', + 'reference' => '54d0d08aec4764c465ecc36c938c1b3cf80098a9', ), 'pantheon-systems/quicksilver-pushback' => array ( diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index b70554627cf40c135fad901ec833df1aeee8a9e8..893b25c9bd38d57e6334191e5cf533e257a96ef5 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -5038,6 +5038,9 @@ "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." } + }, + "patches_applied": { + "3208279": "https://www.drupal.org/files/issues/2021-05-08/inline_entity_form-n3208279-13.patch" } }, "installation-source": "dist", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index b420fd47d94665d1b9d6e40f33c4649b26a7553c..386c28d3c234217fad8e8b18c2a4c3bd8a7e29cd 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => 'd4b4464a481d2dcac95e7ed82f8694d976fd33fe', + 'reference' => '54d0d08aec4764c465ecc36c938c1b3cf80098a9', 'name' => 'osu-asc-webservices/d8-upstream', ), 'versions' => @@ -2263,7 +2263,7 @@ 'aliases' => array ( ), - 'reference' => 'd4b4464a481d2dcac95e7ed82f8694d976fd33fe', + 'reference' => '54d0d08aec4764c465ecc36c938c1b3cf80098a9', ), 'pantheon-systems/quicksilver-pushback' => array ( diff --git a/web/modules/inline_entity_form/PATCHES.txt b/web/modules/inline_entity_form/PATCHES.txt new file mode 100644 index 0000000000000000000000000000000000000000..bcde80fbb70b89ad34bb5978119a8a933fe9dc0c --- /dev/null +++ b/web/modules/inline_entity_form/PATCHES.txt @@ -0,0 +1,7 @@ +This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches) +Patches applied to this directory: + +3208279 +Source: https://www.drupal.org/files/issues/2021-05-08/inline_entity_form-n3208279-13.patch + + diff --git a/web/modules/inline_entity_form/inline_entity_form.module b/web/modules/inline_entity_form/inline_entity_form.module index 9f06bec97c428699de571156a8febf2c5c75746e..63e26c42ba8cd73038c90ef28674604052879c14 100644 --- a/web/modules/inline_entity_form/inline_entity_form.module +++ b/web/modules/inline_entity_form/inline_entity_form.module @@ -455,12 +455,3 @@ function inline_entity_form_migrate_prepare_row(Row $row, MigrateSourceInterface \Drupal::classResolver(MigrationHelper::class) ->alterRow($row, $source, $migration); } - - -/** - * Implements hook_migration_plugins_alter(). - */ -function inline_entity_form_migration_plugins_alter(array &$migrations) { - \Drupal::classResolver(MigrationHelper::class) - ->alterPlugins($migrations); -} diff --git a/web/modules/inline_entity_form/src/MigrationHelper.php b/web/modules/inline_entity_form/src/MigrationHelper.php index ba83ca3fbcf9ea82af39ace8a2d3ab44694b1d2b..dc949cf4222e29566b64e829ea9bf2d2198fff49 100644 --- a/web/modules/inline_entity_form/src/MigrationHelper.php +++ b/web/modules/inline_entity_form/src/MigrationHelper.php @@ -36,7 +36,7 @@ public function alterPlugins(array &$migrations) { if ($source) { // Field instance. if (get_class($source) === FieldInstance::class) { - $settings[] = $migration['process']['settings']; + $settings = $migration['process']['settings']; $addition = [ 'inline_entity_form' => [ 'plugin' => 'inline_entity_form_field_instance_settings',