Laravel 10 support (#78)

* Bump dependencies for Laravel 10

* Update GitHub Actions for Laravel 10

* Format composer.json

* Fix for Laravel 10

* Drop support for Laravel 8 and php 8.0

* fixes

* fixes

* Fix test

* Support Laravel 9

* Support Laravel 10 only

* Use getters

---------

Co-authored-by: Shift <[email protected]>
Co-authored-by: Matan Yadaev <[email protected]>

Author: 3 people

.github/workflows/pest.yml

@@ -11,16 +11,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.2, 8.1, 8.0 ]
-        laravel: [ 9.*, 8.* ]
+        php: [ 8.2, 8.1 ]
+        laravel: [ 10.* ]
         db: [ 'mysql:8.0', 'mysql:5.7', 'mariadb:10.9' ]
-        # dependency-version: [prefer-lowest, prefer-stable]
-        dependency-version: [ prefer-stable ]
+        dependency-version: [ prefer-lowest, prefer-stable ]
         include:
-          - laravel: 8.*
-            testbench: ^6.23
-          - laravel: 9.*
-            testbench: 7.*
+          - laravel: 10.*
+            testbench: ^8.0
 
     services:
       db:

.github/workflows/phpstan.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.2, 8.1, 8.0 ]
+        php: [ 8.2, 8.1 ]
 
     steps:
       - name: Checkout code

README.md

@@ -8,6 +8,8 @@
 
 Laravel package to work with spatial data types and functions.
 
+The latest version (v3) supports Laravel 10 and PHP 8.1+. For Laravel 8 or 9, and PHP 8.0, use v2.
+
 This package supports MySQL v8, MySQL v5.7, and MariaDB v10.
 
 ## Installation

composer.json

@@ -10,20 +10,20 @@
     }
   ],
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "ext-json": "*",
     "ext-pdo": "*",
