@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | public function setUp() { |
| 22 | 22 | $this->_geocoder = new Geocoder(array('api_key' => getenv('MAPS_API_KEY'))); |
| 23 | - parent::setUp(); |
|
| 23 | + parent::setUp(); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | private $_geocoder; |
| 20 | 20 | |
| 21 | 21 | public function setUp() { |
| 22 | - $this->_geocoder = new Geocoder(array('api_key' => getenv('MAPS_API_KEY'))); |
|
| 22 | + $this->_geocoder = new Geocoder( array( 'api_key' => getenv( 'MAPS_API_KEY' ) ) ); |
|
| 23 | 23 | parent::setUp(); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -27,26 +27,26 @@ discard block |
||
| 27 | 27 | * @covers ::geocode |
| 28 | 28 | */ |
| 29 | 29 | public function testGeocode() { |
| 30 | - $location = $this->_geocoder->geocode('1600 Amphitheatre Parkway, Mountain View, CA'); |
|
| 31 | - |
|
| 32 | - $this->assertInstanceOf('\Clubdeuce\WPLib\Components\GoogleMaps\Location', $location); |
|
| 33 | - $this->assertInternalType('string', $location->address()); |
|
| 34 | - $this->assertInternalType('string', $location->formatted_address()); |
|
| 35 | - $this->assertInternalType('double', $location->latitude()); |
|
| 36 | - $this->assertInternalType('double', $location->longitude()); |
|
| 37 | - $this->assertInternalType('array', $location->viewport()); |
|
| 38 | - $this->assertArrayHasKey('northeast', $location->viewport()); |
|
| 39 | - $this->assertArrayHasKey('southwest', $location->viewport()); |
|
| 40 | - $this->assertInternalType('array', $location->viewport()['northeast']); |
|
| 41 | - $this->assertArrayHasKey('lat', $location->viewport()['northeast']); |
|
| 42 | - $this->assertArrayHasKey('lng', $location->viewport()['northeast']); |
|
| 43 | - $this->assertInternalType('double', $location->viewport()['northeast']['lat']); |
|
| 44 | - $this->assertInternalType('double', $location->viewport()['northeast']['lng']); |
|
| 45 | - $this->assertInternalType('array', $location->viewport()['southwest']); |
|
| 46 | - $this->assertArrayHasKey('lat', $location->viewport()['southwest']); |
|
| 47 | - $this->assertArrayHasKey('lng', $location->viewport()['southwest']); |
|
| 48 | - $this->assertInternalType('double', $location->viewport()['southwest']['lat']); |
|
| 49 | - $this->assertInternalType('double', $location->viewport()['southwest']['lng']); |
|
| 30 | + $location = $this->_geocoder->geocode( '1600 Amphitheatre Parkway, Mountain View, CA' ); |
|
| 31 | + |
|
| 32 | + $this->assertInstanceOf( '\Clubdeuce\WPLib\Components\GoogleMaps\Location', $location ); |
|
| 33 | + $this->assertInternalType( 'string', $location->address() ); |
|
| 34 | + $this->assertInternalType( 'string', $location->formatted_address() ); |
|
| 35 | + $this->assertInternalType( 'double', $location->latitude() ); |
|
| 36 | + $this->assertInternalType( 'double', $location->longitude() ); |
|
| 37 | + $this->assertInternalType( 'array', $location->viewport() ); |
|
| 38 | + $this->assertArrayHasKey( 'northeast', $location->viewport() ); |
|
| 39 | + $this->assertArrayHasKey( 'southwest', $location->viewport() ); |
|
| 40 | + $this->assertInternalType( 'array', $location->viewport()['northeast'] ); |
|
| 41 | + $this->assertArrayHasKey( 'lat', $location->viewport()['northeast'] ); |
|
| 42 | + $this->assertArrayHasKey( 'lng', $location->viewport()['northeast'] ); |
|
| 43 | + $this->assertInternalType( 'double', $location->viewport()['northeast']['lat'] ); |
|
| 44 | + $this->assertInternalType( 'double', $location->viewport()['northeast']['lng'] ); |
|
| 45 | + $this->assertInternalType( 'array', $location->viewport()['southwest'] ); |
|
| 46 | + $this->assertArrayHasKey( 'lat', $location->viewport()['southwest'] ); |
|
| 47 | + $this->assertArrayHasKey( 'lng', $location->viewport()['southwest'] ); |
|
| 48 | + $this->assertInternalType( 'double', $location->viewport()['southwest']['lat'] ); |
|
| 49 | + $this->assertInternalType( 'double', $location->viewport()['southwest']['lng'] ); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | } |
@@ -24,29 +24,29 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | protected $_location; |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * Location_Model constructor. |
|
| 29 | - * |
|
| 30 | - * @param array $args |
|
| 31 | - */ |
|
| 32 | - function __construct( $args = array() ) { |
|
| 27 | + /** |
|
| 28 | + * Location_Model constructor. |
|
| 29 | + * |
|
| 30 | + * @param array $args |
|
| 31 | + */ |
|
| 32 | + function __construct( $args = array() ) { |
|
| 33 | 33 | |
| 34 | - $args = wp_parse_args( $args, array( |
|
| 35 | - 'location' => new Location( $args ), |
|
| 36 | - ) ); |
|
| 34 | + $args = wp_parse_args( $args, array( |
|
| 35 | + 'location' => new Location( $args ), |
|
| 36 | + ) ); |
|
| 37 | 37 | |
| 38 | - parent::__construct( $args ); |
|
| 38 | + parent::__construct( $args ); |
|
| 39 | 39 | |
| 40 | - } |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @return bool |
|
| 44 | - */ |
|
| 45 | - function has_location() { |
|
| 42 | + /** |
|
| 43 | + * @return bool |
|
| 44 | + */ |
|
| 45 | + function has_location() { |
|
| 46 | 46 | |
| 47 | - return $this->_has( '_location' ); |
|
| 47 | + return $this->_has( '_location' ); |
|
| 48 | 48 | |
| 49 | - } |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * @param string $method_name |
@@ -55,21 +55,21 @@ discard block |
||
| 55 | 55 | public function __call( $method_name, $args ) { |
| 56 | 56 | $value = null; |
| 57 | 57 | |
| 58 | - do { |
|
| 58 | + do { |
|
| 59 | 59 | |
| 60 | - if ( property_exists( $this, "_{$method_name}" ) ) { |
|
| 61 | - $property = "_{$method_name}"; |
|
| 62 | - $value = $this->{$property}; |
|
| 63 | - break; |
|
| 64 | - } |
|
| 60 | + if ( property_exists( $this, "_{$method_name}" ) ) { |
|
| 61 | + $property = "_{$method_name}"; |
|
| 62 | + $value = $this->{$property}; |
|
| 63 | + break; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - if ( ! isset( $this->_location ) ) { |
|
| 67 | - break; |
|
| 68 | - } |
|
| 66 | + if ( ! isset( $this->_location ) ) { |
|
| 67 | + break; |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - $value = call_user_func_array( array( $this->_location, $method_name ), $args ); |
|
| 70 | + $value = call_user_func_array( array( $this->_location, $method_name ), $args ); |
|
| 71 | 71 | |
| 72 | - } while ( false ); |
|
| 72 | + } while ( false ); |
|
| 73 | 73 | |
| 74 | 74 | return $value; |
| 75 | 75 | } |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | break; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - if ( ! isset( $this->_location ) ) { |
|
| 66 | + if ( !isset($this->_location) ) { |
|
| 67 | 67 | break; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -19,19 +19,19 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | class Marker_Label extends \WPLib_Item_Base { |
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * Marker_Label constructor. |
|
| 24 | - * |
|
| 25 | - * @param array $args |
|
| 26 | - */ |
|
| 27 | - function __construct( $args = array() ) { |
|
| 22 | + /** |
|
| 23 | + * Marker_Label constructor. |
|
| 24 | + * |
|
| 25 | + * @param array $args |
|
| 26 | + */ |
|
| 27 | + function __construct( $args = array() ) { |
|
| 28 | 28 | |
| 29 | - $temp = wp_parse_args( $args, array( |
|
| 30 | - 'label' => new \Clubdeuce\WPGoogleMaps\Marker_Label( $args ), |
|
| 31 | - ) ); |
|
| 29 | + $temp = wp_parse_args( $args, array( |
|
| 30 | + 'label' => new \Clubdeuce\WPGoogleMaps\Marker_Label( $args ), |
|
| 31 | + ) ); |
|
| 32 | 32 | |
| 33 | - parent::__construct( $temp ); |
|
| 33 | + parent::__construct( $temp ); |
|
| 34 | 34 | |
| 35 | - } |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -20,19 +20,19 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | class Marker extends \WPLib_Item_Base { |
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Marker_Model constructor. |
|
| 25 | - * |
|
| 26 | - * @param array $args |
|
| 27 | - */ |
|
| 28 | - function __construct( $args = array() ) { |
|
| 23 | + /** |
|
| 24 | + * Marker_Model constructor. |
|
| 25 | + * |
|
| 26 | + * @param array $args |
|
| 27 | + */ |
|
| 28 | + function __construct( $args = array() ) { |
|
| 29 | 29 | |
| 30 | - $args = wp_parse_args( $args, array( |
|
| 31 | - 'marker' => new \Clubdeuce\WPGoogleMaps\Marker( $args ), |
|
| 32 | - ) ); |
|
| 30 | + $args = wp_parse_args( $args, array( |
|
| 31 | + 'marker' => new \Clubdeuce\WPGoogleMaps\Marker( $args ), |
|
| 32 | + ) ); |
|
| 33 | 33 | |
| 34 | - parent::__construct( $args ); |
|
| 34 | + parent::__construct( $args ); |
|
| 35 | 35 | |
| 36 | - } |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | 38 | } |
@@ -8,17 +8,17 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | class Geocoder extends \Clubdeuce\WPGoogleMaps\Geocoder { |
| 10 | 10 | |
| 11 | - /** |
|
| 12 | - * @param string $address |
|
| 13 | - * |
|
| 14 | - * @return \Clubdeuce\WPGoogleMaps\Location|Location|\WP_Error |
|
| 15 | - */ |
|
| 16 | - function geocode( $address ) { |
|
| 11 | + /** |
|
| 12 | + * @param string $address |
|
| 13 | + * |
|
| 14 | + * @return \Clubdeuce\WPGoogleMaps\Location|Location|\WP_Error |
|
| 15 | + */ |
|
| 16 | + function geocode( $address ) { |
|
| 17 | 17 | |
| 18 | - $location = parent::geocode( $address ); |
|
| 18 | + $location = parent::geocode( $address ); |
|
| 19 | 19 | |
| 20 | - return new Location( array( 'location' => $location ) ); |
|
| 20 | + return new Location( array( 'location' => $location ) ); |
|
| 21 | 21 | |
| 22 | - } |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | 24 | } |
@@ -22,19 +22,19 @@ |
||
| 22 | 22 | */ |
| 23 | 23 | class Map extends \WPLib_Item_Base { |
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * Map_Model constructor. |
|
| 27 | - * |
|
| 28 | - * @param array $args |
|
| 29 | - */ |
|
| 30 | - function __construct( $args = array() ) { |
|
| 25 | + /** |
|
| 26 | + * Map_Model constructor. |
|
| 27 | + * |
|
| 28 | + * @param array $args |
|
| 29 | + */ |
|
| 30 | + function __construct( $args = array() ) { |
|
| 31 | 31 | |
| 32 | - $args = wp_parse_args( $args, array( |
|
| 33 | - 'map' => new \Clubdeuce\WPGoogleMaps\Map( $args ), |
|
| 34 | - ) ); |
|
| 32 | + $args = wp_parse_args( $args, array( |
|
| 33 | + 'map' => new \Clubdeuce\WPGoogleMaps\Map( $args ), |
|
| 34 | + ) ); |
|
| 35 | 35 | |
| 36 | - parent::__construct( $args ); |
|
| 36 | + parent::__construct( $args ); |
|
| 37 | 37 | |
| 38 | - } |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | 40 | } |
| 41 | 41 | \ No newline at end of file |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | |
| 15 | 15 | $view = new \Clubdeuce\WPGoogleMaps\Map_View( $this->model() ); |
| 16 | 16 | |
| 17 | - $view->the_map(); |
|
| 17 | + $view->the_map(); |
|
| 18 | 18 | |
| 19 | 19 | } |
| 20 | 20 | |
@@ -9,42 +9,42 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | class Model_Base extends \WPLib_Model_Base { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * @param $property |
|
| 14 | - * |
|
| 15 | - * @return bool |
|
| 16 | - */ |
|
| 17 | - protected function _has( $property ) { |
|
| 12 | + /** |
|
| 13 | + * @param $property |
|
| 14 | + * |
|
| 15 | + * @return bool |
|
| 16 | + */ |
|
| 17 | + protected function _has( $property ) { |
|
| 18 | 18 | |
| 19 | - $has = false; |
|
| 19 | + $has = false; |
|
| 20 | 20 | |
| 21 | - if ( isset( $this->{$property} ) ) { |
|
| 22 | - $has = true; |
|
| 23 | - } |
|
| 21 | + if ( isset( $this->{$property} ) ) { |
|
| 22 | + $has = true; |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - return $has; |
|
| 25 | + return $has; |
|
| 26 | 26 | |
| 27 | - } |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * @param string $method_name |
|
| 31 | - * @param array $args |
|
| 32 | - * |
|
| 33 | - * @return null |
|
| 34 | - */ |
|
| 35 | - function __call( $method_name, $args ) { |
|
| 29 | + /** |
|
| 30 | + * @param string $method_name |
|
| 31 | + * @param array $args |
|
| 32 | + * |
|
| 33 | + * @return null |
|
| 34 | + */ |
|
| 35 | + function __call( $method_name, $args ) { |
|
| 36 | 36 | |
| 37 | - $value = null; |
|
| 37 | + $value = null; |
|
| 38 | 38 | |
| 39 | - if ( property_exists( $this, "_{$method_name}" ) ) { |
|
| 40 | - $property = "_{$method_name}"; |
|
| 41 | - $value = $this->{$property}; |
|
| 39 | + if ( property_exists( $this, "_{$method_name}" ) ) { |
|
| 40 | + $property = "_{$method_name}"; |
|
| 41 | + $value = $this->{$property}; |
|
| 42 | 42 | |
| 43 | - } |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - return $value; |
|
| 45 | + return $value; |
|
| 46 | 46 | |
| 47 | - } |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | 49 | } |
| 50 | 50 | endif; |
| 51 | 51 | \ No newline at end of file |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace Clubdeuce\WPLib\Components\GoogleMaps; |
| 4 | 4 | |
| 5 | -if ( ! class_exists( 'Clubdeuce\WPLib\Components\GoogleMaps\Model_Base' ) ): |
|
| 5 | +if ( !class_exists( 'Clubdeuce\WPLib\Components\GoogleMaps\Model_Base' ) ): |
|
| 6 | 6 | /** |
| 7 | 7 | * Class Model_Base |
| 8 | 8 | * @package Clubdeuce\WPLib\Components\GoogleMaps |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | $has = false; |
| 20 | 20 | |
| 21 | - if ( isset( $this->{$property} ) ) { |
|
| 21 | + if ( isset($this->{$property} ) ) { |
|
| 22 | 22 | $has = true; |
| 23 | 23 | } |
| 24 | 24 | |
@@ -9,36 +9,36 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | class Map_Model extends Model_Base { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * @var Map |
|
| 14 | - */ |
|
| 15 | - protected $_map; |
|
| 12 | + /** |
|
| 13 | + * @var Map |
|
| 14 | + */ |
|
| 15 | + protected $_map; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * @param string $method_name |
|
| 19 | - * @return mixed |
|
| 20 | - */ |
|
| 21 | - function __call( $method_name, $args ) { |
|
| 22 | - $value = null; |
|
| 17 | + /** |
|
| 18 | + * @param string $method_name |
|
| 19 | + * @return mixed |
|
| 20 | + */ |
|
| 21 | + function __call( $method_name, $args ) { |
|
| 22 | + $value = null; |
|
| 23 | 23 | |
| 24 | - do { |
|
| 24 | + do { |
|
| 25 | 25 | |
| 26 | - if ( property_exists( $this, "_{$method_name}" ) ) { |
|
| 27 | - $property = "_{$method_name}"; |
|
| 28 | - $value = $this->{$property}; |
|
| 29 | - break; |
|
| 30 | - } |
|
| 26 | + if ( property_exists( $this, "_{$method_name}" ) ) { |
|
| 27 | + $property = "_{$method_name}"; |
|
| 28 | + $value = $this->{$property}; |
|
| 29 | + break; |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - if ( ! isset( $this->_map ) ) { |
|
| 33 | - break; |
|
| 34 | - } |
|
| 32 | + if ( ! isset( $this->_map ) ) { |
|
| 33 | + break; |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - $value = call_user_func_array( array( $this->_map, $method_name ), $args ); |
|
| 36 | + $value = call_user_func_array( array( $this->_map, $method_name ), $args ); |
|
| 37 | 37 | |
| 38 | - } while ( false ); |
|
| 38 | + } while ( false ); |
|
| 39 | 39 | |
| 40 | - return $value; |
|
| 41 | - } |
|
| 40 | + return $value; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | 43 | // /** |
| 44 | 44 | // * @var array |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | break; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - if ( ! isset( $this->_map ) ) { |
|
| 32 | + if ( !isset($this->_map) ) { |
|
| 33 | 33 | break; |
| 34 | 34 | } |
| 35 | 35 | |