v2: laravel 10 init

asanikovich · asanikovich · commit 6d16c513b301 · 2023-06-02T05:01:29.000+03:00
diff --git a/.github/workflows/pest.yml b/.github/workflows/pest.yml
@@ -12,14 +12,12 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 8.2, 8.1 ]
-        laravel: [ 9.*, 8.* ]
+        laravel: [ 10.* ]
         db: [ 'mysql:8.0', 'mysql:5.7', 'mariadb:10.9' ]
         dependency-version: [ prefer-stable ]
         include:
-          - laravel: 9.*
-            testbench: ^7.0
-          - laravel: 8.*
-            testbench: ^6.23
+          - laravel: 10.*
+            testbench: ^8.0
 
     services:
       db:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-spatial` will be documented in this file.
 
+## v2.0.0 - 2023-06-02
+
+Initial release for laravel 10
+
 ## v1.0.0 - 2023-06-02
 
-Initial release
+Initial release for laravel 8,9
diff --git a/README.md b/README.md
@@ -10,7 +10,8 @@
 
 **This Laravel package allows you to easily work with spatial data types and functions.**
 
-v1 supports Laravel 8,9 and PHP 8.1+.
+* v2 supports Laravel 10+ and PHP 8.1+
+* v1 supports Laravel 8,9 and PHP 8.1+
 
 This package supports MySQL v8 or v5.7, and MariaDB v10.
 
diff --git a/composer.json b/composer.json
@@ -13,16 +13,16 @@
         "php": "^8.1",
         "ext-json": "*",
         "ext-pdo": "*",
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^10.0",
         "phayes/geophp": "^1.2"
     },
     "require-dev": {
         "doctrine/dbal": "^3.0",
         "laravel/pint": "^1.5",
         "nunomaduro/larastan": "^1.0|^2.4",
-        "orchestra/testbench": "^6.23|^7.0",
-        "pestphp/pest": "^1.0",
-        "pestphp/pest-plugin-laravel": "^1.4.0"
+        "orchestra/testbench": "^8.0",
+        "pestphp/pest": "^1.0|^2.6",
+        "pestphp/pest-plugin-laravel": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpstan.neon b/phpstan.neon
@@ -9,10 +9,3 @@ parameters:
   level: max
   checkMissingIterableValueType: true
   checkGenericClassInNonGenericObjectType: false
-  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
diff --git a/phpunit.xml b/phpunit.xml
@@ -5,29 +5,31 @@
          colors="true"
          processIsolation="false"
          stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.0/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
 >
-  <testsuites>
-    <testsuite name="Test Suite">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <coverage>
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-    <report>
-      <html outputDirectory="build/coverage"/>
-      <text outputFile="build/coverage.txt"/>
-      <clover outputFile="build/logs/clover.xml"/>
-    </report>
-  </coverage>
-  <logging>
-    <junit outputFile="build/report.junit.xml"/>
-  </logging>
-  <php>
-    <env name="DB_DATABASE" value="laravel"/>
-    <env name="DB_HOST" value="127.0.0.1"/>
-    <env name="DB_USERNAME" value="root"/>
-  </php>
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="build/report.junit.xml"/>
+    </logging>
+    <php>
+        <env name="DB_DATABASE" value="laravel"/>
+        <env name="DB_HOST" value="127.0.0.1"/>
+        <env name="DB_USERNAME" value="root"/>
+    </php>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Eloquent/GeometryCast.php b/src/Eloquent/GeometryCast.php
@@ -7,7 +7,9 @@
 use ASanikovich\LaravelSpatial\Exceptions\LaravelSpatialException;
 use ASanikovich\LaravelSpatial\Geometry\Geometry;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
-use Illuminate\Database\Query\Expression;
+use Illuminate\Contracts\Database\Query\Expression;
+use Illuminate\Database\Connection;
+use Illuminate\Database\Eloquent\Model;
 
 class GeometryCast implements CastsAttributes
 {
@@ -26,15 +28,15 @@ public function __construct(string $className)
      * @param  string|Expression|null  $value
      * @param  array<string, mixed>  $attributes
      */
-    public function get($model, string $key, mixed $value, array $attributes): ?Geometry
+    public function get(Model $model, string $key, mixed $value, array $attributes): ?Geometry
     {
         if (! $value) {
             return null;
         }
 
         if ($value instanceof Expression) {
-            $wkt = $this->extractWktFromExpression($value);
-            $srid = $this->extractSridFromExpression($value);
+            $wkt = $this->extractWktFromExpression($value, $model->getConnection());
+            $srid = $this->extractSridFromExpression($value, $model->getConnection());
 
             return $this->className::fromWkt($wkt, $srid);
         }
@@ -48,7 +50,7 @@ public function get($model, string $key, mixed $value, array $attributes): ?Geom
      *
      * @throws LaravelSpatialException
      */
-    public function set($model, string $key, mixed $value, array $attributes): Expression|null
+    public function set(Model $model, string $key, mixed $value, array $attributes): Expression|null
     {
         if (! $value) {
             return null;
@@ -64,24 +66,27 @@ public function set($model, string $key, mixed $value, array $attributes): Expre
 
         if (! ($value instanceof $this->className)) {
             $geometryType = is_object($value) ? $value::class : gettype($value);
-            throw new LaravelSpatialException(
-                sprintf('Expected %s, %s given.', static::class, $geometryType) // todo
-            );
+
+            throw new LaravelSpatialException(sprintf('Expected %s, %s given.', static::class, $geometryType));
         }
 
         return $value->toSqlExpression($model->getConnection());
     }
 
-    private function extractWktFromExpression(Expression $expression): string
+    private function extractWktFromExpression(Expression $expression, Connection $connection): string
     {
-        preg_match('/ST_GeomFromText\(\'(.+)\', .+(, .+)?\)/', (string) $expression, $match);
+        $expressionValue = $expression->getValue($connection->getQueryGrammar());
+
+        preg_match('/ST_GeomFromText\(\'(.+)\', .+(, .+)?\)/', (string) $expressionValue, $match);
 
         return $match[1];
     }
 
-    private function extractSridFromExpression(Expression $expression): int
+    private function extractSridFromExpression(Expression $expression, Connection $connection): int
     {
-        preg_match('/ST_GeomFromText\(\'.+\', (.+)(, .+)?\)/', (string) $expression, $match);
+        $expressionValue = $expression->getValue($connection->getQueryGrammar());
+
+        preg_match('/ST_GeomFromText\(\'.+\', (.+)(, .+)?\)/', (string) $expressionValue, $match);
 
         return (int) $match[1];
     }
diff --git a/src/Eloquent/HasSpatial.php b/src/Eloquent/HasSpatial.php
@@ -329,6 +329,6 @@ protected function toSpatialExpressionString(Builder $query, Expression|Geometry
             $expression = $query->raw($grammar->wrap($value));
         }
 
-        return (string) $expression;
+        return (string) $expression->getValue($grammar);
     }
 }
diff --git a/src/Geometry/Geometry.php b/src/Geometry/Geometry.php
@@ -11,10 +11,10 @@
 use geoPHP;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Contracts\Database\Query\Expression;
 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 JsonException;
diff --git a/tests/Eloquent/HasSpatialTest.php b/tests/Eloquent/HasSpatialTest.php
@@ -13,7 +13,7 @@
     TestPlace::factory()->create(['point' => new Point(0, 0, Srid::WGS84->value)]);
 
     /** @var TestPlace $testPlaceWithDistance */
-    $testPlaceWithDistance = TestPlace::query()->select(['id'])->selectRaw(DB::raw('id as id_new'))
+    $testPlaceWithDistance = TestPlace::query()->select(['id'])->selectRaw('id as id_new')
         ->withDistance('point', new Point(1, 1, Srid::WGS84->value))
         ->firstOrFail();
 
@@ -397,8 +397,9 @@
 
     $result = $method->invoke($model, $model->newQuery(), $polygon);
 
+    $grammar = $model->newQuery()->getGrammar();
     $connection = $model->newQuery()->getConnection();
-    $sqlSerializedPolygon = $polygon->toSqlExpression($connection)->getValue();
+    $sqlSerializedPolygon = $polygon->toSqlExpression($connection)->getValue($grammar);
     expect($result)->toBe($sqlSerializedPolygon);
 });
 
diff --git a/tests/Geometry/GeometryTest.php b/tests/Geometry/GeometryTest.php
@@ -82,7 +82,8 @@
 
     $expression = $point->toSqlExpression(DB::connection());
 
-    $expressionValue = $expression->getValue();
+    $grammar = DB::getQueryGrammar();
+    $expressionValue = $expression->getValue($grammar);
     expect($expressionValue)->toEqual("ST_GeomFromText('POINT(180 0)', 4326, 'axis-order=long-lat')");
 })->skip(fn () => ! isSupportAxisOrder());
 
@@ -91,7 +92,8 @@
 
     $expression = $point->toSqlExpression(DB::connection());
 
-    $expressionValue = $expression->getValue();
+    $grammar = DB::getQueryGrammar();
+    $expressionValue = $expression->getValue($grammar);
     expect($expressionValue)->toEqual("ST_GeomFromText('POINT(180 0)', 4326)");
 })->skip(fn () => isSupportAxisOrder());
 
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -2,7 +2,6 @@
 
 use ASanikovich\LaravelSpatial\Database\Connection;
 use ASanikovich\LaravelSpatial\Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTruncation;
 use Illuminate\Support\Facades\DB;
 
@@ -13,11 +12,10 @@ function isSupportAxisOrder(): bool
     return (new Connection())->isSupportAxisOrder(DB::connection());
 }
 
+/**
+ * @return class-string
+ */
 function getDatabaseTruncationClass(): string
 {
-    if (class_exists(DatabaseTruncation::class)) {
-        return DatabaseTruncation::class;
-    }
-
-    return DatabaseMigrations::class;
+    return DatabaseTruncation::class;
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@`
`7`	`7`	`use ASanikovich\LaravelSpatial\Exceptions\LaravelSpatialException;`
`8`	`8`	`use ASanikovich\LaravelSpatial\Geometry\Geometry;`
`9`	`9`	`use Illuminate\Contracts\Database\Eloquent\CastsAttributes;`
`10`		`-use Illuminate\Database\Query\Expression;`
	`10`	`+use Illuminate\Contracts\Database\Query\Expression;`
	`11`	`+use Illuminate\Database\Connection;`
	`12`	`+use Illuminate\Database\Eloquent\Model;`
