latest code from source repo

.github/workflows/run-tests.yml

@@ -0,0 +1,41 @@
+name: Test Suite
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php: [8.1 8.0 7.4]
+        release: [stable, lowest]
+
+    services:
+      postgres:
+        image: kartoza/postgis:12.1
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DBNAME: postgres
+        ports:
+          - 5432/tcp
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache/files
+          key: php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: pecl
+          extensions: mbstring, dom, fileinfo, pgsql, intl
+          coverage: ${{ matrix.coverage }}
+      - run: composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-${{ matrix.release }}
+      - run: |
+          vendor/bin/phpunit

README.md

@@ -1,44 +1,86 @@
-Laravel postgis extension
-=========================
+Laravel Wrapper for PostgreSQL's Geo-Extension Postgis
+======================================================
 
-[![Build Status](https://travis-ci.org/njbarrett/laravel-postgis.svg?branch=master)](https://travis-ci.org/njbarrett/laravel-postgis.svg?branch=master)
-[![Code Climate](https://codeclimate.com/github/njbarrett/laravel-postgis/badges/gpa.svg)](https://codeclimate.com/github/njbarrett/laravel-postgis)
-[![Coverage Status](https://coveralls.io/repos/github/njbarrett/laravel-postgis/badge.svg?branch=master)](https://coveralls.io/github/njbarrett/laravel-postgis?branch=master)
+![Build Status](https://github.com/mstaack/laravel-postgis/workflows/Test%20Suite/badge.svg)
+
+
+# DEPRECATED
+Consider using: https://github.com/clickbar/laravel-magellan
 
 ## Features
 
- * Work with geometry classes instead of arrays. (`$myModel->myPoint = new Point(1,2)`)
- * Adds helpers in migrations. (`$table->polygon('myColumn')`)
+ * Work with geometry classes instead of arrays.
+```php
+$model->myPoint = new Point(1,2);  //lat, long
+```
+
+* Adds helpers in migrations.
+```php
+$table->polygon('myColumn');
+```
+
+## Warning
+This Package has been moved to a new owner and aims for Laravel 6/7/8/9  and PHP 7 support only soon!
 
-### Future plans
+Replace all your references to the new namespace:
+```
+MStaack\LaravelPostgis
+```
 
- * Geometry functions on the geometry classes (contains(), equals(), distance(), etc… (HELP!))
+Thanks to :
+- https://github.com/njbarrett
+- https://github.com/phaza
+- https://github.com/mirzap
 
-## Versions
-- Use 2.* for Laravel 5.1.*
-- Use 3.* for Laravel 5.2.*
-- Use 3.* for Laravel 5.3.*
-- Use 3.* for Laravel 5.4.*
-- Use 3.* for Laravel 5.5.*
+Fluent in Laravel Packages and Postgres/Postgis? Consider contributing! We are looking for anyone that wants to help out!
 
 ## Installation
+- Use 3.* for Laravel 5
 
-    composer require phaza/laravel-postgis
+```bash
+composer require "mstaack/laravel-postgis:3.*"
+```
+
+- Use 5.* for Laravel 6/7/8/9
+```bash
+composer require mstaack/laravel-postgis
+```
 
 For laravel >=5.5 that's all. This package supports Laravel new [Package Discovery](https://laravel.com/docs/5.5/packages#package-discovery).
 
 If you are using Laravel < 5.5, you also need to add the DatabaseServiceProvider to your `config/app.php` file.
+```php
+'MStaack\LaravelPostgis\DatabaseServiceProvider',
+```
+## Usage
 
-    'Phaza\LaravelPostgis\DatabaseServiceProvider',
+To start, ensure you have PostGIS enabled in your database - you can do this in a Laravel migration or manually via SQL.
 
+### Enable PostGIS via a Laravel migration
 
-## Usage
+You need to publish the migration to easily enable PostGIS:
 
-First of all, make sure to enable postgis.
+```sh
+php artisan vendor:publish --provider="MStaack\LaravelPostgis\DatabaseServiceProvider" --tag="migrations"
+```
+
+And then you run the migrations:
+
+```sh
+php artisan migrate
+```
+
+These methods are safe to use and will only enable / disable the PostGIS extension if relevant - they won't cause an error if PostGIS is / isn't already enabled.
+
+If you prefer, you can use the `enablePostgis()` method which will throw an error if PostGIS is already enabled, and the `disablePostgis()` method twhich will throw an error if PostGIS isn't enabled.
+
+### Enable PostGIS manually
+
+Use an SQL client to connect to your database and run the following command:
 
     CREATE EXTENSION postgis;
 
-To verify that postgis is enabled
+To verify that PostGIS is enabled you can run:
 
     SELECT postgis_full_version();
 
@@ -56,7 +98,7 @@ Open the created migrations with your editor.
 
 ```PHP
 use Illuminate\Database\Migrations\Migration;
-use Phaza\LaravelPostgis\Schema\Blueprint;
+use MStaack\LaravelPostgis\Schema\Blueprint;
 
 class CreateLocationsTable extends Migration {
 
@@ -118,8 +160,8 @@ what attributes/columns on your model are to be considered geometry objects. By
 
 ```PHP
 use Illuminate\Database\Eloquent\Model;
-use Phaza\LaravelPostgis\Eloquent\PostgisTrait;
-use Phaza\LaravelPostgis\Geometries\Point;
+use MStaack\LaravelPostgis\Eloquent\PostgisTrait;
+use MStaack\LaravelPostgis\Geometries\Point;
 
 class Location extends Model
 {
@@ -137,7 +179,7 @@ class Location extends Model
         'polygon',
         'polygon2'
     ];
-    
+
     protected $postgisTypes = [
         'location' => [
             'geomtype' => 'geography',
@@ -195,3 +237,22 @@ Available geometry classes:
  * Polygon
  * MultiPolygon
  * GeometryCollection
+
+## Publishing config
+A configuration file exists for overriding default values. To add to your project, run:
+
+```sh
+php artisan vendor:publish --provider="MStaack\LaravelPostgis\DatabaseServiceProvider" --tag="postgis"
+```
+### Coordinate precision
+The precision of stored/displayed coordinated can be customised in the config.
+
+
+```php
+# config/postgis.php
+return [
+    ...
+    'precision' => 6,
+];
+```
+See http://wiki.gis.com/wiki/index.php/Decimal_degrees#Accuracy for more information

composer.json

@@ -1,29 +1,27 @@
 {
-    "name": "phaza/laravel-postgis",
+    "name": "mstaack/laravel-postgis",
     "description": "Postgis extensions for laravel. Aims to make it easy to work with geometries from laravel models",
     "require": {
-        "php": ">=5.5",
-        "illuminate/database": "^5.2",
+        "php": ">=7.1",
+        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
         "geo-io/wkb-parser": "^1.0",
         "jmikola/geojson": "^1.0",
-        "bosnadev/database": "~0.16"
+        "bosnadev/database": "^0.21|dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "mockery/mockery": "0.9.*",
-        "codeclimate/php-test-reporter": "~0.3",
-        "illuminate/pagination": "~5.0"
+        "illuminate/pagination": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "phpunit/phpunit": ">=8.5.23",
+        "mockery/mockery": "^1.3"
     },
     "autoload": {
         "psr-4": {
-            "Phaza\\LaravelPostgis\\": "src/"
+            "MStaack\\LaravelPostgis\\": "src/"
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/BaseTestCase.php",
-            "tests/Stubs/"
-        ]
+        "psr-4": {
+            "MStaack\\LaravelPostgis\\Tests\\": "tests/"
+        }
     },
     "license": "MIT",
     "authors": [
@@ -34,13 +32,20 @@
         {
             "name": "Nicholas Barrett",
             "email": "[email protected]"
+        },
+        {
+            "name": "Max Matteo Staack",
+            "email": "[email protected]"
         }
     ],
     "extra": {
         "laravel": {
             "providers": [
-                "Phaza\\LaravelPostgis\\DatabaseServiceProvider"
+                "MStaack\\LaravelPostgis\\DatabaseServiceProvider"
             ]
         }
+    },
+    "scripts": {
+        "test": "./vendor/bin/phpunit"
     }
 }

config/postgis.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'schema' => 'public',  // Schema for the Postgis extension,
+    'precision' => 6, // Control precision of floats in stringifyFloat
+];

database/migrations/enable_postgis.php.stub

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class EnablePostgis extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::enablePostgisIfNotExists();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::disablePostgisIfExists();
+    }
+}

phpunit.xml

@@ -7,7 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         stopOnFailure="true"
          syntaxCheck="true"
          verbose="true">
     <testsuites>

src/Connectors/ConnectionFactory.php

@@ -1,7 +1,8 @@
-<?php namespace Phaza\LaravelPostgis\Connectors;
+<?php namespace MStaack\LaravelPostgis\Connectors;
 
+use Illuminate\Database\Connection;
 use PDO;
-use Phaza\LaravelPostgis\PostgisConnection;
+use MStaack\LaravelPostgis\PostgisConnection;
 
 class ConnectionFactory extends \Bosnadev\Database\Connectors\ConnectionFactory
 {
@@ -15,8 +16,8 @@ class ConnectionFactory extends \Bosnadev\Database\Connectors\ConnectionFactory
      */
     protected function createConnection($driver, $connection, $database, $prefix = '', array $config = [])
     {
-        if ($this->container->bound($key = "db.connection.{$driver}")) {
-            return $this->container->make($key, [$connection, $database, $prefix, $config]);
+        if ($resolver = Connection::getResolver($driver)) {
+            return $resolver($connection, $database, $prefix, $config);
         }
 
         if ($driver === 'pgsql') {

src/DatabaseServiceProvider.php

@@ -1,15 +1,28 @@
-<?php namespace Phaza\LaravelPostgis;
+<?php
+
+namespace MStaack\LaravelPostgis;
 
-use Illuminate\Database\DatabaseManager;
-use Phaza\LaravelPostgis\Connectors\ConnectionFactory;
 use Bosnadev\Database\DatabaseServiceProvider as PostgresDatabaseServiceProvider;
+use Illuminate\Database\DatabaseManager;
+use MStaack\LaravelPostgis\Connectors\ConnectionFactory;
 
-/**
- * Class DatabaseServiceProvider
- * @package Phaza\LaravelPostgis
- */
 class DatabaseServiceProvider extends PostgresDatabaseServiceProvider
 {
+    public function boot()
+    {
+        // Load the config
+        $config_path = __DIR__ . '/../config/postgis.php';
+        $this->publishes([$config_path => config_path('postgis.php')], 'postgis');
+
+        if (!class_exists('EnablePostgis')) {
+            $this->publishes([
+                __DIR__ . '/../database/migrations/enable_postgis.php.stub' => database_path('migrations/'.date('Y_m_d_His', time()).'_enable_postgis.php'),
+            ], 'migrations');
+        }
+
+        $this->mergeConfigFrom($config_path, 'postgis');
+    }
+
     /**
      * Register the service provider.
      *