clubdeuce / wplib-olm-google-maps

includes/class-geocoder.php

Spacing +4 added lines, -4 removed lines

@@ -43,12 +43,12 @@ 
      */
     function geocode( $address ) {
 
-        $location = new \WP_Error(100, 'No results found', array( 'address' => $address ) );
+        $location = new \WP_Error( 100, 'No results found', array( 'address' => $address ) );
         $url = $this->_make_url( $address );
 
         $response = $this->_make_request( $url );
 
-        if ( ! is_wp_error( $response ) && count( $response['results'] ) > 0 ) {
+        if ( !is_wp_error( $response ) && count( $response['results'] ) > 0 ) {
             $location = $this->_make_location( $response['results'][0] );
         }
 
@@ -123,7 +123,7 @@ 
 
         $result_value = '';
 
-        if ( isset( $results['address_components'] ) ) {
+        if ( isset($results['address_components']) ) {
             foreach ( $results['address_components'] as $component ) {
                 if ( $component['types'][0] === $value ) {
                     $result_value = $component['short_name'];
@@ -167,7 +167,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-model.php

Spacing +5 added lines, -5 removed lines

@@ -94,8 +94,8 @@ 
      */
     function latitude() {
 
-        if ( is_null( $this->_latitude ) && ! is_wp_error( $this->location() ) ) {
-            $this->_latitude =$this->location()->latitude();
+        if ( is_null( $this->_latitude ) && !is_wp_error( $this->location() ) ) {
+            $this->_latitude = $this->location()->latitude();
         }
         return doubleval( $this->_latitude );
     }
@@ -104,7 +104,7 @@ 
      * @return Location|\WP_Error
      */
     function location() {
-        if ( ! is_object( $this->_location ) ) {
+        if ( !is_object( $this->_location ) ) {
             $this->_location = $this->_geocoder()->geocode( $this->_address );
         }
         return $this->_location;
@@ -115,7 +115,7 @@ 
      */
     function longitude() {
 
-        if ( is_null( $this->_longitude ) && ! is_wp_error( $this->location() ) ) {
+        if ( is_null( $this->_longitude ) && !is_wp_error( $this->location() ) ) {
             $this->_longitude = doubleval( $this->location()->longitude() );
         }
         return doubleval( $this->_longitude );
@@ -161,7 +161,7 @@ 
      * @return Geocoder
      */
     private function _geocoder() {
-        if (! is_object( $this->_geocoder ) ) {
+        if ( !is_object( $this->_geocoder ) ) {
             $this->_geocoder = new Geocoder();
         }
 

tests/integration/testGeocoder.php

Spacing +31 added lines, -31 removed lines

@@ -20,38 +20,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 );
     }
 
     /**
@@ -59,26 +59,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->assertInternalType('double', $location->latitude());
-        $this->assertInternalType('double', $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->assertInternalType('double', $location->viewport()['northeast']['lat']);
-        $this->assertInternalType('double', $location->viewport()['northeast']['lng']);
-        $this->assertInternalType('array', $location->viewport()['southwest']);
-        $this->assertArrayHasKey('lat', $location->viewport()['southwest']);
-        $this->assertArrayHasKey('lng', $location->viewport()['southwest']);
-        $this->assertInternalType('double', $location->viewport()['southwest']['lat']);
-        $this->assertInternalType('double', $location->viewport()['southwest']['lng']);
+        $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->assertInternalType( 'double', $location->latitude() );
+        $this->assertInternalType( 'double', $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->assertInternalType( 'double', $location->viewport()['northeast']['lat'] );
+        $this->assertInternalType( 'double', $location->viewport()['northeast']['lng'] );
+        $this->assertInternalType( 'array', $location->viewport()['southwest'] );
+        $this->assertArrayHasKey( 'lat', $location->viewport()['southwest'] );
+        $this->assertArrayHasKey( 'lng', $location->viewport()['southwest'] );
+        $this->assertInternalType( 'double', $location->viewport()['southwest']['lat'] );
+        $this->assertInternalType( 'double', $location->viewport()['southwest']['lng'] );
     }
 }

tests/unit/testGeocoder.php

Spacing +28 added lines, -28 removed lines

@@ -27,7 +27,7 @@ 
      *
      */
     public function setUp() {
-        $this->_geocoder = new Geocoder(['api_key' => $this->_api_key]);
+        $this->_geocoder = new Geocoder( ['api_key' => $this->_api_key] );
     }
 
     /**
@@ -35,54 +35,54 @@ 
      * @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() {
-        $response = json_decode(file_get_contents(TEST_INCLUDES_DIR . '/geocoder-response.json'), true);
-        $location = $this->reflectionMethodInvokeArgs($this->_geocoder, '_make_location', $response['results'][0] );
+        $response = json_decode( file_get_contents( TEST_INCLUDES_DIR.'/geocoder-response.json' ), true );
+        $location = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_location', $response['results'][0] );
 
-        $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']);
     }
 
@@ -90,8 +90,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/testGoogleMaps.php

Spacing +21 added lines, -21 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace Clubdeuce\WPLib\Components\GoogleMaps\Tests\UnitTests;
 
-require_once dirname( dirname(__DIR__) ) . '/component-google-maps.php';
+require_once dirname( dirname( __DIR__ ) ).'/component-google-maps.php';
 
 use Clubdeuce\WPLib\Components\Google_Maps;
 use Clubdeuce\WPLib\Components\GoogleMaps\Marker;
@@ -21,8 +21,8 @@ 
      */
     public function testApiKeySetAndGet() {
 
-        Google_Maps::register_api_key('foo');
-        $this->assertEquals('foo', Google_Maps::api_key());
+        Google_Maps::register_api_key( 'foo' );
+        $this->assertEquals( 'foo', Google_Maps::api_key() );
 
     }
 
@@ -31,7 +31,7 @@ 
      */
     public function testGeocoder() {
         
-        $this->assertInstanceOf('Clubdeuce\WPLib\Components\GoogleMaps\Geocoder', Google_Maps::geocoder());
+        $this->assertInstanceOf( 'Clubdeuce\WPLib\Components\GoogleMaps\Geocoder', Google_Maps::geocoder() );
 
     }
 
@@ -42,7 +42,7 @@ 
 
         $map = Google_Maps::make_new_map();
 
-        $this->assertInstanceOf('Clubdeuce\WPLib\Components\GoogleMaps\Map', $map);
+        $this->assertInstanceOf( 'Clubdeuce\WPLib\Components\GoogleMaps\Map', $map );
 
     }
 
@@ -56,8 +56,8 @@ 
 
         $conditions = Google_Maps::script_conditions();
 
-        $this->assertInternalType('array', $conditions);
-        $this->assertContains('is_search', $conditions);
+        $this->assertInternalType( 'array', $conditions );
+        $this->assertContains( 'is_search', $conditions );
 
     }
 
@@ -66,9 +66,9 @@ 
      */
     public function testMakeMarkerByAddress() {
 
-        $marker = Google_Maps::make_marker_by_address('1600 Amphitheatre Way');
+        $marker = Google_Maps::make_marker_by_address( '1600 Amphitheatre Way' );
 
-        $this->assertInstanceOf('\Clubdeuce\WPLib\Components\GoogleMaps\Marker', $marker);
+        $this->assertInstanceOf( '\Clubdeuce\WPLib\Components\GoogleMaps\Marker', $marker );
 
     }
 
@@ -77,9 +77,9 @@ 
      */
     public function testDrivingDirectionsHref() {
 
-        $href = Google_Maps::driving_directions_href('1600 Amphitheatre Way');
+        $href = Google_Maps::driving_directions_href( '1600 Amphitheatre Way' );
 
-        $this->assertRegExp('#^https:\/\/maps\.google\.com\/maps\?saddr=My\+Location&daddr=1600\+Amphitheatre\+Way#', $href);
+        $this->assertRegExp( '#^https:\/\/maps\.google\.com\/maps\?saddr=My\+Location&daddr=1600\+Amphitheatre\+Way#', $href );
 
     }
 
@@ -88,9 +88,9 @@ 
      */
     public function testDrivingDirectionsWithStartAddress() {
 
-        $href = Google_Maps::driving_directions_href('1600 Amphitheatre Way', array( 'start' => '1600 Pennsylvania Avenue'));
+        $href = Google_Maps::driving_directions_href( '1600 Amphitheatre Way', array( 'start' => '1600 Pennsylvania Avenue' ) );
 
-        $this->assertRegExp('#^https:\/\/maps\.google\.com\/maps\?saddr=1600\+Pennsylvania\+Avenue&daddr=1600\+Amphitheatre\+Way#', $href);
+        $this->assertRegExp( '#^https:\/\/maps\.google\.com\/maps\?saddr=1600\+Pennsylvania\+Avenue&daddr=1600\+Amphitheatre\+Way#', $href );
 
     }
 
@@ -99,8 +99,8 @@ 
      */
     public function testEvaluateCondition() {
 
-        $this->assertTrue($this->reflectionMethodInvokeArgs('\Clubdeuce\WPLib\Components\Google_Maps', '_evaluate_condition', function(){return true;}));
-        $this->assertFalse($this->reflectionMethodInvokeArgs('\Clubdeuce\WPLib\Components\Google_Maps', '_evaluate_condition', 'foo'));
+        $this->assertTrue( $this->reflectionMethodInvokeArgs( '\Clubdeuce\WPLib\Components\Google_Maps', '_evaluate_condition', function() {return true; }) );
+        $this->assertFalse( $this->reflectionMethodInvokeArgs( '\Clubdeuce\WPLib\Components\Google_Maps', '_evaluate_condition', 'foo' ) );
 
     }
 
@@ -111,8 +111,8 @@ 
 
         Google_Maps::_wp_enqueue_scripts_9();
 
-        $this->assertTrue(wp_script_is('google-maps', 'registered'));
-        $this->assertTrue(wp_script_is('map-control', 'registered'));
+        $this->assertTrue( wp_script_is( 'google-maps', 'registered' ) );
+        $this->assertTrue( wp_script_is( 'map-control', 'registered' ) );
     }
 
     /**
@@ -120,11 +120,11 @@ 
      */
     public function testWpEnqueueScripts9Enqueue() {
 
-        Google_Maps::register_script_condition(function(){return true;});
+        Google_Maps::register_script_condition( function() {return true; });
         Google_Maps::_wp_enqueue_scripts_9();
 
-        $this->assertTrue(wp_script_is('jquery', 'enqueued'));
-        $this->assertTrue(wp_script_is('google-maps', 'enqueued'));
-        $this->assertTrue(wp_script_is('map-control', 'enqueued'));
+        $this->assertTrue( wp_script_is( 'jquery', 'enqueued' ) );
+        $this->assertTrue( wp_script_is( 'google-maps', 'enqueued' ) );
+        $this->assertTrue( wp_script_is( 'map-control', 'enqueued' ) );
     }
 }

tests/includes/testCase.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
     {
         $reflection = new \ReflectionMethod( $class, $method );
         $reflection->setAccessible( true );
-        if (is_string($class)) {
+        if ( is_string( $class ) ) {
             $class = null;
         }
         return $reflection->invoke( $class );
@@ -57,7 +57,7 @@ 
     {
         $reflection = new \ReflectionMethod( $class, $method );
         $reflection->setAccessible( true );
-        if (is_string($class)) {
+        if ( is_string( $class ) ) {
             $class = null;
         }
         return $reflection->invoke( $class, $args );

component-google-maps.php

Spacing +5 added lines, -5 removed lines

@@ -61,8 +61,8 @@ 
      */
     static function geocoder() {
 
-        if ( ! isset( static::$_geocoder ) ) {
-            static::$_geocoder = new Geocoder( ['api_key' => self::api_key() ] );
+        if ( !isset(static::$_geocoder) ) {
+            static::$_geocoder = new Geocoder( ['api_key' => self::api_key()] );
         }
 
         return static::$_geocoder;
@@ -107,8 +107,8 @@ 
             $source = sprintf( '%1$s/assets/maps.js', self::source_url() );
         }
 
-        wp_register_script('google-maps', "https://maps.google.com/maps/api/js?v=3&key={$key}", false, '3.0', true );
-        wp_register_script('map-control', $source, array( 'jquery', 'google-maps' ), '0.1.2', true );
+        wp_register_script( 'google-maps', "https://maps.google.com/maps/api/js?v=3&key={$key}", false, '3.0', true );
+        wp_register_script( 'map-control', $source, array( 'jquery', 'google-maps' ), '0.1.2', true );
 
         $conditions = array_map( array( __CLASS__, '_evaluate_condition' ), static::$_script_conditions );
 
@@ -144,7 +144,7 @@ 
      * @param  array  $args
      * @return string
      */
-    static function driving_directions_href($destination, $args = array() ) {
+    static function driving_directions_href( $destination, $args = array() ) {
 
         $args = wp_parse_args( $args, array(
             'start' => 'My Location',