`11`	`13`
`12`	`14`	`class GeometryCast implements CastsAttributes`
`13`	`15`	`{`
`@@ -26,15 +28,15 @@ public function __construct(string $className)`
`26`	`28`	`* @param string\|Expression\|null $value`
`27`	`29`	`* @param array<string, mixed> $attributes`
`28`	`30`	`*/`
`29`		`- public function get($model, string $key, mixed $value, array $attributes): ?Geometry`
	`31`	`+ public function get(Model $model, string $key, mixed $value, array $attributes): ?Geometry`
`30`	`32`	`{`
`31`	`33`	`if (! $value) {`
`32`	`34`	`return null;`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`if ($value instanceof Expression) {`
`36`		`- $wkt = $this->extractWktFromExpression($value);`
`37`		`- $srid = $this->extractSridFromExpression($value);`
	`38`	`+ $wkt = $this->extractWktFromExpression($value, $model->getConnection());`
	`39`	`+ $srid = $this->extractSridFromExpression($value, $model->getConnection());`
`38`	`40`
`39`	`41`	`return $this->className::fromWkt($wkt, $srid);`
`40`	`42`	`}`
`@@ -48,7 +50,7 @@ public function get($model, string $key, mixed $value, array $attributes): ?Geom`
`48`	`50`	`*`
`49`	`51`	`* @throws LaravelSpatialException`
`50`	`52`	`*/`
`51`		`- public function set($model, string $key, mixed $value, array $attributes): Expression\|null`
	`53`	`+ public function set(Model $model, string $key, mixed $value, array $attributes): Expression\|null`
