clubdeuce / wplib-olm-google-maps

includes/class-geocoder.php

Doc Comments +1 added lines, -2 removed lines

@@ -73,7 +73,6 @@ 
     /**
      * Convert the response body into an a Location object
      *
-     * @param  array $response
      * @return Location
      */
     private function _make_location( $results ) {
@@ -95,7 +94,7 @@ 
 
 
     /**
-     * @param $url
+     * @param string $url
      * @return array|\WP_Error
      */
     private function _make_request( $url ) {

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
      */
     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 );
@@ -125,7 +125,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 );
         }

templates/map-view.php

Spacing +4 added lines, -4 removed lines

@@ -12,10 +12,10 @@
 <script type="application/javascript">
     jQuery(document).ready(function() {
         generate_map(
-            "<?php echo esc_js($map_id); ?>",
-            <?php echo json_encode($map_params); ?>,
-            <?php echo json_encode($markers); ?>,
-            <?php echo json_encode($info_windows); ?>
+            "<?php echo esc_js( $map_id ); ?>",
+            <?php echo json_encode( $map_params ); ?>,
+            <?php echo json_encode( $markers ); ?>,
+            <?php echo json_encode( $info_windows ); ?>
         );
     });
 </script>

tests/bootstrap.php

Spacing +22 added lines, -22 removed lines

@@ -1,36 +1,36 @@
 <?php
-define('VENDOR_DIRECTORY', dirname(__DIR__) . '/vendor');
-define('TEST_INCLUDES_DIR', dirname(__FILE__) . '/includes');
+define( 'VENDOR_DIRECTORY', dirname( __DIR__ ).'/vendor' );
+define( 'TEST_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-info-window-model.php';
-require_once dirname(__DIR__) . '/includes/class-info-window-view.php';
-require_once dirname(__DIR__) . '/includes/class-info-window.php';
-require_once dirname(__DIR__) . '/includes/class-marker-model.php';
-require_once dirname(__DIR__) . '/includes/class-map.php';
-require_once dirname(__DIR__) . '/includes/class-map-model.php';
-require_once dirname(__DIR__) . '/includes/class-map-view.php';
-require_once dirname(__DIR__) . '/component-google-maps.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-info-window-model.php';
+require_once dirname( __DIR__ ).'/includes/class-info-window-view.php';
+require_once dirname( __DIR__ ).'/includes/class-info-window.php';
+require_once dirname( __DIR__ ).'/includes/class-marker-model.php';
+require_once dirname( __DIR__ ).'/includes/class-map.php';
+require_once dirname( __DIR__ ).'/includes/class-map-model.php';
+require_once dirname( __DIR__ ).'/includes/class-map-view.php';
+require_once dirname( __DIR__ ).'/component-google-maps.php';

tests/unit/testGoogleMaps.php

Spacing +5 added lines, -5 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\Tests\TestCase;
@@ -20,8 +20,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() );
 
     }
 
@@ -30,7 +30,7 @@ 
      */
     public function testGeocoder() {
         
-        $this->assertInstanceOf('Clubdeuce\WPLib\Components\GoogleMaps\Geocoder', Google_Maps::geocoder());
+        $this->assertInstanceOf( 'Clubdeuce\WPLib\Components\GoogleMaps\Geocoder', Google_Maps::geocoder() );
 
     }
 
@@ -41,7 +41,7 @@ 
 
         $map = Google_Maps::make_new_map();
 
-        $this->assertInstanceOf('Clubdeuce\WPLib\Components\GoogleMaps\Map', $map);
+        $this->assertInstanceOf( 'Clubdeuce\WPLib\Components\GoogleMaps\Map', $map );
 
     }
 

tests/unit/testMapModel.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
     
     public function setUp() {
         
-        $this->_model = new Map_Model(array('center' => $this->_center, 'markers' => array('foo', 'bar', 'baz'), 'zoom' => 12));
+        $this->_model = new Map_Model( array( 'center' => $this->_center, 'markers' => array( 'foo', 'bar', 'baz' ), 'zoom' => 12 ) );
         
     }
 
@@ -34,7 +34,7 @@ 
      */
     public function testCenter() {
 
-        $this->assertEquals($this->_center, $this->_model->center());
+        $this->assertEquals( $this->_center, $this->_model->center() );
 
     }
 
@@ -43,7 +43,7 @@ 
      */
     public function testMarkers() {
 
-        $this->assertEquals(array('foo','bar','baz'), $this->_model->markers());
+        $this->assertEquals( array( 'foo', 'bar', 'baz' ), $this->_model->markers() );
 
     }
 
@@ -53,9 +53,9 @@ 
      */
     function testAddMarker() {
 
-        $this->_model->add_marker('foobar');
+        $this->_model->add_marker( 'foobar' );
 
-        $this->assertContains('foobar', $this->_model->markers());
+        $this->assertContains( 'foobar', $this->_model->markers() );
 
     }
 
@@ -65,12 +65,12 @@ 
      */
     function testAddMarkers() {
 
-        $this->_model->add_markers(array('foobar', 'barbaz'));
+        $this->_model->add_markers( array( 'foobar', 'barbaz' ) );
 
         $markers = $this->_model->markers();
 
-        $this->assertContains('foobar', $markers);
-        $this->assertContains('barbaz', $markers);
+        $this->assertContains( 'foobar', $markers );
+        $this->assertContains( 'barbaz', $markers );
 
     }
 
@@ -78,6 +78,6 @@ 
      * @covers ::zoom
      */
     public function testZoom() {
-        $this->assertEquals(12, $this->_model->zoom());
+        $this->assertEquals( 12, $this->_model->zoom() );
     }
 }

tests/unit/testGeocoder.php

Spacing +27 added lines, -27 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,53 +35,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(TEST_INCLUDES_DIR . '/geocoder-response.json'), true));
+        $location = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_make_location', json_decode( file_get_contents( TEST_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']);
     }
 
@@ -89,8 +89,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

includes/class-map-model.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
      */
     function html_id() {
 
-        if ( ! isset( $this->_html_id ) ) {
+        if ( !isset($this->_html_id) ) {
             $this->_html_id = sprintf( 'map-%1$s', md5( serialize( array( $this->center(), $this->markers() ) ) ) );
         }
 

includes/class-map-view.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
         $markers      = $this->_make_markers_args();
         $info_windows = $this->_make_info_windows();
 
-        require dirname( __DIR__) . '/templates/map-view.php';
+        require dirname( __DIR__ ).'/templates/map-view.php';
 
     }
 
@@ -46,7 +46,7 @@ 
         /**
          * @var Marker $marker
          */
-        foreach( $this->item->markers() as $marker ) {
+        foreach ( $this->item->markers() as $marker ) {
             $windows[] = array(
                 'content'      => $marker->info_window()->content(),
                 'pixel_offset' => $marker->info_window()->pixel_offset(),