BetterBrief / silverstripe-googlemapfield

code/GoogleMapField.php

Doc Comments +3 added lines

@@ -200,6 +200,9 @@
 		return $fieldNames[$name];
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function recordFieldData($name) {
 		$fieldName = $this->childFieldName($name);
 		return $this->data->$fieldName ?: $this->getDefaultValue($name);

Spacing +14 added lines, -14 removed lines

@@ -67,9 +67,9 @@ 
 	 */
 	public function setupOptions(array $options) {
 		$this->options = static::config()->default_options;
-		foreach($this->options as $name => &$value) {
-			if(isset($options[$name])) {
-				if(is_array($value)) {
+		foreach ($this->options as $name => &$value) {
+			if (isset($options[$name])) {
+				if (is_array($value)) {
 					$value = array_merge($value, $options[$name]);
 				}
 				else {
@@ -88,19 +88,19 @@ 
 
 		// Create the latitude/longitude hidden fields
 		$this->latField = HiddenField::create(
-			$name.'[Latitude]',
+			$name . '[Latitude]',
 			'Lat',
 			$this->recordFieldData('Latitude')
 		)->addExtraClass('googlemapfield-latfield');
 
 		$this->lngField = HiddenField::create(
-			$name.'[Longitude]',
+			$name . '[Longitude]',
 			'Lng',
 			$this->recordFieldData('Longitude')
 		)->addExtraClass('googlemapfield-lngfield');
 
 		$this->zoomField = HiddenField::create(
-			$name.'[Zoom]',
+			$name . '[Zoom]',
 			'Zoom',
 			$this->recordFieldData('Zoom')
 		)->addExtraClass('googlemapfield-zoomfield');
@@ -111,7 +111,7 @@ 
 			$this->zoomField
 		);
 
-		if($this->options['show_search_box']) {
+		if ($this->options['show_search_box']) {
 			$this->children->push(
 				TextField::create('Search')
 				->addExtraClass('googlemapfield-searchfield')
@@ -153,11 +153,11 @@ 
 		$gmapsParams = array(
 			'callback' => 'googlemapfieldInit',
 		);
-		if($key = $this->getOption('api_key')) {
+		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(GOOGLEMAPFIELD_BASE . '/css/GoogleMapField.css');
+		Requirements::javascript(GOOGLEMAPFIELD_BASE . '/javascript/GoogleMapField.js');
 		Requirements::javascript('//maps.googleapis.com/maps/api/js?' . http_build_query($gmapsParams));
 	}
 
@@ -240,8 +240,8 @@ 
 
 			$var = $this->options;
 
-			foreach($names as $n) {
-				if(!isset($var[$n])) {
+			foreach ($names as $n) {
+				if (!isset($var[$n])) {
 					return null;
 				}
 				$var = $var[$n];
@@ -259,7 +259,7 @@ 
 	 */
 	public function setOption($name, $val) {
 		// Quicker execution path for "."-free names
-		if(strpos($name,'.') === false) {
+		if (strpos($name, '.') === false) {
 			$this->options[$name] = $val;
 		} else {
 			$names = explode('.', $name);
@@ -267,7 +267,7 @@ 
 			// We still want to do this even if we have strict path checking for legacy code
 			$var = &$this->options;
 
-			foreach($names as $n) {
+			foreach ($names as $n) {
 				$var = &$var[$n];
 			}
 

Braces +4 added lines, -3 removed lines

@@ -71,8 +71,7 @@ 
 			if(isset($options[$name])) {
 				if(is_array($value)) {
 					$value = array_merge($value, $options[$name]);
-				}
-				else {
+				} else {
 					$value = $options[$name];
 				}
 			}
@@ -234,7 +233,9 @@ 
 	public function getOption($name) {
 		// Quicker execution path for "."-free names
 		if (strpos($name, '.') === false) {
-			if (isset($this->options[$name])) return $this->options[$name];
+			if (isset($this->options[$name])) {
+				return $this->options[$name];
+			}
 		} else {
 			$names = explode('.', $name);