@@ -6,6 +6,6 @@ |
||
6 | 6 | * Class Marker_View |
7 | 7 | * @package Clubdeuce\WPLib\Components\GoogleMaps |
8 | 8 | */ |
9 | -class Marker_View extends \WPLib_View_Base { |
|
9 | +class Marker_View extends \WPLib_View_Base { |
|
10 | 10 | |
11 | 11 | } |
12 | 12 | \ No newline at end of file |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | |
34 | 34 | public function setUp() { |
35 | - $this->_location = new Location([ |
|
35 | + $this->_location = new Location( [ |
|
36 | 36 | 'address' => '123 Anywhere Street Anywhere NY', |
37 | 37 | 'formatted_address' => '123 Anywhere Street, Anywhere, NY 12345 USA', |
38 | 38 | 'latitude' => 100.12345, |
@@ -40,15 +40,15 @@ discard block |
||
40 | 40 | 'place_id' => 'foobar', |
41 | 41 | 'types' => ['foo', 'bar'], |
42 | 42 | 'viewport' => ['northeast' => ['lat' => 100.12346, 'lng' => -100.12344], 'southwest' => ['lat' => 100.12344, 'lng' => -100.12346]], |
43 | - ]); |
|
43 | + ] ); |
|
44 | 44 | |
45 | - $this->_geocoder = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder'); |
|
46 | - $this->_geocoder->shouldReceive('geocode')->andReturn($this->_location); |
|
45 | + $this->_geocoder = \Mockery::mock( '\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder' ); |
|
46 | + $this->_geocoder->shouldReceive( 'geocode' )->andReturn( $this->_location ); |
|
47 | 47 | |
48 | - $this->_model = new Marker_Model([ |
|
48 | + $this->_model = new Marker_Model( [ |
|
49 | 49 | 'address' => $this->_address, |
50 | 50 | 'geocoder' => $this->_geocoder, |
51 | - ]); |
|
51 | + ] ); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
@@ -56,14 +56,14 @@ discard block |
||
56 | 56 | * @covers ::latitude |
57 | 57 | */ |
58 | 58 | public function testLatitude() { |
59 | - $this->assertEquals(100.12345, $this->_model->latitude()); |
|
59 | + $this->assertEquals( 100.12345, $this->_model->latitude() ); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
63 | 63 | * @covers ::location |
64 | 64 | */ |
65 | 65 | public function testLocation() { |
66 | - $this->assertEquals($this->_location, $this->_model->location()); |
|
66 | + $this->assertEquals( $this->_location, $this->_model->location() ); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @covers ::_geocoder |
78 | 78 | */ |
79 | 79 | public function testGeocoder() { |
80 | - $this->assertEquals($this->_geocoder, $this->reflectionMethodInvoke($this->_model, '_geocoder')); |
|
80 | + $this->assertEquals( $this->_geocoder, $this->reflectionMethodInvoke( $this->_model, '_geocoder' ) ); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -85,6 +85,6 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public function testCreateGeocoder() { |
87 | 87 | $marker_model = new Marker_Model(); |
88 | - $this->assertInstanceOf('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder', $this->reflectionMethodInvoke($marker_model, '_geocoder')); |
|
88 | + $this->assertInstanceOf( '\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder', $this->reflectionMethodInvoke( $marker_model, '_geocoder' ) ); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | \ No newline at end of file |
@@ -23,7 +23,7 @@ |
||
23 | 23 | function make_args() { |
24 | 24 | return array( |
25 | 25 | 'center' => $this->center(), |
26 | - 'zoom' => (int)$this->zoom(), |
|
26 | + 'zoom' => ( int ) $this->zoom(), |
|
27 | 27 | ); |
28 | 28 | } |
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -12,10 +12,10 @@ |
||
12 | 12 | <script type="application/javascript"> |
13 | 13 | jQuery(document).ready(function() { |
14 | 14 | generate_map( |
15 | - "<?php echo esc_js($map_id); ?>", |
|
16 | - <?php echo json_encode($map_params); ?>, |
|
17 | - <?php echo json_encode($markers); ?>, |
|
18 | - <?php echo json_encode($info_windows); ?> |
|
15 | + "<?php echo esc_js( $map_id ); ?>", |
|
16 | + <?php echo json_encode( $map_params ); ?>, |
|
17 | + <?php echo json_encode( $markers ); ?>, |
|
18 | + <?php echo json_encode( $info_windows ); ?> |
|
19 | 19 | ); |
20 | 20 | }); |
21 | 21 | </script> |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | public function setUp() { |
27 | 27 | |
28 | - $this->_model = new Map_Model(array('center' => $this->_center, 'markers' => array('foo', 'bar', 'baz'), 'zoom' => 12)); |
|
28 | + $this->_model = new Map_Model( array( 'center' => $this->_center, 'markers' => array( 'foo', 'bar', 'baz' ), 'zoom' => 12 ) ); |
|
29 | 29 | |
30 | 30 | } |
31 | 31 | |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function testCenter() { |
36 | 36 | |
37 | - $this->assertEquals($this->_center, $this->_model->center()); |
|
37 | + $this->assertEquals( $this->_center, $this->_model->center() ); |
|
38 | 38 | |
39 | 39 | } |
40 | 40 | |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function testMarkers() { |
45 | 45 | |
46 | - $this->assertEquals(array('foo','bar','baz'), $this->_model->markers()); |
|
46 | + $this->assertEquals( array( 'foo', 'bar', 'baz' ), $this->_model->markers() ); |
|
47 | 47 | |
48 | 48 | } |
49 | 49 | |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | */ |
54 | 54 | function testAddMarker() { |
55 | 55 | |
56 | - $this->_model->add_marker('foobar'); |
|
56 | + $this->_model->add_marker( 'foobar' ); |
|
57 | 57 | |
58 | - $this->assertContains('foobar', $this->_model->markers()); |
|
58 | + $this->assertContains( 'foobar', $this->_model->markers() ); |
|
59 | 59 | |
60 | 60 | } |
61 | 61 | |
@@ -65,12 +65,12 @@ discard block |
||
65 | 65 | */ |
66 | 66 | function testAddMarkers() { |
67 | 67 | |
68 | - $this->_model->add_markers(array('foobar', 'barbaz')); |
|
68 | + $this->_model->add_markers( array( 'foobar', 'barbaz' ) ); |
|
69 | 69 | |
70 | 70 | $markers = $this->_model->markers(); |
71 | 71 | |
72 | - $this->assertContains('foobar', $markers); |
|
73 | - $this->assertContains('barbaz', $markers); |
|
72 | + $this->assertContains( 'foobar', $markers ); |
|
73 | + $this->assertContains( 'barbaz', $markers ); |
|
74 | 74 | |
75 | 75 | } |
76 | 76 | |
@@ -78,6 +78,6 @@ discard block |
||
78 | 78 | * @covers ::zoom |
79 | 79 | */ |
80 | 80 | public function testZoom() { |
81 | - $this->assertEquals(12, $this->_model->zoom()); |
|
81 | + $this->assertEquals( 12, $this->_model->zoom() ); |
|
82 | 82 | } |
83 | 83 | } |
@@ -83,7 +83,7 @@ |
||
83 | 83 | */ |
84 | 84 | function html_id() { |
85 | 85 | |
86 | - if ( ! isset( $this->_html_id ) ) { |
|
86 | + if ( !isset($this->_html_id) ) { |
|
87 | 87 | $this->_html_id = sprintf( 'map-%1$s', md5( serialize( array( $this->center(), $this->markers() ) ) ) ); |
88 | 88 | } |
89 | 89 |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | function color() { |
40 | 40 | |
41 | - return (string)$this->_color; |
|
41 | + return ( string ) $this->_color; |
|
42 | 42 | |
43 | 43 | } |
44 | 44 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | function font_family() { |
49 | 49 | |
50 | - return (string)$this->_font_family; |
|
50 | + return ( string ) $this->_font_family; |
|
51 | 51 | |
52 | 52 | } |
53 | 53 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | function font_size() { |
58 | 58 | |
59 | - return (string)$this->_font_size; |
|
59 | + return ( string ) $this->_font_size; |
|
60 | 60 | |
61 | 61 | } |
62 | 62 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | function font_weight() { |
67 | 67 | |
68 | - return (string)$this->_font_weight; |
|
68 | + return ( string ) $this->_font_weight; |
|
69 | 69 | |
70 | 70 | } |
71 | 71 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | function text() { |
76 | 76 | |
77 | - return (string)$this->_text; |
|
77 | + return ( string ) $this->_text; |
|
78 | 78 | |
79 | 79 | } |
80 | 80 | |
@@ -101,10 +101,10 @@ discard block |
||
101 | 101 | ]; |
102 | 102 | |
103 | 103 | $args = array_filter( $args, function( $value ) { |
104 | - return ! is_null( $value ); |
|
104 | + return !is_null( $value ); |
|
105 | 105 | } ); |
106 | 106 | |
107 | - if ( empty( $args['text'] ) ) { |
|
107 | + if ( empty($args['text']) ) { |
|
108 | 108 | $args = ''; |
109 | 109 | } |
110 | 110 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | private $_location; |
20 | 20 | |
21 | 21 | public function setUp() { |
22 | - $this->_location = new Location_Model([ |
|
22 | + $this->_location = new Location_Model( [ |
|
23 | 23 | 'address' => '1600 Amphitheatre Parkway Mountain View CA', |
24 | 24 | 'formatted_address' => '1600 Amphitheatre Parkway, Mountain View, CA, 12345', |
25 | 25 | 'latitude' => 100.12345, |
@@ -33,21 +33,21 @@ discard block |
||
33 | 33 | * @covers ::__call |
34 | 34 | */ |
35 | 35 | public function testAddress() { |
36 | - $this->assertEquals('1600 Amphitheatre Parkway Mountain View CA', $this->_location->address()); |
|
36 | + $this->assertEquals( '1600 Amphitheatre Parkway Mountain View CA', $this->_location->address() ); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
40 | 40 | * @covers ::__call |
41 | 41 | */ |
42 | 42 | public function testFormattedAddress() { |
43 | - $this->assertEquals('1600 Amphitheatre Parkway, Mountain View, CA, 12345', $this->_location->formatted_address()); |
|
43 | + $this->assertEquals( '1600 Amphitheatre Parkway, Mountain View, CA, 12345', $this->_location->formatted_address() ); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
47 | 47 | * @covers ::__call |
48 | 48 | */ |
49 | 49 | public function testLatitude() { |
50 | - $this->assertEquals(100.12345, $this->_location->latitude()); |
|
50 | + $this->assertEquals( 100.12345, $this->_location->latitude() ); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | * @covers ::__call |
62 | 62 | */ |
63 | 63 | public function testPlaceId() { |
64 | - $this->assertEquals('foobar', $this->_location->place_id()); |
|
64 | + $this->assertEquals( 'foobar', $this->_location->place_id() ); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | /** |
68 | 68 | * @covers ::__call |
69 | 69 | */ |
70 | 70 | public function testViewport() { |
71 | - $this->assertEquals(['foo', 'bar'], $this->_location->viewport()); |
|
71 | + $this->assertEquals( ['foo', 'bar'], $this->_location->viewport() ); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | \ No newline at end of file |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | $markers = $this->_make_markers_args(); |
19 | 19 | $info_windows = $this->_make_info_windows(); |
20 | 20 | |
21 | - require dirname( __DIR__) . '/templates/map-view.php'; |
|
21 | + require dirname( __DIR__ ).'/templates/map-view.php'; |
|
22 | 22 | |
23 | 23 | } |
24 | 24 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | /** |
47 | 47 | * @var Marker $marker |
48 | 48 | */ |
49 | - foreach( $this->item->markers() as $marker ) { |
|
49 | + foreach ( $this->item->markers() as $marker ) { |
|
50 | 50 | $info_window = $marker->info_window(); |
51 | 51 | $windows[] = array( |
52 | 52 | 'content' => $info_window->content(), |