(v4.0.8.1) Patch for alias conflict

doublesecretagency · May 10, 2021 · 04dc0ae · 04dc0ae
1 parent 87a7cae
commit 04dc0ae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.0.8.1 - 2021-05-10
+
+### Fixed
+- Reverted field alias, to be reinstated with upcoming Craft release.
+
 ## 4.0.8 - 2021-05-08
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "doublesecretagency/craft-googlemaps",
     "description": "Maps in minutes. Powered by the Google Maps API.",
     "type": "craft-plugin",
-    "version": "4.0.8",
+    "version": "4.0.8.1",
     "keywords": [
         "craft",
         "cms",
@@ -35,8 +35,7 @@
     },
     "autoload": {
         "psr-4": {
-            "doublesecretagency\\googlemaps\\": "src/",
-            "doublesecretagency\\smartmap\\": "legacy/"
+            "doublesecretagency\\googlemaps\\": "src/"
         }
     },
     "extra": {

diff --git a/legacy/fields/Address.php b/legacy/fields/Address.php
diff --git a/src/fields/AddressField.php b/src/fields/AddressField.php
@@ -147,26 +147,6 @@ class AddressField extends Field implements PreviewableFieldInterface
 
     // ========================================================================= //
 
-    /**
-     * LEGACY: Properties required for Smart Map migration
-     */
-    public $dragPinDefault;
-    public $dragPinLatitude;
-    public $dragPinLongitude;
-    public $dragPinZoom;
-    public $layout = [
-        'street1' => ['enable' => 1, 'width' => 100, 'position' => 1],
-        'street2' => ['enable' => 1, 'width' => 100, 'position' => 2],
-        'city'    => ['enable' => 1, 'width' =>  50, 'position' => 3],
-        'state'   => ['enable' => 1, 'width' =>  15, 'position' => 4],
-        'zip'     => ['enable' => 1, 'width' =>  35, 'position' => 5],
-        'country' => ['enable' => 1, 'width' => 100, 'position' => 6],
-        'lat'     => ['enable' => 1, 'width' =>  50, 'position' => 7],
-        'lng'     => ['enable' => 1, 'width' =>  50, 'position' => 8],
-    ];
-
-    // ========================================================================= //
-
     /**
      * @inheritdoc
      */
@@ -423,6 +403,3 @@ public function modifyElementsQuery(ElementQueryInterface $query, $options = [])
 //    }
 
 }
-
-// Aliased from old field class
-class_alias(AddressField::class, \doublesecretagency\smartmap\fields\Address::class);