fixes

Author: MatanYadaev

src/Factory.php

@@ -5,6 +5,7 @@
 use Collection as geoPHPGeometryCollection;
 use Geometry as geoPHPGeometry;
 use geoPHP;
+use Illuminate\Support\Collection;
 use LineString as geoPHPLineString;
 use MatanYadaev\EloquentSpatial\Objects\Geometry;
 use MatanYadaev\EloquentSpatial\Objects\GeometryCollection;
@@ -40,7 +41,7 @@ protected static function create(geoPHPGeometry $geometry): Geometry
         if ($geometry instanceof geoPHPGeometryCollection) {
             $components = collect($geometry->components)->map(function (geoPHPGeometry $geometryComponent): Geometry {
                 return self::create($geometryComponent);
-            })->all();
+            });
 
             $className = get_class($geometry);
 
@@ -73,55 +74,55 @@ protected static function createPoint(float $latitude, float $longitude): Point
     }
 
     /**
-     * @param Point[] $points
+     * @param Collection<Point> $points
      * @return MultiPoint
      */
-    protected static function createMultiPoint(array $points): MultiPoint
+    protected static function createMultiPoint(Collection $points): MultiPoint
     {
         return new MultiPoint($points);
     }
 
     /**
-     * @param Point[] $points
+     * @param Collection<Point> $points
      * @return LineString
      */
-    protected static function createLineString(array $points): LineString
+    protected static function createLineString(Collection $points): LineString
     {
         return new LineString($points);
     }
 
     /**
-     * @param LineString[] $lineStrings
+     * @param Collection<LineString> $lineStrings
      * @return Polygon
      */
-    protected static function createPolygon(array $lineStrings): Polygon
+    protected static function createPolygon(Collection $lineStrings): Polygon
     {
         return new Polygon($lineStrings);
     }
 
     /**
-     * @param LineString[] $lineStrings
+     * @param Collection<LineString> $lineStrings
      * @return MultiLineString
      */
-    protected static function createMultiLineString(array $lineStrings):MultiLineString
+    protected static function createMultiLineString(Collection $lineStrings):MultiLineString
     {
         return new MultiLineString($lineStrings);
     }
 
     /**
-     * @param Polygon[] $polygons
+     * @param Collection<Polygon> $polygons
      * @return MultiPolygon
      */
-    protected static function createMultiPolygon(array $polygons): MultiPolygon
+    protected static function createMultiPolygon(Collection $polygons): MultiPolygon
     {
         return new MultiPolygon($polygons);
     }
 
     /**
-     * @param Geometry[] $geometries
+     * @param Collection<Geometry> $geometries
      * @return GeometryCollection
      */
-    protected static function createGeometryCollection(array $geometries): GeometryCollection
+    protected static function createGeometryCollection(Collection $geometries): GeometryCollection
     {
         return new GeometryCollection($geometries);
     }

src/Objects/MultiLineString.php

@@ -11,6 +11,9 @@
  */
 class MultiLineString extends GeometryCollection
 {
+    /** @var Collection<LineString> */
+    protected Collection $geometries;
+
     protected string $collectionOf = LineString::class;
 
     protected int $minimumGeometries = 1;

src/Objects/MultiPolygon.php

@@ -8,11 +8,11 @@
 use InvalidArgumentException;
 
 /**
- * @method MultiPolygon[] getGeometries()
+ * @method Polygon[] getGeometries()
  */
 class MultiPolygon extends GeometryCollection
 {
-    /** @var Collection<MultiPolygon> */
+    /** @var Collection<Polygon> */
     protected Collection $geometries;
 
     protected string $collectionOf = Polygon::class;