few patches and update for laravel 10x/9x compatability

README.md

@@ -28,14 +28,14 @@ From the command line:
 php artisan make:migration create_places_table
 ```
 
-Then edit the migration you just created by adding at least one spatial data field. For Laravel versions prior to 5.5, you can use the Blueprint provided by this package (Fleetbase\Database\Spatial\Schema\Blueprint):
+Then edit the migration you just created by adding at least one spatial data field. For Laravel versions prior to 5.5, you can use the Blueprint provided by this package (Fleetbase\LaravelMysqlSpatial\Schema\Blueprint):
 
 ```php
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 // For Laravel < 5.5
-// use Fleetbase\Database\Spatial\Schema\Blueprint;
+// use Fleetbase\LaravelMysqlSpatial\Schema\Blueprint;
 
 class CreatePlacesTable extends Migration {
 
@@ -103,11 +103,11 @@ Then edit the model you just created. It must use the `SpatialTrait` and define
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Fleetbase\Database\Spatial\Eloquent\SpatialTrait;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 /**
- * @property \Fleetbase\Database\Spatial\Types\Point   $location
- * @property \Fleetbase\Database\Spatial\Types\Polygon $area
+ * @property \Fleetbase\LaravelMysqlSpatial\Types\Point   $location
+ * @property \Fleetbase\LaravelMysqlSpatial\Types\Polygon $area
  */
 class Place extends Model
 {
@@ -127,9 +127,9 @@ class Place extends Model
 ### Saving a model
 
 ```php
-use Fleetbase\Database\Spatial\Types\Point;
-use Fleetbase\Database\Spatial\Types\Polygon;
-use Fleetbase\Database\Spatial\Types\LineString;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Polygon;
+use Fleetbase\LaravelMysqlSpatial\Types\LineString;
 
 $place1 = new Place();
 $place1->name = 'Empire State Building';
@@ -152,9 +152,9 @@ $place1->save();
 Or if your database fields were created with a specific SRID:
 
 ```php
-use Fleetbase\Database\Spatial\Types\Point;
-use Fleetbase\Database\Spatial\Types\Polygon;
-use Fleetbase\Database\Spatial\Types\LineString;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Polygon;
+use Fleetbase\LaravelMysqlSpatial\Types\LineString;
 
 $place1 = new Place();
 $place1->name = 'Empire State Building';
@@ -190,7 +190,7 @@ $lng = $place2->location->getLng();	// -73.9878441
 
 ### Available Geometry classes
 
-| Fleetbase\Database\Spatial\Types                             | OpenGIS Class                                                |
+| Fleetbase\LaravelMysqlSpatial\Types                             | OpenGIS Class                                                |
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
 | `Point($lat, $lng, $srid = 0)`                               | [Point](https://dev.mysql.com/doc/refman/8.0/en/gis-class-point.html) |
 | `MultiPoint(Point[], $srid = 0)`                             | [MultiPoint](https://dev.mysql.com/doc/refman/8.0/en/gis-class-multipoint.html) |
@@ -204,7 +204,7 @@ Check out the [Class diagram](https://user-images.githubusercontent.com/1837678/
 
 ### Using Geometry classes
 
-In order for your Eloquent Model to handle the Geometry classes, it must use the `Fleetbase\Database\Spatial\Eloquent\SpatialTrait` trait and define a `protected` property `$spatialFields`  as an array of MySQL Spatial Data Type column names (example in [Quickstart](#user-content-create-a-model)).
+In order for your Eloquent Model to handle the Geometry classes, it must use the `Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait` trait and define a `protected` property `$spatialFields`  as an array of MySQL Spatial Data Type column names (example in [Quickstart](#user-content-create-a-model)).
 
 #### IteratorAggregate and ArrayAccess
 
@@ -302,11 +302,11 @@ Available scopes:
 
 ## Migrations
 
-For Laravel versions prior to 5.5, you can use the Blueprint provided with this package: `Fleetbase\Database\Spatial\Schema\Blueprint`.
+For Laravel versions prior to 5.5, you can use the Blueprint provided with this package: `Fleetbase\LaravelMysqlSpatial\Schema\Blueprint`.
 
 ```php
 use Illuminate\Database\Migrations\Migration;
-use Fleetbase\Database\Spatial\Schema\Blueprint;
+use Fleetbase\LaravelMysqlSpatial\Schema\Blueprint;
 
 class CreatePlacesTable extends Migration {
     // ...

composer.json

@@ -20,23 +20,23 @@
         }
     ],
     "require": {
-        "php": ">=7.3|>=8.0",
+        "php": "^8.0",
         "ext-pdo": "*",
         "ext-json": "*",
-        "illuminate/database": "^8.0|^9.0|^10.0",
+        "illuminate/database": "^9.0|^10.0",
         "geo-io/wkb-parser": "^1.0",
         "jmikola/geojson": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.5",
+        "phpunit/phpunit": "^10.0",
         "laravel/laravel": "^8.0",
-        "doctrine/dbal": "^2.5",
-        "laravel/browser-kit-testing": "^2.0",
-        "mockery/mockery": "^1.3"
+        "doctrine/dbal": "^3.4",
+        "laravel/browser-kit-testing": "^7.0",
+        "mockery/mockery": "^1.5"
     },
     "autoload": {
         "psr-4": {
-            "Fleetbase\\Database\\Spatial\\": "src/"
+            "Fleetbase\\LaravelMysqlSpatial\\": "src/"
         }
     },
     "autoload-dev" : {
@@ -48,7 +48,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Fleetbase\\Database\\Spatial\\SpatialServiceProvider"
+                "Fleetbase\\LaravelMysqlSpatial\\SpatialServiceProvider"
             ]
         }
     }

src/Connectors/ConnectionFactory.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Connectors;
+namespace Fleetbase\LaravelMysqlSpatial\Connectors;
 
-use Fleetbase\Database\Spatial\MysqlConnection;
+use Fleetbase\LaravelMysqlSpatial\MysqlConnection;
 use Illuminate\Database\Connectors\ConnectionFactory as IlluminateConnectionFactory;
 use PDO;
 

src/Doctrine/Geometry.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Doctrine/GeometryCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Doctrine/LineString.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Doctrine/MultiLineString.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Doctrine/MultiPoint.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Doctrine/MultiPolygon.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Doctrine/Point.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Doctrine/Polygon.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Doctrine;
+namespace Fleetbase\LaravelMysqlSpatial\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

src/Eloquent/BaseBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Eloquent;
+namespace Fleetbase\LaravelMysqlSpatial\Eloquent;
 
 use Illuminate\Database\Query\Builder as QueryBuilder;
 

src/Eloquent/Builder.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Eloquent;
+namespace Fleetbase\LaravelMysqlSpatial\Eloquent;
 
-use Fleetbase\Database\Spatial\Types\GeometryInterface;
+use Fleetbase\LaravelMysqlSpatial\Types\GeometryInterface;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 class Builder extends EloquentBuilder

src/Eloquent/SpatialExpression.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Eloquent;
+namespace Fleetbase\LaravelMysqlSpatial\Eloquent;
 
 use Illuminate\Database\Query\Expression;
 

src/Eloquent/SpatialTrait.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Eloquent;
+namespace Fleetbase\LaravelMysqlSpatial\Eloquent;
 
-use Fleetbase\Database\Spatial\Exceptions\SpatialFieldsNotDefinedException;
-use Fleetbase\Database\Spatial\Exceptions\UnknownSpatialFunctionException;
-use Fleetbase\Database\Spatial\Exceptions\UnknownSpatialRelationFunction;
-use Fleetbase\Database\Spatial\Types\Geometry;
-use Fleetbase\Database\Spatial\Types\GeometryInterface;
+use Fleetbase\LaravelMysqlSpatial\Exceptions\SpatialFieldsNotDefinedException;
+use Fleetbase\LaravelMysqlSpatial\Exceptions\UnknownSpatialFunctionException;
+use Fleetbase\LaravelMysqlSpatial\Exceptions\UnknownSpatialRelationFunction;
+use Fleetbase\LaravelMysqlSpatial\Types\Geometry;
+use Fleetbase\LaravelMysqlSpatial\Types\GeometryInterface;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 /**
@@ -63,7 +63,7 @@ trait SpatialTrait
      *
      * @param \Illuminate\Database\Query\Builder $query
      *
-     * @return \Fleetbase\Database\Spatial\Eloquent\Builder
+     * @return \Fleetbase\LaravelMysqlSpatial\Eloquent\Builder
      */
     public function newEloquentBuilder($query)
     {

src/Exceptions/InvalidGeoJsonException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Exceptions;
+namespace Fleetbase\LaravelMysqlSpatial\Exceptions;
 
 class InvalidGeoJsonException extends \RuntimeException
 {

src/Exceptions/SpatialFieldsNotDefinedException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Exceptions;
+namespace Fleetbase\LaravelMysqlSpatial\Exceptions;
 
 class SpatialFieldsNotDefinedException extends \RuntimeException
 {

src/Exceptions/UnknownSpatialFunctionException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Exceptions;
+namespace Fleetbase\LaravelMysqlSpatial\Exceptions;
 
 class UnknownSpatialFunctionException extends \RuntimeException
 {

src/Exceptions/UnknownSpatialRelationFunction.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Exceptions;
+namespace Fleetbase\LaravelMysqlSpatial\Exceptions;
 
 class UnknownSpatialRelationFunction extends \RuntimeException
 {

src/Exceptions/UnknownWKTTypeException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Exceptions;
+namespace Fleetbase\LaravelMysqlSpatial\Exceptions;
 
 class UnknownWKTTypeException extends \RuntimeException
 {

src/MysqlConnection.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\Database\Spatial;
 
 use Doctrine\DBAL\Types\Type as DoctrineType;
-use Fleetbase\Database\Spatial\Schema\Builder;
-use Fleetbase\Database\Spatial\Schema\Grammars\MySqlGrammar;
+use Fleetbase\LaravelMysqlSpatial\Schema\Builder;
+use Fleetbase\LaravelMysqlSpatial\Schema\Grammars\MySqlGrammar;
 use Illuminate\Database\MySqlConnection as IlluminateMySqlConnection;
 
 class MysqlConnection extends IlluminateMySqlConnection

src/Schema/Blueprint.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Schema;
+namespace Fleetbase\LaravelMysqlSpatial\Schema;
 
 use Illuminate\Database\Schema\Blueprint as IlluminateBlueprint;
 

src/Schema/Builder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Schema;
+namespace Fleetbase\LaravelMysqlSpatial\Schema;
 
 use Closure;
 use Illuminate\Database\Schema\MySqlBuilder;

src/Schema/Grammars/MySqlGrammar.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Schema\Grammars;
+namespace Fleetbase\LaravelMysqlSpatial\Schema\Grammars;
 
-use Fleetbase\Database\Spatial\Schema\Blueprint;
+use Fleetbase\LaravelMysqlSpatial\Schema\Blueprint;
 use Illuminate\Database\Schema\Grammars\MySqlGrammar as IlluminateMySqlGrammar;
 use Illuminate\Support\Fluent;
 

src/SpatialServiceProvider.php

@@ -3,15 +3,15 @@
 namespace Fleetbase\Database\Spatial;
 
 use Doctrine\DBAL\Types\Type as DoctrineType;
-use Fleetbase\Database\Spatial\Connectors\ConnectionFactory;
-use Fleetbase\Database\Spatial\Doctrine\Geometry;
-use Fleetbase\Database\Spatial\Doctrine\GeometryCollection;
-use Fleetbase\Database\Spatial\Doctrine\LineString;
-use Fleetbase\Database\Spatial\Doctrine\MultiLineString;
-use Fleetbase\Database\Spatial\Doctrine\MultiPoint;
-use Fleetbase\Database\Spatial\Doctrine\MultiPolygon;
-use Fleetbase\Database\Spatial\Doctrine\Point;
-use Fleetbase\Database\Spatial\Doctrine\Polygon;
+use Fleetbase\LaravelMysqlSpatial\Connectors\ConnectionFactory;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\Geometry;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\GeometryCollection;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\LineString;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\MultiLineString;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\MultiPoint;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\MultiPolygon;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\Point;
+use Fleetbase\LaravelMysqlSpatial\Doctrine\Polygon;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Database\DatabaseServiceProvider;
 

src/Types/Factory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Types;
+namespace Fleetbase\LaravelMysqlSpatial\Types;
 
 class Factory implements \GeoIO\Factory
 {

src/Types/Geometry.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Fleetbase\Database\Spatial\Types;
+namespace Fleetbase\LaravelMysqlSpatial\Types;
 
 use GeoIO\WKB\Parser\Parser;
 use GeoJson\GeoJson;
-use Fleetbase\Database\Spatial\Exceptions\UnknownWKTTypeException;
+use Fleetbase\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
 use Illuminate\Contracts\Support\Jsonable;
 
 abstract class Geometry implements GeometryInterface, Jsonable, \JsonSerializable
@@ -108,7 +108,7 @@ public static function fromJson($geoJson)
             $geoJson = $geoJson->getGeometry();
         }
 
-        $type = '\Fleetbase\Database\Spatial\Types\\'.$geoJson->getType();
+        $type = '\Fleetbase\LaravelMysqlSpatial\Types\\'.$geoJson->getType();
 
         return $type::fromJson($geoJson);
     }