clubdeuce / wplib-olm-google-maps

includes/class-geocoder.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
 
     /**
-     * @param $url
+     * @param string $url
      * @return array|\WP_Error
      */
     private function _make_request( $url ) {

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
         $cache_key = md5( serialize( $url ) );
 
-        if ( ! $data = wp_cache_get( $cache_key ) ) {
+        if ( !$data = wp_cache_get( $cache_key ) ) {
             $data = wp_remote_get( $url );
             wp_cache_add( $cache_key, $data, 300 );
         }

includes/class-marker-view.php

Spacing +1 added lines, -1 removed lines

@@ -6,6 +6,6 @@
  * Class Marker_View
  * @package Clubdeuce\WPLib\Components\GoogleMaps
  */
-class Marker_View extends \WPLib_View_Base  {
+class Marker_View extends \WPLib_View_Base {
 
 }
\ No newline at end of file

tests/unit/testGeocoder.php

Spacing +27 added lines, -27 removed lines

@@ -26,7 +26,7 @@ 
      *
      */
     public function setUp() {
-        $this->_geocoder = new Geocoder(['api_key' => $this->_api_key]);
+        $this->_geocoder = new Geocoder( ['api_key' => $this->_api_key] );
     }
 
     /**
@@ -34,53 +34,53 @@ 
      * @covers ::api_key
      */
     public function testConstructorWithAPIKey() {
-        $this->assertEquals($this->_api_key, $this->_geocoder->api_key());
+        $this->assertEquals( $this->_api_key, $this->_geocoder->api_key() );
     }
 
     /**
      * @covers ::_make_url
      */
     public function testMakeUrl() {
-        $response = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_url', '123 Anywhere Street New York 10001');
+        $response = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_url', '123 Anywhere Street New York 10001' );
 
-        $this->assertInternalType('string', $response);
-        $this->assertRegExp('/address\=123\+Anywhere\+Street\+New\+York\+10001/', $response);
-        $this->assertRegExp("/key={$this->_api_key}/", $response);
+        $this->assertInternalType( 'string', $response );
+        $this->assertRegExp( '/address\=123\+Anywhere\+Street\+New\+York\+10001/', $response );
+        $this->assertRegExp( "/key={$this->_api_key}/", $response );
     }
 
     /**
      * @covers ::_get_data
      */
     public function testGetDataCache() {
-        wp_cache_add( md5(serialize('foo.bar')), 'foobar');
+        wp_cache_add( md5( serialize( 'foo.bar' ) ), 'foobar' );
 
-        $this->assertEquals('foobar', $this->reflectionMethodInvokeArgs($this->_geocoder, '_get_data', 'foo.bar'));
+        $this->assertEquals( 'foobar', $this->reflectionMethodInvokeArgs( $this->_geocoder, '_get_data', 'foo.bar' ) );
     }
 
     /**
      * @covers ::_make_location
      */
     public function testMakeLocation() {
-        $location = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_location', json_decode(file_get_contents(INCLUDES_DIR . '/geocoder-response.json'), true));
+        $location = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_location', json_decode( file_get_contents( INCLUDES_DIR.'/geocoder-response.json' ), true ) );
 
-        $this->assertInstanceOf('\Clubdeuce\WPLib\Components\GoogleMaps\Location', $location);
-        $this->assertEquals('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA', $location->address());
-        $this->assertEquals('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA', $location->formatted_address());
-        $this->assertEquals(37.4224764, $location->latitude());
+        $this->assertInstanceOf( '\Clubdeuce\WPLib\Components\GoogleMaps\Location', $location );
+        $this->assertEquals( '1600 Amphitheatre Parkway, Mountain View, CA 94043, USA', $location->address() );
+        $this->assertEquals( '1600 Amphitheatre Parkway, Mountain View, CA 94043, USA', $location->formatted_address() );
+        $this->assertEquals( 37.4224764, $location->latitude() );
         $this->assertEquals(-122.0842499, $location->longitude());
-        $this->assertEquals('ChIJ2eUgeAK6j4ARbn5u_wAGqWA', $location->place_id());
-        $this->assertInternalType('array', $location->viewport());
-        $this->assertArrayHasKey('northeast', $location->viewport());
-        $this->assertArrayHasKey('southwest', $location->viewport());
-        $this->assertInternalType('array', $location->viewport()['northeast']);
-        $this->assertArrayHasKey('lat', $location->viewport()['northeast']);
-        $this->assertArrayHasKey('lng', $location->viewport()['northeast']);
-        $this->assertEquals(37.4238253802915, $location->viewport()['northeast']['lat']);
+        $this->assertEquals( 'ChIJ2eUgeAK6j4ARbn5u_wAGqWA', $location->place_id() );
+        $this->assertInternalType( 'array', $location->viewport() );
+        $this->assertArrayHasKey( 'northeast', $location->viewport() );
+        $this->assertArrayHasKey( 'southwest', $location->viewport() );
+        $this->assertInternalType( 'array', $location->viewport()['northeast'] );
+        $this->assertArrayHasKey( 'lat', $location->viewport()['northeast'] );
+        $this->assertArrayHasKey( 'lng', $location->viewport()['northeast'] );
+        $this->assertEquals( 37.4238253802915, $location->viewport()['northeast']['lat'] );
         $this->assertEquals(-122.0829009197085, $location->viewport()['northeast']['lng']);
-        $this->assertInternalType('array', $location->viewport()['southwest']);
-        $this->assertArrayHasKey('lat', $location->viewport()['southwest']);
-        $this->assertArrayHasKey('lng', $location->viewport()['southwest']);
-        $this->assertEquals(37.4211274197085, $location->viewport()['southwest']['lat']);
+        $this->assertInternalType( 'array', $location->viewport()['southwest'] );
+        $this->assertArrayHasKey( 'lat', $location->viewport()['southwest'] );
+        $this->assertArrayHasKey( 'lng', $location->viewport()['southwest'] );
+        $this->assertEquals( 37.4211274197085, $location->viewport()['southwest']['lat'] );
         $this->assertEquals(-122.0855988802915, $location->viewport()['southwest']['lng']);
     }
 
@@ -88,8 +88,8 @@ 
      * @covers ::_make_request
      */
     public function testMakeRequestInvalidURL() {
-        $response = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_request', 'foo.bar');
-        $this->assertInstanceOf('WP_Error', $response);
+        $response = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_request', 'foo.bar' );
+        $this->assertInstanceOf( 'WP_Error', $response );
     }
 
 }
\ No newline at end of file

tests/unit/testLocationModel.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
     private $_location;
 
     public function setUp() {
-        $this->_location = new Location_Model([
+        $this->_location = new Location_Model( [
             'address'           => '1600 Amphitheatre Parkway Mountain View CA',
             'formatted_address' => '1600 Amphitheatre Parkway, Mountain View, CA, 12345',
             'latitude'          => 100.12345,
@@ -32,21 +32,21 @@ 
      * @covers ::__call
      */
     public function testAddress() {
-        $this->assertEquals('1600 Amphitheatre Parkway Mountain View CA', $this->_location->address());
+        $this->assertEquals( '1600 Amphitheatre Parkway Mountain View CA', $this->_location->address() );
     }
 
     /**
      * @covers ::__call
      */
     public function testFormattedAddress() {
-        $this->assertEquals('1600 Amphitheatre Parkway, Mountain View, CA, 12345', $this->_location->formatted_address());
+        $this->assertEquals( '1600 Amphitheatre Parkway, Mountain View, CA, 12345', $this->_location->formatted_address() );
     }
 
     /**
      * @covers ::__call
      */
     public function testLatitude() {
-        $this->assertEquals(100.12345, $this->_location->latitude());
+        $this->assertEquals( 100.12345, $this->_location->latitude() );
     }
 
     /**
@@ -60,13 +60,13 @@ 
      * @covers ::__call()
      */
     public function testPlaceId() {
-        $this->assertEquals('foobar', $this->_location->place_id());
+        $this->assertEquals( 'foobar', $this->_location->place_id() );
     }
 
     /**
      * @covers ::__call()
      */
     public function testViewport() {
-        $this->assertEquals(['foo', 'bar'], $this->_location->viewport());
+        $this->assertEquals( ['foo', 'bar'], $this->_location->viewport() );
     }
 }
\ No newline at end of file

tests/integration/testGeocoder.php

Spacing +28 added lines, -28 removed lines

@@ -19,38 +19,38 @@ 
     private $_geocoder;
 
     public function setUp() {
-        $this->_geocoder = new Geocoder(['api_key' => '']);
+        $this->_geocoder = new Geocoder( ['api_key' => ''] );
     }
 
     /**
      * @covers ::_make_request
      */
     public function testMakeRequest() {
-        $url      = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_url', '1600 Amphitheatre Parkway, Mountain View, CA');
-        $response = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_request', $url);
+        $url      = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_url', '1600 Amphitheatre Parkway, Mountain View, CA' );
+        $response = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_request', $url );
 
-        $this->assertInternalType('array', $response);
+        $this->assertInternalType( 'array', $response );
     }
 
     /**
      * @covers ::_make_request
      */
     public function testMakeRequestError404() {
-        $response = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_request', 'https://maps.googleapis.com/maps/api/geo');
+        $response = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_request', 'https://maps.googleapis.com/maps/api/geo' );
 
-        $this->assertInstanceOf('WP_Error', $response);
-        $this->assertObjectHasAttribute('errors', $response);
-        $this->assertArrayHasKey('404', $response->errors);
+        $this->assertInstanceOf( 'WP_Error', $response );
+        $this->assertObjectHasAttribute( 'errors', $response );
+        $this->assertArrayHasKey( '404', $response->errors );
     }
 
     /**
      * @covers ::_get_data
      */
     public function testGetData() {
-        $url      = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_url', '1600 Amphitheatre Parkway, Mountain View, CA');
-        $response = $this->reflectionMethodInvokeArgs($this->_geocoder, '_get_data', $url);
+        $url      = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_url', '1600 Amphitheatre Parkway, Mountain View, CA' );
+        $response = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_get_data', $url );
 
-        $this->assertInternalType('array', $response);
+        $this->assertInternalType( 'array', $response );
     }
 
     /**
@@ -58,26 +58,26 @@ 
      * @covers ::_make_location
      */
     public function testGeocode() {
-        $location = $this->_geocoder->geocode('1600 Amphitheatre Parkway, Mountain View, CA');
+        $location = $this->_geocoder->geocode( '1600 Amphitheatre Parkway, Mountain View, CA' );
 
-        $this->assertInstanceOf('\Clubdeuce\WPLib\Components\GoogleMaps\Location', $location);
-        $this->assertEquals('1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA', $location->address());
-        $this->assertEquals('1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA', $location->formatted_address());
-        $this->assertEquals(37.422366400000001, $location->latitude());
+        $this->assertInstanceOf( '\Clubdeuce\WPLib\Components\GoogleMaps\Location', $location );
+        $this->assertEquals( '1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA', $location->address() );
+        $this->assertEquals( '1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA', $location->formatted_address() );
+        $this->assertEquals( 37.422366400000001, $location->latitude() );
         $this->assertEquals(-122.084406, $location->longitude());
-        $this->assertEquals('ChIJ2eUgeAK6j4ARbn5u_wAGqWA', $location->place_id());
-        $this->assertInternalType('array', $location->viewport());
-        $this->assertArrayHasKey('northeast', $location->viewport());
-        $this->assertArrayHasKey('southwest', $location->viewport());
-        $this->assertInternalType('array', $location->viewport()['northeast']);
-        $this->assertArrayHasKey('lat', $location->viewport()['northeast']);
-        $this->assertArrayHasKey('lng', $location->viewport()['northeast']);
-        $this->assertEquals(37.423715380291497, $location->viewport()['northeast']['lat']);
+        $this->assertEquals( 'ChIJ2eUgeAK6j4ARbn5u_wAGqWA', $location->place_id() );
+        $this->assertInternalType( 'array', $location->viewport() );
+        $this->assertArrayHasKey( 'northeast', $location->viewport() );
+        $this->assertArrayHasKey( 'southwest', $location->viewport() );
+        $this->assertInternalType( 'array', $location->viewport()['northeast'] );
+        $this->assertArrayHasKey( 'lat', $location->viewport()['northeast'] );
+        $this->assertArrayHasKey( 'lng', $location->viewport()['northeast'] );
+        $this->assertEquals( 37.423715380291497, $location->viewport()['northeast']['lat'] );
         $this->assertEquals(-122.08305701970851, $location->viewport()['northeast']['lng']);
-        $this->assertInternalType('array', $location->viewport()['southwest']);
-        $this->assertArrayHasKey('lat', $location->viewport()['southwest']);
-        $this->assertArrayHasKey('lng', $location->viewport()['southwest']);
-        $this->assertEquals(37.421017419708512, $location->viewport()['southwest']['lat']);
+        $this->assertInternalType( 'array', $location->viewport()['southwest'] );
+        $this->assertArrayHasKey( 'lat', $location->viewport()['southwest'] );
+        $this->assertArrayHasKey( 'lng', $location->viewport()['southwest'] );
+        $this->assertEquals( 37.421017419708512, $location->viewport()['southwest']['lat'] );
         $this->assertEquals(-122.0857549802915, $location->viewport()['southwest']['lng']);
     }
 }

tests/bootstrap.php

Spacing +15 added lines, -15 removed lines

@@ -1,29 +1,29 @@
 <?php
-define('VENDOR_DIRECTORY', dirname(__DIR__) . '/vendor');
-define('INCLUDES_DIR', dirname(__FILE__) . '/includes');
+define( 'VENDOR_DIRECTORY', dirname( __DIR__ ).'/vendor' );
+define( 'INCLUDES_DIR', dirname( __FILE__ ).'/includes' );
 
-if (! file_exists( dirname(__DIR__) . '/build' ) ) {
-    mkdir(dirname(__DIR__) . '/build');
+if ( !file_exists( dirname( __DIR__ ).'/build' ) ) {
+    mkdir( dirname( __DIR__ ).'/build' );
 }
 
-require_once getenv( 'WP_TESTS_DIR' ) . '/tests/phpunit/includes/functions.php';
-require getenv( 'WP_TESTS_DIR' ) . '/tests/phpunit/includes/bootstrap.php';
+require_once getenv( 'WP_TESTS_DIR' ).'/tests/phpunit/includes/functions.php';
+require getenv( 'WP_TESTS_DIR' ).'/tests/phpunit/includes/bootstrap.php';
 
 require 'includes/testCase.php';
 
-require VENDOR_DIRECTORY . '/autoload.php';
+require VENDOR_DIRECTORY.'/autoload.php';
 
-if ( ! function_exists( 'wplib_define' ) ) {
-    require( VENDOR_DIRECTORY . '/wplib/wplib/defines.php' );
+if ( !function_exists( 'wplib_define' ) ) {
+    require(VENDOR_DIRECTORY.'/wplib/wplib/defines.php');
     wplib_define( 'WPLib_Runmode', 'PRODUCTION' );
     wplib_define( 'WPLib_Stability', 'EXPERIMENTAL' );
 }
 
-require VENDOR_DIRECTORY . '/wplib/wplib/wplib.php';
+require VENDOR_DIRECTORY.'/wplib/wplib/wplib.php';
 WPLib::initialize();
 
-require_once dirname(__DIR__) . '/includes/class-geocoder.php';
-require_once dirname(__DIR__) . '/includes/class-location.php';
-require_once dirname(__DIR__) . '/includes/class-location-model.php';
-require_once dirname(__DIR__) . '/includes/class-location-view.php';
-require_once dirname(__DIR__) . '/includes/class-marker-model.php';
+require_once dirname( __DIR__ ).'/includes/class-geocoder.php';
+require_once dirname( __DIR__ ).'/includes/class-location.php';
+require_once dirname( __DIR__ ).'/includes/class-location-model.php';
+require_once dirname( __DIR__ ).'/includes/class-location-view.php';
+require_once dirname( __DIR__ ).'/includes/class-marker-model.php';

includes/class-marker-model.php

Doc Comments -1 removed lines

@@ -30,7 +30,6 @@
 
     /**
      * Marker_Model constructor.
-     * @param array|object|string $address
      * @param array $args
      */
     function __construct( $args = array() ) {

Spacing +3 added lines, -3 removed lines

@@ -55,8 +55,8 @@ 
      * @return Location
      */
     function location() {
-        if ( ! is_object( $this->_location ) ) {
-            $this->_location = $this->_geocoder()->geocode($this->_address);
+        if ( !is_object( $this->_location ) ) {
+            $this->_location = $this->_geocoder()->geocode( $this->_address );
         }
         return $this->_location;
     }
@@ -79,7 +79,7 @@ 
      * @return Geocoder
      */
     private function _geocoder() {
-        if (! is_object($this->_geocoder)) {
+        if ( !is_object( $this->_geocoder ) ) {
             $this->_geocoder = new Geocoder();
         }
 

component-google-maps.php

Spacing +3 added lines, -3 removed lines

@@ -56,10 +56,10 @@
 
         $key = static::api_key();
 
-        wp_register_script('google-maps', "https://maps.google.com/maps/api/js?key={$key}", false, '3.0', true );
-        wp_register_script('map-control', home_url( '/vendor/clubdeuce/wplib-olm-google-maps/assets/maps.js' ), array( 'jquery', 'google-maps' ), '0.1', true );
+        wp_register_script( 'google-maps', "https://maps.google.com/maps/api/js?key={$key}", false, '3.0', true );
+        wp_register_script( 'map-control', home_url( '/vendor/clubdeuce/wplib-olm-google-maps/assets/maps.js' ), array( 'jquery', 'google-maps' ), '0.1', true );
 
-        array_walk(static::$_script_conditions, function( $function ) {
+        array_walk( static::$_script_conditions, function( $function ) {
             return is_callable( $function ) ? call_user_func( $function ) : $function;
         } );
 

tests/unit/testMarkerModel.php

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
 
 
     public function setUp() {
-        $this->_location = new Location([
+        $this->_location = new Location( [
             'address'           => '123 Anywhere Street Anywhere NY',
             'formatted_address' => '123 Anywhere Street, Anywhere, NY 12345 USA',
             'latitude'          => 100.12345,
@@ -40,15 +40,15 @@ 
             'place_id'          => 'foobar',
             'types'             => ['foo', 'bar'],
             'viewport'          => ['northeast' => ['lat' => 100.12346, 'lng' => -100.12344], 'southwest' => ['lat' => 100.12344, 'lng' => -100.12346]],
-        ]);
+        ] );
 
-        $this->_geocoder = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder');
-        $this->_geocoder->shouldReceive('geocode')->andReturn($this->_location);
+        $this->_geocoder = \Mockery::mock( '\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder' );
+        $this->_geocoder->shouldReceive( 'geocode' )->andReturn( $this->_location );
 
-        $this->_model = new Marker_Model([
+        $this->_model = new Marker_Model( [
             'address'  => $this->_address,
             'geocoder' => $this->_geocoder,
-        ]);
+        ] );
     }
 
 
@@ -56,14 +56,14 @@ 
      * @covers ::latitude
      */
     public function testLatitude() {
-        $this->assertEquals(100.12345, $this->_model->latitude());
+        $this->assertEquals( 100.12345, $this->_model->latitude() );
     }
 
     /**
      * @covers ::location
      */
     public function testLocation() {
-        $this->assertEquals($this->_location, $this->_model->location());
+        $this->assertEquals( $this->_location, $this->_model->location() );
     }
 
     /**
@@ -77,7 +77,7 @@ 
      * @covers ::_geocoder
      */
     public function testGeocoder() {
-        $this->assertEquals($this->_geocoder, $this->reflectionMethodInvoke($this->_model, '_geocoder'));
+        $this->assertEquals( $this->_geocoder, $this->reflectionMethodInvoke( $this->_model, '_geocoder' ) );
     }
 
     /**
@@ -85,6 +85,6 @@ 
      */
     public function testCreateGeocoder() {
         $marker_model = new Marker_Model();
-        $this->assertInstanceOf('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder',  $this->reflectionMethodInvoke($marker_model, '_geocoder'));
+        $this->assertInstanceOf( '\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder', $this->reflectionMethodInvoke( $marker_model, '_geocoder' ) );
     }
 }
\ No newline at end of file