Fixed migrations with/without schema version

codyjames · May 7, 2021 · 9bfacfc · 9bfacfc
1 parent c1e2ff5
commit 9bfacfc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.5 - Unreleased
+### Fixed
+- Fixed a bug in which config changes could be made twice if the plugin was installed via project config ([#15](https://github.com/putyourlightson/craft-snaptcha/issues/15)).
+
 ## 3.0.4 - 2021-05-06
 ### Changed
 - Excluded requests to the GraphQL API from being validated ([#17](https://github.com/putyourlightson/craft-snaptcha/issues/17)).

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "putyourlightson/craft-snaptcha",
     "description": "Automatically validates forms and prevents spam bots from submitting to your site.",
-    "version": "3.0.4",
+    "version": "3.0.5",
     "type": "craft-plugin",
     "homepage": "https://putyourlightson.com/plugins/snaptcha",
     "license": "proprietary",

diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -44,6 +44,13 @@ public function safeUp(): bool
             Craft::$app->db->schema->refresh();
         }
 
+        // Don't make the same config changes twice
+        $schemaVersion = Craft::$app->projectConfig->get('plugins.snaptcha.schemaVersion', true);
+
+        if ($schemaVersion !== null) {
+            return true;
+        }
+
         // Create and save default settings
         $settings = Snaptcha::$plugin->settings;
         $settings->salt = StringHelper::randomString(16);

diff --git a/src/migrations/m210217_120000_add_value_column.php b/src/migrations/m210217_120000_add_value_column.php
@@ -17,10 +17,10 @@ class m210217_120000_add_value_column extends Migration
      */
     public function safeUp(): bool
     {
-        $schemaVersion = Craft::$app->projectConfig
-            ->get('plugins.snaptcha.schemaVersion', true);
+        $schemaVersion = Craft::$app->projectConfig->get('plugins.snaptcha.schemaVersion', true);
 
-        if (!version_compare($schemaVersion, '3.0.0', '<')) {
+        // Ensure schema version exists to help prevent https://github.com/putyourlightson/craft-snaptcha/issues/15
+        if ($schemaVersion && !version_compare($schemaVersion, '3.0.0', '<')) {
             return true;
         }