Merge branch 'craft-5' of https://github.com/verbb/super-table into c…

…raft-5
verbb · Apr 2, 2024 · 92e3bb7 · 92e3bb7
2 parents d57f407 + d4a75f2
commit 92e3bb7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/fields/SuperTableField.php b/src/fields/SuperTableField.php
@@ -20,6 +20,11 @@ public static function icon(): string
         return '@verbb/supertable/icon-mask.svg';
     }
 
+    /**
+     * @var string Content table name
+     * @deprecated in 4.0.0
+     */
+    public string $contentTable = '';
 
     // Public Methods
     // =========================================================================
@@ -42,6 +47,10 @@ public function __construct($config = [])
             $config['maxEntries'] = ArrayHelper::remove($config, 'maxRows');
         }
 
+        // We need to keep the contentTable value around, as it's needed for the v4 (Craft 5) upgrade.
+        // (Explicitly set it here because Matrix::__construct() just unsets it.)
+        $this->contentTable = ArrayHelper::remove($config, 'contentTable') ?? '';
+
         parent::__construct($config);
     }
 

diff --git a/src/migrations/m240115_000000_craft5.php b/src/migrations/m240115_000000_craft5.php
@@ -297,6 +297,12 @@ public function safeUp(): bool
 
         $fieldsService->refreshFields();
 
+        // remove the old Super Table block type configs
+        $muteEvents = $projectConfig->muteEvents;
+        $projectConfig->muteEvents = true;
+        $projectConfig->remove('superTableBlockTypes');
+        $projectConfig->muteEvents = $muteEvents;
+
         return true;
     }