Merge pull request BetterBrief#32 from timezoneone/ss4-upgrade

Ss4 upgrade

Author: dhensby

.scrutinizer.yml

@@ -66,4 +66,4 @@ checks:
     argument_type_checks: true
 
 filter:
-  paths: [code/*, tests/*]
+  paths: [src/*, tests/*]

README.md

@@ -17,6 +17,13 @@ You can also search for locations using the search box, which uses the Google Ma
 |------|-------|-----------|
 |`field_names`|See `GoogleMapField.yml`'s `default_options.field_names`|A map of field names to save the map data into your object.|
 
+##### make sure `api_key` config added in site yml file
+```yml
+BetterBrief\GoogleMapField:
+  default_options:
+    api_key: 'GOOGLE_API_KEY'
+```
+
 ##### `Field` options
 
 |Option|Default|Description|

_config.php

@@ -1,7 +1,8 @@
 ---
 Name: googlemapfield
+Before: '*'
 ---
-GoogleMapField:
+BetterBrief\GoogleMapField:
   default_options:
     api_key: null
     show_search_box: true

_config/googlemapfield.yml

@@ -7,5 +7,4 @@
 	border: 1px solid #b3b3b3;
 	margin-top: 8px;
 	box-sizing: border-box;
-	max-width: 512px;
 }

css/GoogleMapField.css renamed to client/css/GoogleMapField.css

@@ -1,6 +1,6 @@
 {
     "name": "betterbrief/silverstripe-googlemapfield",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "description": "Save locations using latitude/longitude DataObject fields.",
     "keywords": ["maps","google", "googlemapfield", "silverstripe", "map", "geolocation"],
     "homepage": "http://github.com/BetterBrief/googlemapfield",
@@ -13,10 +13,19 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "composer/installers": "~1.0"
+        "php": ">=5.5.0",
+        "composer/installers": "~1.0",
+        "silverstripe/framework": "^4"
     },
-    "extra" : {
-        "installer-name": "googlemapfield"
+    "autoload": {
+        "psr-4": {
+            "BetterBrief\\": "src/"
+        }
+    },
+    "extra": {
+        "expose": [
+            "client/css",
+            "client/js"
+        ]
     }
 }

javascript/GoogleMapField.js renamed to client/js/GoogleMapField.js

@@ -9,6 +9,18 @@
  * Maps Geocoding API.
  * @author <@willmorgan>
  */
+
+namespace BetterBrief;
+
+use SilverStripe\Forms\FormField;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Forms\HiddenField;
+use SilverStripe\Forms\TextField;
+use SilverStripe\View\Requirements;
+use SilverStripe\ORM\DataObjectInterface;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Core\Convert;
+
 class GoogleMapField extends FormField {
 
 	protected $data;
@@ -166,15 +178,15 @@ protected function requireDependencies() {
 		if($key = $this->getOption('api_key')) {
 			$gmapsParams['key'] = $key;
 		}
-		Requirements::css(GOOGLEMAPFIELD_BASE .'/css/GoogleMapField.css');
-		Requirements::javascript(GOOGLEMAPFIELD_BASE .'/javascript/GoogleMapField.js');
+        Requirements::css('betterbrief/silverstripe-googlemapfield: client/css/GoogleMapField.css');
+        Requirements::javascript('betterbrief/silverstripe-googlemapfield: client/js/GoogleMapField.js');
 		Requirements::javascript('//maps.googleapis.com/maps/api/js?' . http_build_query($gmapsParams));
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function setValue($record) {
+	public function setValue($record, $data = null) {
 		$this->latField->setValue(
 			$record['Latitude']
 		);

composer.json

@@ -1,7 +1,7 @@
 <div class="googlemapfield $extraClass" $AttributesHTML>
 	<div class="googlemapfield-controls">
-		<% loop ChildFields %>
-		$Field
+		<% loop $ChildFields %>
+			$Field
 		<% end_loop %>
 	</div>
 	<div class="googlemapfield-map"></div>