`52`	`54`	`{`
`53`	`55`	`if (! $value) {`
`54`	`56`	`return null;`
`@@ -64,24 +66,27 @@ public function set($model, string $key, mixed $value, array $attributes): Expre`
`64`	`66`
`65`	`67`	`if (! ($value instanceof $this->className)) {`
`66`	`68`	`$geometryType = is_object($value) ? $value::class : gettype($value);`
`67`		`- throw new LaravelSpatialException(`
`68`		`- sprintf('Expected %s, %s given.', static::class, $geometryType) // todo`
`69`		`- );`
	`69`	`+`
	`70`	`+ throw new LaravelSpatialException(sprintf('Expected %s, %s given.', static::class, $geometryType));`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`return $value->toSqlExpression($model->getConnection());`
`73`	`74`	`}`
`74`	`75`
`75`		`- private function extractWktFromExpression(Expression $expression): string`
	`76`	`+ private function extractWktFromExpression(Expression $expression, Connection $connection): string`
`76`	`77`	`{`
`77`		`- preg_match('/ST_GeomFromText\(\'(.+)\', .+(, .+)?\)/', (string) $expression, $match);`
	`78`	`+ $expressionValue = $expression->getValue($connection->getQueryGrammar());`
	`79`	`+`
	`80`	`+ preg_match('/ST_GeomFromText\(\'(.+)\', .+(, .+)?\)/', (string) $expressionValue, $match);`
`78`	`81`
`79`	`82`	`return $match[1];`
`80`	`83`	`}`
`81`	`84`
`82`		`- private function extractSridFromExpression(Expression $expression): int`
	`85`	`+ private function extractSridFromExpression(Expression $expression, Connection $connection): int`
`83`	`86`	`{`
`84`		`- preg_match('/ST_GeomFromText\(\'.+\', (.+)(, .+)?\)/', (string) $expression, $match);`
	`87`	`+ $expressionValue = $expression->getValue($connection->getQueryGrammar());`
	`88`	`+`
	`89`	`+ preg_match('/ST_GeomFromText\(\'.+\', (.+)(, .+)?\)/', (string) $expressionValue, $match);`
`85`	`90`
`86`	`91`	`return (int) $match[1];`
`87`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,6 @@ protected function toSpatialExpressionString(Builder $query, Expression\|Geometry`
`329`	`329`	`$expression = $query->raw($grammar->wrap($value));`
`330`	`330`	`}`
`331`	`331`
`332`		`- return (string) $expression;`
	`332`	`+ return (string) $expression->getValue($grammar);`
`333`	`333`	`}`
`334`	`334`	`}`