REFACTOR - remove AddressData and Distance DataExtensions

migrate to dynamic/silverstripe-geocoder

closes dynamic#171

.travis.yml

@@ -1,55 +1,33 @@
-
 language: php
 
-sudo: false
-
-addons:
-  apt:
-    packages:
-      - tidy
-
-before_install:
-  - pip install --user codecov
-
 env:
   global:
-    - DB=MYSQL CORE_RELEASE=4.0
-    - MODULE_PATH=locator
-    - COVERAGE=0
+    - COMPOSER_ROOT_VERSION=4.0.x-dev
+    - CODECOV_TOKEN=
+    - SCRUT_TOKEN=
 
 matrix:
   include:
-    - php: 7.0
-      env: DB=SQLITE
-    - php: 7.0
-      env: DB=PGSQL
-    - php: 7.0
-      env: COVERAGE=1
     - php: 5.6
-  allow_failures:
+      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=SQLITE
-
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.1
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
 
 before_script:
+  # Init PHP
   - phpenv rehash
-  - composer self-update || true
-  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
-  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
-  - cd ~/builds/ss
-  - mv "$MODULE_PATH/phpunit.xml.dist" .
+  - phpenv config-rm xdebug.ini
+  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-#Execute tests with or without coverage
-script:
-  # Execute tests with no coverage.  This is the fastest option
-  - "if [ \"$COVERAGE\" = \"0\" ]; then vendor/bin/phpunit $MODULE_PATH/tests/; fi"
+  # Install composer dependencies
+  - composer require --prefer-dist --no-update silverstripe-themes/simple:~3.2
+  - composer update --no-suggest --prefer-dist
 
-  # Execute tests with coverage.  Do this for a small
-  - "if [ \"$COVERAGE\" = \"1\" ]; then vendor/bin/phpunit --coverage-clover=coverage.clover $MODULE_PATH/tests/; fi"
+script:
+  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml && wget https://scrutinizer-ci.com/ocular.phar; fi
 
-# Upload code coverage when tests pass
 after_success:
-  - "if [ \"$COVERAGE\" = \"1\" ]; then mv coverage.clover ~/build/$TRAVIS_REPO_SLUG/; fi"
-  - cd ~/build/$TRAVIS_REPO_SLUG
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - "if [ \"$COVERAGE\" = \"1\" ]; then travis_retry codecov && travis_retry php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi"
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -t $CODECOV_TOKEN && travis_retry php ocular.phar code-coverage:upload --format=php-clover --access-token=$SCRUT_TOKEN coverage.xml; fi

_config/config.yml

@@ -3,6 +3,6 @@ Name: locator
 ---
 Dynamic\Locator\Location:
   extensions:
-    - Dynamic\Locator\DistanceDataExtension
-    - Dynamic\Locator\AddressDataExtension
+    - Dynamic\SilverStripeGeocoder\DistanceDataExtension
+    - Dynamic\SilverStripeGeocoder\AddressDataExtension
     - SilverStripe\Versioned\Versioned('Stage','Live')

composer.json

@@ -20,12 +20,17 @@
     }
   ],
   "require": {
-    "silverstripe/framework": "^4.0",
-    "silverstripe/cms": "^4.0",
+    "silverstripe/recipe-cms": "^1.0",
     "muskie9/data-to-arraylist": "^2.0",
     "dynamic/silverstripe-geocoder": "^1.0",
     "symbiote/silverstripe-gridfieldextensions": "^3.0"
   },
+  "require-dev": {
+    "phpunit/PHPUnit": "^5.7"
+  },
+  "config": {
+    "process-timeout": 600
+  },
   "suggest": {
     "unclecheese/betterbuttons": "Adds new form actions and buttons to GridField detail form for usability enhancements.",
     "unclecheese/bootstrap-forms": "Allows the creation of forms compatible with the Twitter Bootstrap CSS framework in SilverStripe."

phpunit.xml.dist

@@ -1,13 +1,13 @@
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="cms/tests/bootstrap.php" colors="true">
     <testsuite name="locator">
-        <directory>locator/tests</directory>
+        <directory>tests</directory>
     </testsuite>
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">locator/src/</directory>
+            <directory suffix=".php">src/</directory>
             <exclude>
-                <directory suffix=".php">locator/tests/</directory>
+                <directory suffix=".php">tests/</directory>
             </exclude>
         </whitelist>
     </filter>