clubdeuce / wplib-olm-google-maps

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

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>

includes/class-marker-label-model.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
      */
     function color() {
 
-        return (string)$this->_color;
+        return ( string ) $this->_color;
 
     }
 
@@ -47,7 +47,7 @@ 
      */
     function font_family() {
 
-        return (string)$this->_font_family;
+        return ( string ) $this->_font_family;
 
     }
 
@@ -56,7 +56,7 @@ 
      */
     function font_size() {
 
-        return (string)$this->_font_size;
+        return ( string ) $this->_font_size;
 
     }
 
@@ -65,7 +65,7 @@ 
      */
     function font_weight() {
 
-        return (string)$this->_font_weight;
+        return ( string ) $this->_font_weight;
 
     }
 
@@ -74,7 +74,7 @@ 
      */
     function text() {
 
-        return (string)$this->_text;
+        return ( string ) $this->_text;
 
     }
 
@@ -101,10 +101,10 @@ 
         ];
 
         $args = array_filter( $args, function( $value ) {
-            return ! is_null( $value );
+            return !is_null( $value );
         } );
 
-        if ( empty( $args['text'] ) ) {
+        if ( empty($args['text']) ) {
             $args = '';
         }
 

tests/unit/testLocationModel.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,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,
@@ -33,21 +33,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() );
     }
 
     /**
@@ -61,13 +61,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

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 ) {
             $info_window = $marker->info_window();
             $windows[]   = array(
                 'content'      => $info_window->content(),

includes/class-geocoder.php

Doc Comments +1 added lines, -1 removed lines

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

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 );
         }

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

Doc Comments +3 added lines, -3 removed lines

@@ -33,8 +33,8 @@ 
     }
 
     /**
-     * @param $class
-     * @param $method
+     * @param \Clubdeuce\WPLib\Components\GoogleMaps\Marker_Model $class
+     * @param string $method
      * @return mixed
      */
     public function reflectionMethodInvoke( $class, $method )
@@ -49,7 +49,7 @@ 
 
     /**
      * @param $class
-     * @param $method
+     * @param string $method
      * @param $args
      * @return mixed
      */

Indentation +38 added lines, -38 removed lines

@@ -64,56 +64,56 @@
         return $reflection->invoke( $class, $args );
     }
 
-	/**
-	 * @return string
-	 */
+    /**
+     * @return string
+     */
     protected function get_sample_response() {
 
-    	return file_get_contents( __DIR__ . '/geocoder-response.json' );
+        return file_get_contents( __DIR__ . '/geocoder-response.json' );
 
     }
 
-	/**
-	 * @return Mock
-	 */
+    /**
+     * @return Mock
+     */
     protected function getMockGeocoder() {
 
-	    /**
-	     * @var Mock $geocoder
-	     */
-    	$geocoder = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder');
-	    $geocoder->shouldReceive('geocode')->andReturn($this->getMockLocation());
+        /**
+         * @var Mock $geocoder
+         */
+        $geocoder = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder');
+        $geocoder->shouldReceive('geocode')->andReturn($this->getMockLocation());
 
-	    return $geocoder;
+        return $geocoder;
     }
 
