From d43684229b25cc39c4176b220ab7146c9f7c1821 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue, 24 May 2016 13:39:18 +0100
Subject: [PATCH] Get phaza/laravel-postgis working again? Better travis config

---
 .travis.yml   | 15 +++++++++++++--
 composer.json |  6 ++++++
 composer.lock | 27 ++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87638d6c..cd687b56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ addons:
 services:
   - postgresql
 
+env:
+  global:
+    - setup=basic
+
 php:
   - 7.0
   - nightly
@@ -15,12 +19,19 @@ matrix:
   allow_failures:
     - php: nightly
 
+before_install:
+  - phpenv config-rm xdebug.ini
+  - travis_retry composer self-update --preview
+
+install:
+  - if [[ $setup = 'basic' ]];  then travis_retry composer install --no-interaction --prefer-dist; fi
+  - if [[ $setup = 'stable' ]]; then travis_retry composer update --no-interaction --prefer-dist --prefer-stable; fi
+  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --no-interaction --prefer-dist --prefer-lowest --prefer-stable; fi
+
 before_script:
   - psql -U travis -c 'create database travis_ci_test'
   - psql -U travis -d travis_ci_test -c 'create extension postgis'
   - cp .env.travis .env
-  - travis_retry composer self-update --preview
-  - travis_retry composer install --no-interaction
   - php artisan key:generate
   - php artisan migrate
   - php artisan db:seed
diff --git a/composer.json b/composer.json
index d03ad56f..f9969344 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,12 @@
         "barryvdh/laravel-debugbar": "~2.0",
         "filp/whoops": "~2.0"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/njbarrett/laravel-postgis"
+        }
+    ],
     "autoload": {
         "classmap": [
             "database"
diff --git a/composer.lock b/composer.lock
index 34f3e43b..906cbbba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "4525beccb6fc2efeada96db7dbbedd9f",
-    "content-hash": "b4fb100b154bd0655bee2f2edcca13eb",
+    "hash": "daf7804a781d9e4f7de63ae2da8dee9e",
+    "content-hash": "59a5ff5c293a0de8dbc63e7b8f0cf055",
     "packages": [
         {
             "name": "anahkiasen/underscore-php",
@@ -2104,12 +2104,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/njbarrett/laravel-postgis.git",
-                "reference": "1e1a0247fdc1e3310153468a73c67a961bdb454d"
+                "reference": "accec379af8ceba903ceb10df37beeb9bfb411cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/njbarrett/laravel-postgis/zipball/1e1a0247fdc1e3310153468a73c67a961bdb454d",
-                "reference": "1e1a0247fdc1e3310153468a73c67a961bdb454d",
+                "url": "https://api.github.com/repos/njbarrett/laravel-postgis/zipball/accec379af8ceba903ceb10df37beeb9bfb411cc",
+                "reference": "accec379af8ceba903ceb10df37beeb9bfb411cc",
                 "shasum": ""
             },
             "require": {
@@ -2131,7 +2131,12 @@
                     "Phaza\\LaravelPostgis\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "classmap": [
+                    "tests/BaseTestCase.php",
+                    "tests/Stubs/"
+                ]
+            },
             "license": [
                 "MIT"
             ],
@@ -2139,10 +2144,18 @@
                 {
                     "name": "Peter Haza",
                     "email": "peter.haza@gmail.com"
+                },
+                {
+                    "name": "Nicholas Barrett",
+                    "email": "njbarrett7@gmail.com"
                 }
             ],
             "description": "Postgis extensions for laravel. Aims to make it easy to work with geometries from laravel models",
-            "time": "2016-05-18 07:54:54"
+            "support": {
+                "source": "https://github.com/njbarrett/laravel-postgis/tree/master",
+                "issues": "https://github.com/njbarrett/laravel-postgis/issues"
+            },
+            "time": "2016-05-21 08:00:18"
         },
         {
             "name": "predis/predis",