Olicek / GoogleMapAPI

src/Markers.php

Spacing +20 added lines, -20 removed lines

@@ -54,9 +54,9 @@ 
 	 */
 	public function addMarkers(array $markers)
 	{
-		if(count($markers))
+		if (count($markers))
 		{
-			foreach($markers as $marker)
+			foreach ($markers as $marker)
 			{
 				$this->createMarker($marker);
 			}
@@ -74,8 +74,8 @@ 
 	{
 		if (!is_string($animation) && !is_bool($animation))
 		{
-			throw new InvalidArgumentException("Animation must be string or boolean, $animation (" .
-					gettype($animation) . ") was given");
+			throw new InvalidArgumentException("Animation must be string or boolean, $animation (".
+					gettype($animation).") was given");
 		}
 		if (!is_string($title) && $title != null)
 		{
@@ -127,7 +127,7 @@ 
 		{
 			throw new LogicException("setMessage must be called after addMarker()");
 		}
-		end($this->markers);         // move the internal pointer to the end of the array
+		end($this->markers); // move the internal pointer to the end of the array
 		$key = key($this->markers);
 		$this->markers[$key]['message'] = $message;
 		$this->markers[$key]['autoOpen'] = $autoOpen;
@@ -218,16 +218,16 @@ 
 		{
 			throw new LogicException("setIcon must be called after addMarker()");
 		}
-		end($this->markers);         // move the internal pointer to the end of the array
+		end($this->markers); // move the internal pointer to the end of the array
 		$key = key($this->markers);
-		if($icon instanceof Marker\Icon)
+		if ($icon instanceof Marker\Icon)
 		{
-			$icon->setUrl(is_null($this->iconDefaultPath) ? $icon->getUrl() : $this->iconDefaultPath . $icon->getUrl());
+			$icon->setUrl(is_null($this->iconDefaultPath) ? $icon->getUrl() : $this->iconDefaultPath.$icon->getUrl());
 			$this->markers[$key]['icon'] = $icon->getArray();
 			
 		} else
 		{
-			$this->markers[$key]['icon'] = is_null($this->iconDefaultPath) ? $icon : $this->iconDefaultPath . $icon;
+			$this->markers[$key]['icon'] = is_null($this->iconDefaultPath) ? $icon : $this->iconDefaultPath.$icon;
 		}
 
 		return $this;
@@ -240,7 +240,7 @@ 
 	 */
 	public function setDefaultIconPath($defaultPath)
 	{
-		if(!is_null($defaultPath) &&
+		if (!is_null($defaultPath) &&
 			!Strings::endsWith($defaultPath, '/') &&
 			!Strings::endsWith($defaultPath, '\\'))
 		{
@@ -276,7 +276,7 @@ 
 		{
 			throw new InvalidArgumentException("setColor must be called after addMarker()");
 		}
-		end($this->markers);         // move the internal pointer to the end of the array
+		end($this->markers); // move the internal pointer to the end of the array
 		$key = key($this->markers);
 		$this->markers[$key]['color'] = $color;
 		return $this;
@@ -288,7 +288,7 @@ 
 	 */
 	private function createMarker(array $marker)
 	{
-		if(!array_key_exists('coordinates', $marker))
+		if (!array_key_exists('coordinates', $marker))
 		{
 			throw new InvalidArgumentException('Coordinates must be set in every marker');
 		}
@@ -297,9 +297,9 @@ 
 				isset($marker['animation']) ? $marker['animation'] : false,
 				isset($marker['title']) ? $marker['title'] : null);
 
-		if(array_key_exists('message', $marker))
+		if (array_key_exists('message', $marker))
 		{
-			if(is_array($marker['message']))
+			if (is_array($marker['message']))
 			{
 				$message = array_values($marker['message']);
 				$this->setMessage($message[0], $message[1]);
@@ -309,23 +309,23 @@ 
 			}
 		}
 
-		if(array_key_exists('icon', $marker))
+		if (array_key_exists('icon', $marker))
 		{
-			if(is_array($marker['icon']))
+			if (is_array($marker['icon']))
 			{
 				$icon = new Marker\Icon($marker['icon']['url']);
 
-				if(array_key_exists('size', $marker['icon']))
+				if (array_key_exists('size', $marker['icon']))
 				{
 					$icon->setSize($marker['icon']['size']);
 				}
 
-				if(array_key_exists('anchor', $marker['icon']))
+				if (array_key_exists('anchor', $marker['icon']))
 				{
 					$icon->setAnchor($marker['icon']['anchor']);
 				}
 
-				if(array_key_exists('origin', $marker['icon']))
+				if (array_key_exists('origin', $marker['icon']))
 				{
 					$icon->setOrigin($marker['icon']['origin']);
 				}
@@ -337,7 +337,7 @@ 
 			}
 		}
 
-		if(array_key_exists('color', $marker))
+		if (array_key_exists('color', $marker))
 		{
 			$this->setColor($marker['color']);
 		}

src/MapAPI.php

Spacing +12 added lines, -13 removed lines

@@ -126,7 +126,7 @@ 
 	 */
 	public function setCoordinates(array $coordinates)
 	{
-		if(!count($coordinates))
+		if (!count($coordinates))
 		{
 			$this->coordinates = array(NULL, NULL);
 		} else
@@ -192,7 +192,7 @@ 
 	 */
 	public function setType($type)
 	{
-		if($type !== self::HYBRID && $type !== self::ROADMAP && $type !== self::SATELLITE &&
+		if ($type !== self::HYBRID && $type !== self::ROADMAP && $type !== self::SATELLITE &&
 				$type !== self::TERRAIN)
 		{
 			throw new InvalidArgumentException;
@@ -212,10 +212,10 @@ 
 	{
 		if (!in_array($key, ['start', 'end', 'waypoint']))
 		{
-			throw new InvalidArgumentException('First argument must be "start|end|waypoint", ' . $key . ' was given');
+			throw new InvalidArgumentException('First argument must be "start|end|waypoint", '.$key.' was given');
 		}
 
-		if($key === 'waypoint')
+		if ($key === 'waypoint')
 		{
 			$this->waypoints['waypoints'][] = $waypoint;
 
@@ -235,7 +235,7 @@ 
 	public function setDirection(array $direction)
 	{
 		$this->direction = $direction;
-		if(!array_key_exists('travelmode', $this->direction))
+		if (!array_key_exists('travelmode', $this->direction))
 		{
 			$this->direction['travelmode'] = 'DRIVING';
 		} else if (!in_array($direction['travelmode'], [
@@ -361,8 +361,8 @@ 
 
 		} else if ($clickable !== FALSE)
 		{
-			$this->clickable = '<a href="https://maps.google.com/maps/place/' .
-				$this->coordinates[0] . ',' . $this->coordinates[1] . '/">';
+			$this->clickable = '<a href="https://maps.google.com/maps/place/'.
+				$this->coordinates[0].','.$this->coordinates[1].'/">';
 		}
 
 		return $this;
@@ -437,8 +437,8 @@ 
 			if (is_callable($this->clickable))
 			{
 				$this->clickable = call_user_func_array($this->clickable, [
-					'https://maps.google.com/maps/place/' . $this->coordinates[0] . ',' .
-					$this->coordinates[1] . '/',
+					'https://maps.google.com/maps/place/'.$this->coordinates[0].','.
+					$this->coordinates[1].'/',
 					$this->getCoordinates()
 				]);
 			}
@@ -448,9 +448,8 @@ 
 			$this->template->zoom = $this->zoom;
 			$this->template->position = $this->coordinates;
 			$this->template->markers = $this->markers;
-			$this->template->clickable = $this->clickable instanceof Html ? $this->clickable->startTag() :
-				$this->clickable;
-			$this->template->setFile(dirname(__FILE__) . '/static.latte');
+			$this->template->clickable = $this->clickable instanceof Html ? $this->clickable->startTag() : $this->clickable;
+			$this->template->setFile(dirname(__FILE__).'/static.latte');
 		} else
 		{
 			$map = array(
@@ -467,7 +466,7 @@ 
 			    'waypoint' => !is_null($this->waypoints) ? array_merge($this->waypoints, $this->direction) : NULL
 			);
 			$this->template->map = Json::encode($map);
-			$this->template->setFile(dirname(__FILE__) . '/template.latte');
+			$this->template->setFile(dirname(__FILE__).'/template.latte');
 		}
 		$this->template->render();
 	}