-	/**
-	 * @return Mock
-	 */
+    /**
+     * @return Mock
+     */
     protected function getMockLocation() {
-	    /**
-	     * @var Mock $location
-	     */
-    	$location = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMape\Location');
-	    $location->shouldReceive('address')->andReturn('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA');
-	    $location->shouldReceive('formatted_address')->andReturn('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA');
-	    $location->shouldReceive('state')->andReturn('CA');
-	    $location->shouldReceive('zip_code')->andReturn('94043');
-	    $location->shouldReceive('latitude')->andReturn(37.4224764);
-	    $location->shouldReceive('longitude')->andReturn(-122.0842499);
-	    $location->shouldReceive('place_id')->andReturn('ChIJ2eUgeAK6j4ARbn5u_wAGqWA');
-	    $location->shouldReceive('type')->andReturn('street_address');
-	    $location->shouldReceive('viewport')->andReturn(array(
-	    	'northeast' => array(
-			    'lat'   => 37.4238253802915,
-			    'lng'   => -122.0829009197085
-		    ),
-		    'sourhwest' => array(
-			    'lat'   => 37.4211274197085,
+        /**
+         * @var Mock $location
+         */
+        $location = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMape\Location');
+        $location->shouldReceive('address')->andReturn('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA');
+        $location->shouldReceive('formatted_address')->andReturn('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA');
+        $location->shouldReceive('state')->andReturn('CA');
+        $location->shouldReceive('zip_code')->andReturn('94043');
+        $location->shouldReceive('latitude')->andReturn(37.4224764);
+        $location->shouldReceive('longitude')->andReturn(-122.0842499);
+        $location->shouldReceive('place_id')->andReturn('ChIJ2eUgeAK6j4ARbn5u_wAGqWA');
+        $location->shouldReceive('type')->andReturn('street_address');
+        $location->shouldReceive('viewport')->andReturn(array(
+            'northeast' => array(
+                'lat'   => 37.4238253802915,
+                'lng'   => -122.0829009197085
+            ),
+            'sourhwest' => array(
+                'lat'   => 37.4211274197085,
                 'lng'   => -122.0855988802915
-		    )
-	    ));
+            )
+        ));
 
-	    return $location;
+        return $location;
     }
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -42,7 +42,7 @@ 
     {
         $reflection = new \ReflectionMethod( $class, $method );
         $reflection->setAccessible( true );
-        if (is_string($class)) {
+        if ( is_string( $class ) ) {
             $class = null;
         }
         return $reflection->invoke( $class );
@@ -58,7 +58,7 @@ 
     {
         $reflection = new \ReflectionMethod( $class, $method );
         $reflection->setAccessible( true );
-        if (is_string($class)) {
+        if ( is_string( $class ) ) {
             $class = null;
         }
         return $reflection->invoke( $class, $args );
@@ -69,7 +69,7 @@ 
 	 */
     protected function get_sample_response() {
 
-    	return file_get_contents( __DIR__ . '/geocoder-response.json' );
+    	return file_get_contents( __DIR__.'/geocoder-response.json' );
 
     }
 
@@ -81,8 +81,8 @@ 
 	    /**
 	     * @var Mock $geocoder
 	     */
-    	$geocoder = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder');
-	    $geocoder->shouldReceive('geocode')->andReturn($this->getMockLocation());
+    	$geocoder = \Mockery::mock( '\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder' );
+	    $geocoder->shouldReceive( 'geocode' )->andReturn( $this->getMockLocation() );
 
 	    return $geocoder;
     }
@@ -94,16 +94,16 @@ 
 	    /**
 	     * @var Mock $location
 	     */
-    	$location = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMape\Location');
-	    $location->shouldReceive('address')->andReturn('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA');
-	    $location->shouldReceive('formatted_address')->andReturn('1600 Amphitheatre Parkway, Mountain View, CA 94043, USA');
-	    $location->shouldReceive('state')->andReturn('CA');
-	    $location->shouldReceive('zip_code')->andReturn('94043');
-	    $location->shouldReceive('latitude')->andReturn(37.4224764);
-	    $location->shouldReceive('longitude')->andReturn(-122.0842499);
-	    $location->shouldReceive('place_id')->andReturn('ChIJ2eUgeAK6j4ARbn5u_wAGqWA');
-	    $location->shouldReceive('type')->andReturn('street_address');
-	    $location->shouldReceive('viewport')->andReturn(array(
+    	$location = \Mockery::mock( '\Clubdeuce\WPLib\Components\GoogleMape\Location' );
+	    $location->shouldReceive( 'address' )->andReturn( '1600 Amphitheatre Parkway, Mountain View, CA 94043, USA' );
+	    $location->shouldReceive( 'formatted_address' )->andReturn( '1600 Amphitheatre Parkway, Mountain View, CA 94043, USA' );
+	    $location->shouldReceive( 'state' )->andReturn( 'CA' );
+	    $location->shouldReceive( 'zip_code' )->andReturn( '94043' );
+	    $location->shouldReceive( 'latitude' )->andReturn( 37.4224764 );
+	    $location->shouldReceive( 'longitude' )->andReturn(-122.0842499);
+	    $location->shouldReceive( 'place_id' )->andReturn( 'ChIJ2eUgeAK6j4ARbn5u_wAGqWA' );
+	    $location->shouldReceive( 'type' )->andReturn( 'street_address' );
+	    $location->shouldReceive( 'viewport' )->andReturn( array(
 	    	'northeast' => array(
 			    'lat'   => 37.4238253802915,
 			    'lng'   => -122.0829009197085
@@ -112,7 +112,7 @@ 
 			    'lat'   => 37.4211274197085,
                 'lng'   => -122.0855988802915
 		    )
-	    ));
+	    ) );
 
 	    return $location;
     }

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',