From 0bc35eb97fdf09a9eb6aed03ff24d279a2cc4e06 Mon Sep 17 00:00:00 2001
From: bcweaver <brianweaver@gmail.com>
Date: Mon, 17 May 2021 11:53:12 -0400
Subject: [PATCH] Apply patch to inline_entity_form for migration bug
---
composer.json | 3 +++
composer.lock | 2 +-
vendor/composer/InstalledVersions.php | 4 ++--
vendor/composer/installed.json | 3 +++
vendor/composer/installed.php | 4 ++--
web/modules/inline_entity_form/PATCHES.txt | 7 +++++++
web/modules/inline_entity_form/inline_entity_form.module | 9 ---------
web/modules/inline_entity_form/src/MigrationHelper.php | 2 +-
8 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 web/modules/inline_entity_form/PATCHES.txt
diff --git a/composer.json b/composer.json
index c339b9ba1d..9fdef68caa 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 926678b571..6ea91c6589 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 a2871d3d1d..f0ceb2ec40 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 b70554627c..893b25c9bd 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 b420fd47d9..386c28d3c2 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 0000000000..bcde80fbb7
--- /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 9f06bec97c..63e26c42ba 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 ba83ca3fbc..dc949cf422 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',
--
GitLab