Merge pull request #134 from jsirish/refactor/namespacing

SS4 namespacing update
dynamic · Dec 16, 2016 · 486554f · 486554f
2 parents b93fb94 + a3402b6
commit 486554f
Show file tree

Hide file tree

Showing 13 changed files with 210 additions and 120 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,30 +7,24 @@ addons:
     packages:
       - tidy
 
-php:
-  - 7.0
-
 before_install:
   - pip install --user codecov
 
 env:
   global:
-    - DB=MYSQL CORE_RELEASE=3.4
+    - DB=MYSQL CORE_RELEASE=4.0
     - MODULE_PATH=locator
     - COVERAGE=0
 
 matrix:
   include:
-      - php: 5.6
-        env: DB=MYSQL COVERAGE=1
-      - php: 5.6
-        env: DB=PGSQL
-      - php: 5.6
-        env: DB=SQLITE
-      - php: hhvm
-        env: DB=MYSQL
-  allow_failures:
-      - php: 7.0
+    - php: 5.6
+      env: DB=PGSQL
+    - php: 5.6
+      env: DB=SQLITE
+    - php: 5.6
+      env: COVERAGE=1
+    - php: 7.0
 
 
 before_script:

diff --git a/code/admin/LocationAdmin.php b/code/admin/LocationAdmin.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Dynamic\Locator;
+
+use SilverStripe\Admin\ModelAdmin;
+
 /**
  * Class LocationAdmin
  */
@@ -10,16 +14,16 @@ class LocationAdmin extends ModelAdmin
      * @var array
      */
     private static $managed_models = array(
-        'Location',
-        'LocationCategory',
+        'Dynamic\\Locator\\Location',
+        'Dynamic\\Locator\\LocationCategory',
     );
 
     /**
      * @var array
      */
     private static $model_importers = array(
-        'Location' => 'LocationCsvBulkLoader',
-        'LocationCategory' => 'CsvBulkLoader',
+        'Dynamic\\Locator\\Location' => 'Dynamic\\Locator\\LocationCsvBulkLoader',
+        'Dynamic\\Locator\\LocationCategory' => 'SilverStripe\\Dev\\CsvBulkLoader',
     );
 
     /**

diff --git a/code/bulkloader/LocationCsvBulkLoader.php b/code/bulkloader/LocationCsvBulkLoader.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace Dynamic\Locator;
+
+use SilverStripe\Dev\CsvBulkLoader,
+    SilverStripe\Core\Convert;
+
 /**
  * Class LocationCsvBulkLoader
  */
@@ -38,7 +43,7 @@ class LocationCsvBulkLoader extends CsvBulkLoader
      * @param $obj
      * @param $val
      * @param $record
