Upgrade to namespaces, SilverStripe 4

_config/config.yml

@@ -2,15 +2,15 @@
 Name: shopgeocodingconfig
 After: 'silvershop/*'
 ---
-Address:
+SilverShop\Model\Address:
   extensions:
-    - AddressGeocoding
+    - SilverShop\Geocoding\Extensions\AddressGeocoding
   enable_geocoding: true
   mapdefaults:
     latitude: -41.292694
     longitude: 174.7788669
     zoom: 5
 Page:
   extensions:
-    - GeocodedUserInfo
+    - SilverShop\Geocoding\Extensions\GeocodedUserInfo
   geocode_visitor_ip: true

composer.json

@@ -1,15 +1,27 @@
 {
 	"name": "silvershop/geocoding",
 	"description": "Geocoding support for SilverShop.",
-	"type": "silverstripe-module",
+	"type": "silverstripe-vendormodule",
 	"keywords": ["silverstripe", "ecommerce", "shop", "geocoding", "address", "ip"],
-	"license": "BSD2",
-	"extra": {
-		"installer-name": "silvershop-geocoding"
-	},
 	"require": {
-		"silvershop/core": "*",
-		"betterbrief/silverstripe-googlemapfield": "~1.2",
+		"silvershop/core": "^3",
+		"betterbrief/silverstripe-googlemapfield": "^2",
 		"willdurand/geocoder": "~2.8.0"
-	}
+	},
+    "license": "BSD-3-Clause",
+    "authors": [    {
+      "name": "SilverShop Contributors",
+      "homepage": "https://github.com/silvershop/silvershop-stock/graphs/contributors"
+    }],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "SilverShop\\Geocoding\\": "src/",
+            "SilverShop\\Geocoding\\Tests\\": "tests/unit/"
+        }
+    }
 }

code/CheckoutStep_AddressLocationFallback.php → src/Checkout/CheckoutStepAddressLocationFallback.php

@@ -3,9 +3,8 @@
 /**
  * A fallback to use if geocoding fails to locate address.
  *
- * @package silvershop-geocoding
  */
-class CheckoutStep_AddressLocationFallback extends CheckoutStep
+class CheckoutStepAddressLocationFallback extends CheckoutStep
 {
 
     private static $allowed_actions = array(

code/AddressGeocoding.php → src/Extensions/AddressGeocoding.php

@@ -1,8 +1,12 @@
 <?php
 
-/**
- * @package silvershop-geocoding
- */
+namespace SilverShop\Geocoding;
+
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+use SilverShop\Model\Address;
+use Exception;
+
 class AddressGeocoding extends DataExtension
 {
 
@@ -75,7 +79,7 @@ public function geocodeAddress()
             $this->owner->Latitude = $geocoded->getLatitude();
             $this->owner->Longitude = $geocoded->getLongitude();
         } catch (Exception $e) {
-            SS_Log::log($e, SS_Log::ERR);
+
         }
     }
 

code/GeocodedUserInfo.php → src/Extensions/GeocodedUserInfo.php

@@ -1,15 +1,20 @@
 <?php
 
-/**
- * @package silvershop-geocoding
- */
+namespace SilverShop\Geocoding\Extensions;
+
+use SilverStripe\Control\Controller;
+use SilverStripe\ORM\DataExtension;
+use SilverShop\Model\Address;
+use Page;
+
 class GeocodedUserInfo extends DataExtension
 {
 
     public function contentcontrollerInit()
     {
         $location = ShopUserInfo::singleton()->getAddress();
         $autocode = Page::config()->geocode_visitor_ip;
+
         if ((!$location && $autocode) || Controller::curr()->getRequest()->getVar('relocateuser')) {
             ShopUserInfo::singleton()->setAddress(new Address($this->findLocation()));
         }
@@ -18,25 +23,27 @@ public function contentcontrollerInit()
     protected function findLocation()
     {
         $ip = Controller::curr()->getRequest()->getIP();
-        //TODO:what to do if there is no ip?
-        //rewrite localhost to a testing ip
+
         if (in_array($ip, array( '127.0.0.1', '::1' ))) {
             $ip = Address::config()->test_ip;
         }
+
         return $this->addressFromIP($ip);
     }
 
     protected function addressFromIP($ip)
     {
         $geocoder = AddressGeocoding::get_geocoder();
         $geodata = array();
+
         try {
             if ($ip) {
                 $geodata = $geocoder->geocode($ip)->toArray();
             }
         } catch (Exception $e) {
-            SS_Log::log($e, SS_Log::ERR);
+
         }
+
         $geodata = array_filter($geodata);
         $datamap = array(
             'Country' => 'countryCode',
@@ -46,7 +53,9 @@ protected function addressFromIP($ip)
             'Latitude' => 'latitude',
             'Longitude' => 'longitude'
         );
+
         $mappeddata = array();
+
         foreach ($datamap as $addressfield => $geofield) {
             if (is_array($geofield)) {
                 if ($data = implode(" ", array_intersect_key($geodata, array_combine($geofield, $geofield)))) {

tests/GeocodingTest.php

@@ -1,24 +1,26 @@
 <?php
 
-/**
- * @package silvershop-geocoding
- */
+namespace SilverShop\Geocoding\Tests;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverShop\Model\Address;
+
 class GeocodingTest extends SapphireTest
 {
 
-    public static $fixture_file = 'silvershop-geocoding/tests/addresses.yml';
+    public static $fixture_file = 'addresses.yml';
 
     public function testAddressModel()
     {
-        $address = $this->objFromFixture("Address", "address1");
+        $address = $this->objFromFixture(Address::class, "address1");
         $this->assertEquals(174.77908, $address->Longitude);
         $this->assertEquals(-41.292915, $address->Latitude);
     }
 
     public function testAddressDistanceTo()
     {
-        $from = $this->objFromFixture("Address", "address1");
-        $to = $this->objFromFixture("Address", "address2");
+        $from = $this->objFromFixture(Address::class, "address1");
+        $to = $this->objFromFixture(Address::class, "address2");
         $this->assertEquals(0, $from->distanceTo($from));
         $this->assertEquals(0, $to->distanceTo($to));
         $this->assertEquals(494.42414833321, $from->distanceTo($to));

tests/addresses.yml

@@ -1,4 +1,4 @@
-Address:
+SilverShop\Model\Address:
   address1:
     Country: NZ
     State: Wellington
@@ -17,4 +17,4 @@ Address:
     PostalCode: 1010
     Company: SilverStripe LTD
     Longitude: 174.76705230
-    Latitude: -36.84646160
+    Latitude: -36.84646160