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 +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
 
         $return = $this->_make_request( $url );
 
-        if ( ! is_wp_error( $return ) ) {
+        if ( !is_wp_error( $return ) ) {
             $return = $this->_parse_response( $return );
         }
 
@@ -79,8 +79,8 @@ 
 
         $return = array();
 
-        if ( isset( $response['results'][0]['geometry']['location'] ) ) {
-            $return['lat']  = $response['results'][0]['geometry']['location']['lat'];
+        if ( isset($response['results'][0]['geometry']['location']) ) {
+            $return['lat'] = $response['results'][0]['geometry']['location']['lat'];
             $return['lng'] = $response['results'][0]['geometry']['location']['lng'];
         }
 
@@ -120,7 +120,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/integration/testGeocoder.php

Spacing +15 added lines, -15 removed lines

@@ -18,48 +18,48 @@
     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 );
     }
 
     /**
      * @covers ::geocode
      */
     public function testGeocode() {
-        $result = $this->_geocoder->geocode('1600 Amphitheatre Parkway, Mountain View, CA');
+        $result = $this->_geocoder->geocode( '1600 Amphitheatre Parkway, Mountain View, CA' );
 
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('lat', $result);
-        $this->assertArrayHasKey('lng', $result);
+        $this->assertInternalType( 'array', $result );
+        $this->assertArrayHasKey( 'lat', $result );
+        $this->assertArrayHasKey( 'lng', $result );
     }
 }

tests/unit/testGeocoder.php

Spacing +14 added lines, -14 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,46 +34,46 @@ 
      * @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 ::_parse_response
      */
     public function testParseResponse() {
-        $response = $this->reflectionMethodInvokeArgs($this->_geocoder, '_parse_response', json_decode(file_get_contents(INCLUDES_DIR . '/geocoder-response.json'), true));
+        $response = $this->reflectionMethodInvokeArgs( $this->_geocoder, '_parse_response', json_decode( file_get_contents( INCLUDES_DIR.'/geocoder-response.json' ), true ) );
 
-        $this->assertInternalType('array', $response);
-        $this->assertArrayHasKey('lat', $response);
-        $this->assertArrayHasKey('lng', $response);
+        $this->assertInternalType( 'array', $response );
+        $this->assertArrayHasKey( 'lat', $response );
+        $this->assertArrayHasKey( 'lng', $response );
     }
 
     /**
      * @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/testMarkerModel.php

Spacing +8 added lines, -8 removed lines

@@ -34,13 +34,13 @@ 
     private $_latlng = ['lat' => 100.2345325, 'lng' => -45.23423423567];
 
     public function setUp() {
-        $this->_geocoder = \Mockery::mock('\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder');
-        $this->_geocoder->shouldReceive('geocode')->andReturn($this->_latlng);
+        $this->_geocoder = \Mockery::mock( '\Clubdeuce\WPLib\Components\GoogleMaps\Geocoder' );
+        $this->_geocoder->shouldReceive( 'geocode' )->andReturn( $this->_latlng );
 
-        $this->_model = new Marker_Model([
+        $this->_model = new Marker_Model( [
             'address'  => $this->_address,
             'geocoder' => $this->_geocoder,
-        ]);
+        ] );
     }
 
 
@@ -50,15 +50,15 @@ 
     public function testLatLngObject() {
         $latlng = $this->_model->latlng_object();
 
-        $this->assertJson($latlng);
-        $this->assertEquals(json_encode($this->_latlng), $latlng);
+        $this->assertJson( $latlng );
+        $this->assertEquals( json_encode( $this->_latlng ), $latlng );
     }
 
     /**
      * @covers ::_geocoder
      */
     public function testGeocoder() {
-        $this->assertEquals($this->_geocoder, $this->reflectionMethodInvoke($this->_model, '_geocoder'));
+        $this->assertEquals( $this->_geocoder, $this->reflectionMethodInvoke( $this->_model, '_geocoder' ) );
     }
 
     /**
@@ -66,6 +66,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

tests/bootstrap.php

Spacing +12 added lines, -12 removed lines

@@ -1,26 +1,26 @@
 <?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-marker-model.php';
+require_once dirname( __DIR__ ).'/includes/class-geocoder.php';
+require_once dirname( __DIR__ ).'/includes/class-marker-model.php';

includes/class-marker-model.php

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
     protected $_latlng;
 
     function latlng_object() {
-        if (empty($this->_latlng)) {
-            $this->_latlng   = $this->_geocoder()->geocode($this->_address);
+        if ( empty($this->_latlng) ) {
+            $this->_latlng = $this->_geocoder()->geocode( $this->_address );
         }
 
         return json_encode( $this->_latlng );
@@ -37,7 +37,7 @@ 
      * @return Geocoder
      */
     private function _geocoder() {
-        if (! is_object($this->_geocoder)) {
+        if ( !is_object( $this->_geocoder ) ) {
             $this->_geocoder = new Geocoder();
         }
 

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