dynamic / silverstripe-locator

tests/LocationTest.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
     {
         $location = $this->objFromFixture('Location', 'dynamic');
 
-        $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
+        $coords = ((int) $location->Lat != 0 && (int) $location->Lng != 0) ? 'true' : 'false';
 
         $this->assertEquals($coords, $location->getCoords());
     }

code/objects/Location.php

Doc Comments +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
     }
 
     /**
-     * @return bool|string
+     * @return string|false
      */
     public function EmailAddress()
     {

code/pages/Locator.php

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * @param array $filterAny
      * @param array $exclude
      * @param null|callable $callback
-     * @return DataList|ArrayList
+     * @return DataList
      */
     public static function get_locations(
         $filter = [],

Spacing +16 added lines, -16 removed lines

@@ -247,7 +247,7 @@ 
 
                 Requirements::css('locator/css/map.css');
                 Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-                Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
+                Requirements::javascript('https://maps.google.com/maps/api/js?key='.$key);
                 Requirements::javascript('locator/thirdparty/jquery-store-locator-plugin/assets/js/libs/handlebars.min.js');
                 Requirements::javascript('locator/thirdparty/jquery-store-locator-plugin/assets/js/plugins/storeLocator/jquery.storelocator.js');
 
@@ -265,10 +265,10 @@ 
                 if ($limit < 1) $limit = -1;
                 if ($this->data()->AutoGeocode) {
                     $load = $featuredInList || $defaultCoords != '' || $isChrome
-                        ? 'autoGeocode: false, fullMapStart: true, storeLimit: ' . $limit . ', maxDistance: true,'
+                        ? 'autoGeocode: false, fullMapStart: true, storeLimit: '.$limit.', maxDistance: true,'
                         : 'autoGeocode: true, fullMapStart: false,';
                 } else {
-                    $load = 'autoGeocode: false, fullMapStart: true, storeLimit: ' . $limit . ', maxDistance: true,';
+                    $load = 'autoGeocode: false, fullMapStart: true, storeLimit: '.$limit.', maxDistance: true,';
                 }
 
                 $listTemplatePath = Config::inst()->get('Locator_Controller', 'list_template_path');
@@ -284,7 +284,7 @@ 
                 unset($vars['url']);
                 $url = '';
                 if (count($vars)) {
-                    $url .= '?' . http_build_query($vars);
+                    $url .= '?'.http_build_query($vars);
                 }
                 $link = Controller::join_links($this->AbsoluteLink(), 'xml.xml', $url);
                 $link = Controller::join_links($this->Link(), 'xml.xml', $url);
@@ -297,19 +297,19 @@ 
                 Requirements::customScript("
                 $(function(){
                     $('#map-container').storeLocator({
-                        " . $load . "
-                        dataLocation: '" . $link . "',
-                        listTemplatePath: '" . $listTemplatePath . "',
-                        infowindowTemplatePath: '" . $infowindowTemplatePath . "',
+                        " . $load."
+                        dataLocation: '" . $link."',
+                        listTemplatePath: '" . $listTemplatePath."',
+                        infowindowTemplatePath: '" . $infowindowTemplatePath."',
                         originMarker: true,
-                        //" . $modal . ",
-                        " . $featured . ",
+                        //" . $modal.",
+                        " . $featured.",
                         slideMap: false,
                         distanceAlert: -1,
-                        " . $kilometer . ",
-                        " . $defaultCoords . "
-                        mapID: '" . $map_id . "',
-                        locationList: '" . $list_class . "',
+                        " . $kilometer.",
+                        " . $defaultCoords."
+                        mapID: '" . $map_id."',
+                        locationList: '" . $list_class."',
                         mapSettings: {
 							zoom: 12,
 							mapTypeId: google.maps.MapTypeId.ROADMAP,
@@ -414,8 +414,8 @@ 
         }
 
         if (Config::inst()->get('LocatorForm', 'show_radius')) {
-            if ($radius = (int)$request->getVar('Radius')) {
-                $locations = $locations->filterByCallback(function ($location) use (&$radius) {
+            if ($radius = (int) $request->getVar('Radius')) {
+                $locations = $locations->filterByCallback(function($location) use (&$radius) {
                     return $location->distance <= $radius;
                 });
             }

Braces +3 added lines, -1 removed lines

@@ -262,7 +262,9 @@
                 // map config based on user input in Settings tab
                 // AutoGeocode or Full Map
                 $limit = Config::inst()->get('Locator_Controller', 'limit');
-                if ($limit < 1) $limit = -1;
+                if ($limit < 1) {
+                    $limit = -1;
+                }
                 if ($this->data()->AutoGeocode) {
                     $load = $featuredInList || $defaultCoords != '' || $isChrome
                         ? 'autoGeocode: false, fullMapStart: true, storeLimit: ' . $limit . ', maxDistance: true,'

code/extensions/DistanceDataExtension.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
     /**
      * @param SQLQuery $query
      */
-    public function augmentSQL(SQLQuery &$query)
+    public function augmentSQL(SQLQuery & $query)
     {
         $address = Controller::curr()->getRequest()->getVar('Address');
         if ($this->owner->hasMethod('updateAddressValue')) {
@@ -19,7 +19,7 @@ 
 
             $query
                 ->addSelect(array(
-                    '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance',
+                    '( 3959 * acos( cos( radians('.$Lat.') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians('.$Lng.') ) + sin( radians('.$Lat.') ) * sin( radians( `Lat` ) ) ) ) AS distance',
                 ));
         }
     }

code/bulkloader/LocationCsvBulkLoader.php

Indentation +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
      * @var array
      */
     public $relationCallbacks = array(
-       'Category.Name' => array(
-           'relationname' => 'Category',
-           'callback' => 'getCategoryByName',
+        'Category.Name' => array(
+            'relationname' => 'Category',
+            'callback' => 'getCategoryByName',
         ),
     );
 

code/form/LocatorForm.php

Braces +3 added lines, -1 removed lines

@@ -74,7 +74,9 @@
     {
         $validator = parent::getValidator();
         if (empty($validator)) {
-            if (!$this->validator instanceof RequiredFields) $this->setValidator(RequiredFields::create('Address'));
+            if (!$this->validator instanceof RequiredFields) {
+                $this->setValidator(RequiredFields::create('Address'));
+            }
             $validator = $this->validator;
         }
         $this->extend('updateRequiredFields', $validator);