Merge branch 'v3-dev' into v3

ethercreative · Jul 12, 2019 · 68852fc · 68852fc
2 parents 864e1f6 + feba36f
commit 68852fc
Show file tree

Hide file tree

Showing 12 changed files with 635 additions and 559 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## [Unreleased] 3.6.0
+
+> {warning} This update changes how map data is stored, moving away from an 
+element type. This means if you are eager loading the a map field, you'll want 
+to remove the `with` from your query and `[0]` when outputting the map (if you 
+have it). We also **strongly** recommend taking a backup before updating.
+
+### Changed
+- Reformat data structure to remove map element type and need for eager loading
+
+### Fixed
+- Fix missing postcode warning (Fixes #169)
+- Fix map save DB issue in Craft 3.2 (Fixes #170)
+- Fix map not retrieving saved values in Craft 3.2 (Fixes #171)
+- Fix DB error on duplicate import via FeedMe (Fixes #168)
+- Fix maps not propagating across sites (Fixes #141)
+
 ## 3.5.2 - 2019-06-20
 ### Improved
 - FeedMe can now import the individual map parts

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "ether/simplemap",
   "description": "A beautifully simple Map field type for Craft CMS 3",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "type": "craft-plugin",
   "license": "MIT",
   "minimum-stability": "dev",
@@ -30,6 +30,6 @@
     "developerUrl": "https://ethercreative.co.uk",
 
     "class": "ether\\simplemap\\SimpleMap",
-    "schemaVersion": "3.4.1"
+    "schemaVersion": "3.4.2"
   }
 }
diff --git a/src/elements/Map.php b/src/elements/Map.php
diff --git a/src/elements/db/MapQuery.php b/src/elements/db/MapQuery.php