v2.0.2: supports Laravel 11+ and PHP 8.2+

Author: asanikovich

.github/workflows/pest.yml

@@ -11,12 +11,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.2, 8.1 ]
-        laravel: [ 10.* ]
+        php: [ 8.1, 8.2, 8.3 ]
+        laravel: [ 10.*, 11.* ]
         db: [ 'mysql:8.0', 'mysql:5.7', 'mariadb:10.9' ]
         dependency-version: [ prefer-stable ]
         include:
-          - laravel: 10.*
+          - laravel: ${{ matrix.laravel }}
             testbench: ^8.0
 
     services:

.github/workflows/phpstan.yml

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

README.md

@@ -10,7 +10,7 @@
 
 **This Laravel package allows you to easily work with spatial data types and functions.**
 
-* v2 supports Laravel 10+ and PHP 8.1+
+* v2 supports Laravel 10,11 and PHP 8.1+
 * v1 supports Laravel 8,9 and PHP 8.1+
 
 This package supports MySQL v8 or v5.7, and MariaDB v10.

composer.json

@@ -13,16 +13,16 @@
         "php": "^8.1",
         "ext-json": "*",
         "ext-pdo": "*",
-        "laravel/framework": "^10.0",
+        "laravel/framework": "^10.0|^11.0",
         "phayes/geophp": "^1.2"
     },
     "require-dev": {
-        "doctrine/dbal": "^3.0",
+        "doctrine/dbal": "^3.0|^4.1",
         "laravel/pint": "^1.5",
-        "nunomaduro/larastan": "^1.0|^2.4",
-        "orchestra/testbench": "^8.0",
-        "pestphp/pest": "^1.0|^2.6",
-        "pestphp/pest-plugin-laravel": "^1.0|^2.0"
+        "larastan/larastan": "^1.0|^2.4",
+        "orchestra/testbench": "^8.0|^9.4",
+        "pestphp/pest": "^1.0|^2.6|^3.0",
+        "pestphp/pest-plugin-laravel": "^1.0|^2.0|^3.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-  - ./vendor/nunomaduro/larastan/extension.neon
+  - ./vendor/larastan/larastan/extension.neon
 parameters:
   paths:
     - src

src/Eloquent/HasSpatial.php

@@ -4,7 +4,7 @@
 
 use ASanikovich\LaravelSpatial\Geometry\Geometry;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Expression;
+use Illuminate\Contracts\Database\Query\Expression;
 
 /**
  * @method static withDistance(Expression|Geometry|string $column, Expression|Geometry|string $geometryOrColumn, string $alias = 'distance')

tests/Geometry/GeometryCollectionTest.php

@@ -373,7 +373,6 @@
 it('adds a macro toGeometryCollection', function (): void {
     Geometry::macro('getName', function (): string {
         /** @var Geometry $this */
-        // @phpstan-ignore-next-line
         return class_basename($this);
     });
 

tests/Geometry/LineStringTest.php

@@ -167,7 +167,6 @@
 it('adds a macro toLineString', function (): void {
     Geometry::macro('getName', function (): string {
         /** @var Geometry $this */
-        // @phpstan-ignore-next-line
         return class_basename($this);
     });
 

tests/Geometry/MultiLineStringTest.php

@@ -189,7 +189,6 @@
 it('adds a macro toMultiLineString', function (): void {
     Geometry::macro('getName', function (): string {
         /** @var Geometry $this */
-        // @phpstan-ignore-next-line
         return class_basename($this);
     });
 

tests/Geometry/MultiPointTest.php

@@ -152,7 +152,6 @@
 it('adds a macro toMultiPoint', function (): void {
     Geometry::macro('getName', function (): string {
         /** @var Geometry $this */
-        // @phpstan-ignore-next-line
         return class_basename($this);
     });