Fixed #3662

craftcms · Jan 18, 2019 · 492b9cf · 492b9cf
1 parent 3f687f4
commit 492b9cf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -18,6 +18,7 @@
 - Fixed a bug where an update to Craft 3.1 would fail with a database error in some scenarios.
 - Fixed a bug where Plugin Store’s Try buttons would appear as disabled when they should be enabled. ([#3619](https://github.com/craftcms/cms/issues/3619))
 - Fixed an error that occurred when updating to Craft 3.1 if there were any relational fields that were missing some expected settings. ([#3641](https://github.com/craftcms/cms/issues/3641))
+- Fixed an error that occurred when updating to Craft 3.1 if there were any Matrix sub-fields that had their type set to a non-existing type. ([#3662](https://github.com/craftcms/cms/issues/3662))
 
 ### Security
 - Fixed two XSS vulnerabilities.

diff --git a/src/migrations/m190108_113000_asset_field_setting_change.php b/src/migrations/m190108_113000_asset_field_setting_change.php
@@ -5,7 +5,9 @@
 use Craft;
 use craft\db\Migration;
 use craft\db\Query;
+use craft\db\Table;
 use craft\fields\Assets;
+use craft\helpers\Json;
 use craft\services\Fields;
 use craft\services\Matrix;
 
@@ -41,6 +43,7 @@ public function safeUp()
 
         // Get the field data from the project config
         $fields = $projectConfig->get(Fields::CONFIG_FIELDS_KEY) ?? [];
+        $projectConfig->muteEvents = true;
 
         foreach ($fields as $fieldUid => $fieldData) {
             if ($fieldData['type'] === Assets::class) {
@@ -53,6 +56,10 @@ public function safeUp()
                 }
 
                 $projectConfig->set(Fields::CONFIG_FIELDS_KEY . '.' . $fieldUid, $fieldData);
+
+                if (!empty($fieldData['settings'])) {
+                    $this->update(Table::FIELDS, ['settings' => Json::encode($fieldData['settings'])], ['uid' => $fieldUid]);
+                }
             }
         }
 
@@ -77,7 +84,13 @@ public function safeUp()
             }
 
             $projectConfig->set(Matrix::CONFIG_BLOCKTYPE_KEY . '.' . $matrixBlockTypeUid, $matrixBlockType);
+
+            if (!empty($fieldData['settings'])) {
+                $this->update(Table::FIELDS, ['settings' => Json::encode($fieldData['settings'])], ['uid' => $fieldUid]);
+            }
         }
+
+        $projectConfig->muteEvents = false;
     }
 
     /**

diff --git a/src/migrations/m190114_143000_more_asset_field_setting_changes.php b/src/migrations/m190114_143000_more_asset_field_setting_changes.php
@@ -5,7 +5,9 @@
 use Craft;
 use craft\db\Migration;
 use craft\db\Query;
+use craft\db\Table;
 use craft\fields\Assets;
+use craft\helpers\Json;
 use craft\services\Fields;
 use craft\services\Matrix;
 
@@ -41,6 +43,7 @@ public function safeUp()
 
         // Get the field data from the project config
         $fields = $projectConfig->get(Fields::CONFIG_FIELDS_KEY) ?? [];
+        $projectConfig->muteEvents = true;
 
         foreach ($fields as $fieldUid => $fieldData) {
             if ($fieldData['type'] === Assets::class && !empty($fieldData['settings']['sources'])) {
@@ -54,6 +57,10 @@ public function safeUp()
                 }
 
                 $projectConfig->set(Fields::CONFIG_FIELDS_KEY . '.' . $fieldUid, $fieldData);
+
+                if (!empty($fieldData['settings'])) {
+                    $this->update(Table::FIELDS, ['settings' => Json::encode($fieldData['settings'])], ['uid' => $fieldUid]);
+                }
             }
         }
 
@@ -79,10 +86,15 @@ public function safeUp()
                     }
                 }
             }
-            unset($fieldData);
 
             $projectConfig->set(Matrix::CONFIG_BLOCKTYPE_KEY . '.' . $matrixBlockTypeUid, $matrixBlockType);
+
+            if (!empty($fieldData['settings'])) {
+                $this->update(Table::FIELDS, ['settings' => Json::encode($fieldData['settings'])], ['uid' => $fieldUid]);
+            }
         }
+
+        $projectConfig->muteEvents = false;
     }
 
     /**