-     * @return DataObject|static
+     * @return \SilverStripe\ORM\DataObject|static
      */
     public static function getCategoryByName(&$obj, $val, $record)
     {

diff --git a/code/extensions/DistanceDataExtension.php b/code/extensions/DistanceDataExtension.php
@@ -1,26 +1,36 @@
 <?php
 
+namespace Dynamic\Locator;
+
+use SilverStripe\ORM\DataExtension,
+    SilverStripe\ORM\Queries\SQLSelect,
+    SilverStripe\ORM\DataQuery,
+    SilverStripe\Control\Controller;
+
 class DistanceDataExtension extends DataExtension
 {
     /**
-     * @param SQLQuery $query
+     * @param SQLSelect $query
+     * @param DataQuery|null $dataQuery
      */
-    public function augmentSQL(SQLQuery &$query)
+    public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
     {
         $address = Controller::curr()->getRequest()->getVar('Address');
         if ($this->owner->hasMethod('updateAddressValue')) {
             $address = $this->owner->updateAddressValue($address);
         }
-        if ($address) { // on frontend
-            $coords = GoogleGeocoding::address_to_point($address);
+        if (class_exists('GoogleGeocoding')) {
+            if ($address) { // on frontend
+                $coords = GoogleGeocoding::address_to_point($address);
 
-            $Lat = $coords['lat'];
-            $Lng = $coords['lng'];
+                $Lat = $coords['lat'];
+                $Lng = $coords['lng'];
 
-            $query
-                ->addSelect(array(
-                    '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance',
-                ));
+                $query
+                    ->addSelect(array(
+                        '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance',
+                    ));
+            }
         }
     }
 }
diff --git a/code/form/LocatorForm.php b/code/form/LocatorForm.php
@@ -1,5 +1,15 @@
 <?php
 
+namespace Dynamic\Locator;
+
+use SilverStripe\Forms\Form,
+    SilverStripe\Forms\FieldList,
+    SilverStripe\Forms\TextField,
+    SilverStripe\Forms\DropdownField,
+    SilverStripe\Forms\FormAction,
+    SilverStripe\Forms\RequiredFields,
+    SilverStripe\Control\Controller;
+
 /**
  * Class LocatorForm
  */

diff --git a/code/objects/Location.php b/code/objects/Location.php
@@ -1,5 +1,20 @@
 <?php
 
+namespace Dynamic\Locator;
+
+use SilverStripe\ORM\DataObject,
+    SilverStripe\Security\PermissionProvider,
+    SilverStripe\Forms\FieldList,
+    SilverStripe\Forms\Tab,
+    SilverStripe\Forms\TabSet,
+    SilverStripe\Forms\HeaderField,
+    SilverStripe\Forms\TextField,
+    SilverStripe\Forms\EmailField,
+    SilverStripe\Forms\DropdownField,
+    SilverStripe\Forms\CheckboxField,
+    SilverStripe\Security\Permission,
+    SilverStripe\Dev\Deprecation;
+
 /**
  * Class Location
  *
@@ -29,13 +44,21 @@ class Location extends DataObject implements PermissionProvider
         'EmailAddress' => 'Varchar(255)',
         'ShowInLocator' => 'Boolean',
         'Import_ID' => 'Int',
+        'Address'  => 'Varchar(255)',
+        'Suburb'   => 'Varchar(64)',
+        'State'    => 'Varchar(64)',
+        'Postcode' => 'Varchar(10)',
+        'Country'  => 'Varchar(2)',
+        'LatLngOverride' => 'Boolean',
+        'Lat' => 'Decimal(10,7)',
+        'Lng' => 'Decimal(10,7)',
     );
 
     /**
      * @var array
      */
     private static $has_one = array(
-        'Category' => 'LocationCategory',
+        'Category' => 'Dynamic\\Locator\\LocationCategory',
     );
 
     /**
@@ -175,7 +198,7 @@ public function getCMSFields()
         $this->extend('updateCMSFields', $fields);
 
         // override Suburb field name
-        $fields->dataFieldByName('Suburb')->setTitle('City');
+        //$fields->dataFieldByName('Suburb')->setTitle('City');
 
         $fields->removeByName(array(
             'Import_ID',
@@ -185,7 +208,7 @@ public function getCMSFields()
     }
 
     /**
-     * @return ValidationResult
+     * @return \SilverStripe\ORM\ValidationResult
      */
     public function validate()
     {
@@ -210,8 +233,7 @@ public function EmailAddress()
     }
 
     /**
-     * @param null|Member $member
-     *
+     * @param null $member
      * @return bool
      */
     public function canView($member = null)
@@ -220,7 +242,7 @@ public function canView($member = null)
     }
 
     /**
-     * @param null|Member $member
+     * @param null $member
      * @return bool|int
      */
     public function canEdit($member = null)
@@ -229,7 +251,7 @@ public function canEdit($member = null)
     }
 
     /**
-     * @param null|Member $member
+     * @param null $member
      * @return bool|int
      */
     public function canDelete($member = null)
@@ -238,10 +260,11 @@ public function canDelete($member = null)
     }
 
     /**
-     * @param null|Member $member
+     * @param null $member
+     * @param array $context
      * @return bool|int
      */
-    public function canCreate($member = null)
+    public function canCreate($member = null, $context = [])
     {
         return Permission::check('Location_CREATE', 'any', $member);
     }

diff --git a/code/objects/LocationCategory.php b/code/objects/LocationCategory.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Dynamic\Locator;
+
+use SilverStripe\ORM\DataObject;
+
 /**
  * Class LocationCategory
  *
@@ -21,14 +25,14 @@ class LocationCategory extends DataObject
      * @var array
      */
     private static $has_many = array(
-        'Locations' => 'Location',
+        'Locations' => 'Dynamic\\Locator\\LocationLocation',
     );
 
     /**
      * @var array
      */
     private static $belogs_many_many = array(
-        'Locators' => 'Locator',
+        'Locators' => 'Dynamic\\Locator\\Locator',
     );
 
     /**