-    "laravel/framework": "^8.0|^9.0",
+    "laravel/framework": "^10.0",
     "phayes/geophp": "^1.2"
   },
   "require-dev": {
-    "doctrine/dbal": "^3.4",
-    "friendsofphp/php-cs-fixer": "^3.0",
-    "jubeki/laravel-code-style": "^1.0",
-    "nunomaduro/larastan": "^1.0|^2.0",
-    "orchestra/testbench": "^6.23|^7.0",
-    "pestphp/pest": "^1.21",
-    "pestphp/pest-plugin-laravel": "^1.2"
+    "doctrine/dbal": "^3.5.3",
+    "friendsofphp/php-cs-fixer": "^3.14.3",
+    "jubeki/laravel-code-style": "^1.2",
+    "nunomaduro/larastan": "^1.0|^2.4",
+    "orchestra/testbench": "^8.0",
+    "pestphp/pest": "^1.22.4",
+    "pestphp/pest-plugin-laravel": "^1.4"
   },
   "autoload": {
     "psr-4": {

phpstan.neon

@@ -1,21 +1,21 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+  - ./vendor/nunomaduro/larastan/extension.neon
 parameters:
-    paths:
-        - src
-        - tests
-    level: max
-    ignoreErrors:
-    		-
-    			message: '#^Call to an undefined method Pest\\Expectation\|Pest\\Support\\Extendable\:\:.+\(\)\.$#'
-    			path: tests/*.php
-    		-
-    			message: '#^Access to an undefined property Pest\\Expectation\|Pest\\Support\\Extendable\:\:\$.+\.$#'
-    			path: tests/*.php
-    		-
-    			message: '#^Call to an undefined method Pest\\Expectation\:\:.+\(\)\.$#'
-    			path: tests/*.php
-    excludePaths:
-        - ./src/Factory.php
-    checkMissingIterableValueType: true
-    checkGenericClassInNonGenericObjectType: false
+  paths:
+    - src
+    - tests
+  excludePaths:
+    - src/Factory.php
+  level: max
+  ignoreErrors:
+    -
+      message: '#^Call to an undefined method Pest\\Expectation\|Pest\\Support\\Extendable\:\:.+\(\)\.$#'
+      path: tests/*.php
+    -
+      message: '#^Access to an undefined property Pest\\Expectation\|Pest\\Support\\Extendable\:\:\$.+\.$#'
+      path: tests/*.php
+    -
+      message: '#^Call to an undefined method Pest\\Expectation\:\:.+\(\)\.$#'
+      path: tests/*.php
+  checkMissingIterableValueType: true
+  checkGenericClassInNonGenericObjectType: false

src/GeometryCast.php

@@ -5,8 +5,9 @@
 namespace MatanYadaev\EloquentSpatial;
 
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Contracts\Database\Query\Expression as ExpressionContract;
+use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Query\Expression;
 use InvalidArgumentException;
 use MatanYadaev\EloquentSpatial\Objects\Geometry;
 
@@ -26,7 +27,7 @@ public function __construct(string $className)
   /**
    * @param  Model  $model
    * @param  string  $key
-   * @param  string|Expression|null  $value
+   * @param  string|ExpressionContract|null  $value
    * @param  array<string, mixed>  $attributes
    * @return Geometry|null
    */
@@ -36,9 +37,9 @@ public function get($model, string $key, $value, array $attributes): ?Geometry
       return null;
     }
 
-    if ($value instanceof Expression) {
-      $wkt = $this->extractWktFromExpression($value);
-      $srid = $this->extractSridFromExpression($value);
+    if ($value instanceof ExpressionContract) {
+      $wkt = $this->extractWktFromExpression($value, $model->getConnection());
+      $srid = $this->extractSridFromExpression($value, $model->getConnection());
 
       return $this->className::fromWkt($wkt, $srid);
     }
@@ -51,18 +52,18 @@ public function get($model, string $key, $value, array $attributes): ?Geometry
    * @param  string  $key
    * @param  Geometry|mixed|null  $value
    * @param  array<string, mixed>  $attributes
-   * @return Expression|null
+   * @return ExpressionContract|null
    *
    * @throws InvalidArgumentException
    */
-  public function set($model, string $key, $value, array $attributes): Expression|null
+  public function set($model, string $key, $value, array $attributes): ExpressionContract|null
   {
     if (! $value) {
       return null;
     }
 
     if (is_array($value)) {
-        $value = Geometry::fromArray($value);
+      $value = Geometry::fromArray($value);
     }
 
     if (! ($value instanceof $this->className)) {
@@ -75,16 +76,22 @@ public function set($model, string $key, $value, array $attributes): Expression|
     return $value->toSqlExpression($model->getConnection());
   }
 
-  private function extractWktFromExpression(Expression $expression): string
+  private function extractWktFromExpression(ExpressionContract $expression, Connection $connection): string
   {
-    preg_match('/ST_GeomFromText\(\'(.+)\', .+(, .+)?\)/', (string) $expression, $match);
+    $grammar = $connection->getQueryGrammar();
+    $expressionValue = $expression->getValue($grammar);
+
+    preg_match('/ST_GeomFromText\(\'(.+)\', .+(, .+)?\)/', (string) $expressionValue, $match);
 
     return $match[1];
   }
 
-  private function extractSridFromExpression(Expression $expression): int
+  private function extractSridFromExpression(ExpressionContract $expression, Connection $connection): int
   {
-    preg_match('/ST_GeomFromText\(\'.+\', (.+)(, .+)?\)/', (string) $expression, $match);
+    $grammar = $connection->getQueryGrammar();
+    $expressionValue = $expression->getValue($grammar);
+
+    preg_match('/ST_GeomFromText\(\'.+\', (.+)(, .+)?\)/', (string) $expressionValue, $match);
 
     return (int) $match[1];
   }

src/Objects/Geometry.php

@@ -7,10 +7,10 @@
 use geoPHP;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Contracts\Database\Query\Expression as ExpressionContract;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Database\ConnectionInterface;
-use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Traits\Macroable;
 use InvalidArgumentException;
@@ -210,9 +210,9 @@ public static function castUsing(array $arguments): CastsAttributes
 
   /**
    * @param  ConnectionInterface  $connection
-   * @return Expression
+   * @return ExpressionContract
    */
-  public function toSqlExpression(ConnectionInterface $connection): Expression
+  public function toSqlExpression(ConnectionInterface $connection): ExpressionContract
   {
     $wkt = $this->toWkt();