ArrayAccess

Author: MatanYadaev

phpstan.neon

@@ -6,7 +6,6 @@ parameters:
         - tests
     level: max
     ignoreErrors:
-        - '#Method MatanYadaev\\EloquentSpatial\\Objects\\.+::getGeometries\(\) should return array<.+> but returns array<MatanYadaev\\EloquentSpatial\\Objects\\Geometry>\.#'
         - '#Method MatanYadaev\\EloquentSpatial\\Objects\\(Geometry|GeometryCollection)::(toJson|toFeatureCollectionJson)\(\) should return string but returns string\|false\.#'
     excludePaths:
         - ./src/Factory.php

src/Objects/GeometryCollection.php

@@ -4,13 +4,14 @@
 
 namespace MatanYadaev\EloquentSpatial\Objects;
 
+use ArrayAccess;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
 
-class GeometryCollection extends Geometry
+class GeometryCollection extends Geometry implements ArrayAccess
 {
     /** @var Collection<Geometry> */
     protected Collection $geometries;
@@ -71,11 +72,11 @@ public function toArray(): array
     }
 
     /**
-     * @return array<Geometry>
+     * @return Collection<Geometry>
      */
-    public function getGeometries(): array
+    public function getGeometries(): Collection
     {
-        return $this->geometries->all();
+        return $this->geometries->collect();
     }
 
     /**
@@ -120,4 +121,41 @@ protected function toCollectionWkt(): Expression
 
         return DB::raw($wkb);
     }
+
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->geometries[$offset]);
+    }
+
+    /**
+     * @param mixed $offset
+     * @return Geometry
+     */
+    public function offsetGet($offset): Geometry
+    {
+        return $this->geometries[$offset];
+    }
+
+    /**
+     * @param mixed $offset
+     * @param Geometry $geometry
+     */
+    public function offsetSet($offset, $geometry): void
+    {
+        $this->geometries[$offset] = $geometry;
+        $this->validateGeometriesType();
+    }
+
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset): void
+    {
+        $this->geometries->splice($offset, 1);
+        $this->validateGeometriesCount();
+    }
 }

src/Objects/LineString.php

@@ -15,12 +15,4 @@ public function toWkt(): Expression
     {
         return DB::raw("LINESTRING({$this->toCollectionWkt()})");
     }
-
-    /**
-     * @return array<Point>
-     */
-    public function getGeometries(): array
-    {
-        return parent::getGeometries();
-    }
 }

src/Objects/MultiLineString.php

@@ -8,6 +8,10 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * @method array<LineString> getGeometries()
+ * @method LineString offsetGet(mixed $offset)
+ */
 class MultiLineString extends GeometryCollection
 {
     /** @var Collection<LineString> */
@@ -29,12 +33,4 @@ public function toWkt(): Expression
     {
         return DB::raw("MULTILINESTRING({$this->toCollectionWkt()})");
     }
-
-    /**
-     * @return array<LineString>
-     */
-    public function getGeometries(): array
-    {
-        return parent::getGeometries();
-    }
 }

src/Objects/MultiPolygon.php

@@ -9,6 +9,10 @@
 use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
 
+/**
+ * @method array<Polygon> getGeometries()
+ * @method Polygon offsetGet(mixed $offset)
+ */
 class MultiPolygon extends GeometryCollection
 {
     /** @var Collection<Polygon> */
@@ -32,12 +36,4 @@ public function toWkt(): Expression
     {
         return DB::raw("MULTIPOLYGON({$this->toCollectionWkt()})");
     }
-
-    /**
-     * @return array<Polygon>
-     */
-    public function getGeometries(): array
-    {
-        return parent::getGeometries();
-    }
 }

src/Objects/PointCollection.php

@@ -7,6 +7,10 @@
 use Illuminate\Support\Collection;
 use InvalidArgumentException;
 
+/**
+ * @method array<Point> getGeometries()
+ * @method Point offsetGet(mixed $offset)
+ */
 abstract class PointCollection extends GeometryCollection
 {
     /** @var Collection<Point> */
@@ -23,12 +27,4 @@ public function __construct(Collection | array $geometries)
     {
         parent::__construct($geometries);
     }
-
-    /**
-     * @return array<Point>
-     */
-    public function getGeometries(): array
-    {
-        return parent::getGeometries();
-    }
 }