fix toArray for custom Geometry

Author: asanikovich

src/Geometry/Geometry.php

@@ -112,7 +112,7 @@ public static function fromJson(string $geoJson, int $srid = 0): static
     }
 
     /**
-     * @param  array<mixed>  $geometry
+     * @param  array<string, mixed>  $geometry
      *
      * @throws LaravelSpatialJsonException
      */
@@ -128,20 +128,27 @@ public static function fromArray(array $geometry): static
     }
 
     /**
-     * @return array<mixed>
+     * @return array<string, mixed>
      */
     public function jsonSerialize(): array
     {
         return $this->toArray();
     }
 
     /**
-     * @return array{type: string, coordinates: array<mixed>}
+     * @return array{type: string, coordinates: array<string, mixed>}
      */
     public function toArray(): array
     {
+        if (get_parent_class($this) === self::class) {
+            $type = class_basename(static::class);
+        } else {
+            $types = array_values(class_parents($this));
+            $type = class_basename($types[count($types) - 2]);
+        }
+
         return [
-            'type' => class_basename(static::class),
+            'type' => $type,
             'coordinates' => $this->getCoordinates(),
         ];
     }
@@ -173,7 +180,7 @@ public function toFeatureCollectionJson(): string
     }
 
     /**
-     * @return array<mixed>
+     * @return array{0: float, 1: float}
      */
     abstract public function getCoordinates(): array;
 

src/Geometry/GeometryCollection.php

@@ -51,7 +51,7 @@ public function getWktData(): string
     }
 
     /**
-     * @return array<mixed>
+     * @return array<int, array{0: float, 1: float}>
      */
     public function getCoordinates(): array
     {
@@ -61,7 +61,7 @@ public function getCoordinates(): array
     }
 
     /**
-     * @return array<mixed>
+     * @return array<string, mixed>
      */
     public function toArray(): array
     {
@@ -70,7 +70,7 @@ public function toArray(): array
         }
 
         return [
-            'type' => class_basename(static::class),
+            'type' => class_basename(self::class),
             'geometries' => $this->geometries->map(static fn (Geometry $geometry): array => $geometry->toArray()),
         ];
     }

src/LaravelSpatialServiceProvider.php

@@ -74,8 +74,7 @@ private function validateConfig(): void
             }
 
             $baseClass = $type->getBaseGeometryClassName();
-            /** @phpstan-ignore-next-line  */
-            if ($configType !== $baseClass && ! $configType instanceof $baseClass) {
+            if (! is_a($configType, $baseClass, true)) {
                 throw new LaravelSpatialException(sprintf(
                     'Class for geometry type "%s" should be instance of "%s" ("%s" provided), please check config',
                     $type->value,

tests/Custom/CustomPointJsonTest.php

@@ -0,0 +1,22 @@
+<?php
+
+use ASanikovich\LaravelSpatial\Geometry\Point;
+use ASanikovich\LaravelSpatial\Tests\Custom\CustomPoint;
+
+it('check serialisation of custom point', function (): void {
+    $point = new CustomPoint(0, 180);
+
+    $array = $point->toArray();
+
+    expect($array)->toEqual(['type' => 'Point', 'coordinates' => [180.0, 0.0]])
+        ->and(CustomPoint::fromArray($array))->toEqual($point);
+});
+
+it('check serialisation of point', function (): void {
+    $point = new Point(0, 180);
+
+    $array = $point->toArray();
+
+    expect($array)->toEqual(['type' => 'Point', 'coordinates' => [180.0, 0.0]])
+        ->and(Point::fromArray($array))->toEqual($point);
+});

tests/Pest.php

@@ -13,6 +13,9 @@ function isSupportAxisOrder(): bool
     return (new Connection())->isSupportAxisOrder(DB::connection());
 }
 
+/**
+ * @return class-string
+ */
 function getDatabaseTruncationClass(): string
 {
     if (class_exists(DatabaseTruncation::class)) {