Added abstract class to add return type

Author: tdomy

src/Geometries/LineStringCollection.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace MStaack\LaravelPostgis\Geometries;
+
+use Countable;
+use InvalidArgumentException;
+
+abstract class LineStringCollection extends Geometry implements Countable
+{
+    /**
+     * @var LineString[]
+     */
+    protected $linestrings = [];
+
+    /**
+     * @param LineString[] $linestrings
+     */
+    public function __construct(array $linestrings)
+    {
+        if (count($linestrings) < 1) {
+            throw new InvalidArgumentException('$linestrings must contain at least one entry');
+        }
+
+        $validated = array_filter($linestrings, function ($value) {
+            return $value instanceof LineString;
+        });
+
+        if (count($linestrings) !== count($validated)) {
+            throw new InvalidArgumentException('$linestrings must be an array of Points');
+        }
+
+        $this->linestrings = $linestrings;
+    }
+
+    public function getLineStrings()
+    {
+        return $this->linestrings;
+    }
+
+    public function is3d()
+    {
+        if (count($this->linestrings) === 0) return false;
+        return $this->linestrings[0]->is3d();
+    }
+
+    public static function fromString($wktArgument)
+    {
+        $str = preg_split('/\)\s*,\s*\(/', substr(trim($wktArgument), 1, -1));
+        $linestrings = array_map(function ($data) {
+            return LineString::fromString($data);
+        }, $str);
+
+
+        return new static($linestrings);
+    }
+
+    public function __toString()
+    {
+        return implode(',', array_map(function (LineString $linestring) {
+            return sprintf('(%s)', (string)$linestring);
+        }, $this->getLineStrings()));
+    }
+
+    public function count(): int
+    {
+        return count($this->linestrings);
+    }
+}

src/Geometries/MultiLineString.php

@@ -2,83 +2,21 @@
 
 namespace MStaack\LaravelPostgis\Geometries;
 
-use Countable;
-use InvalidArgumentException;
-
-class MultiLineString extends Geometry implements Countable
+class MultiLineString extends LineStringCollection
 {
-    /**
-     * @var LineString[]
-     */
-    protected $linestrings = [];
-
-    /**
-     * @param LineString[] $linestrings
-     */
-    public function __construct(array $linestrings)
-    {
-        if (count($linestrings) < 1) {
-            throw new InvalidArgumentException('$linestrings must contain at least one entry');
-        }
-
-        $validated = array_filter($linestrings, function ($value) {
-            return $value instanceof LineString;
-        });
-
-        if (count($linestrings) !== count($validated)) {
-            throw new InvalidArgumentException('$linestrings must be an array of Points');
-        }
-
-        $this->linestrings = $linestrings;
-    }
-
-    public function getLineStrings()
-    {
-        return $this->linestrings;
-    }
-
-    public function is3d()
-    {
-        if (count($this->linestrings) === 0) return false;
-        return $this->linestrings[0]->is3d();
-    }
-
     public function toWKT()
     {
         $wktType = 'MULTILINESTRING';
         if ($this->is3d()) $wktType .= ' Z';
         return sprintf('%s(%s)', $wktType, (string)$this);
     }
 
-    public static function fromString($wktArgument)
-    {
-        $str = preg_split('/\)\s*,\s*\(/', substr(trim($wktArgument), 1, -1));
-        $linestrings = array_map(function ($data) {
-            return LineString::fromString($data);
-        }, $str);
-
-
-        return new static($linestrings);
-    }
-
-    public function __toString()
-    {
-        return implode(',', array_map(function (LineString $linestring) {
-            return sprintf('(%s)', (string)$linestring);
-        }, $this->getLineStrings()));
-    }
-
-    public function count(): int
-    {
-        return count($this->linestrings);
-    }
-
     /**
      * Convert to GeoJson Point that is jsonable to GeoJSON
      *
      * @return \GeoJson\Geometry\MultiLineString
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): \GeoJson\Geometry\MultiLineString
     {
         $linestrings = [];
 

src/Geometries/Polygon.php

@@ -4,14 +4,8 @@
 
 use GeoJson\Geometry\LinearRing;
 
-class Polygon extends MultiLineString
+class Polygon extends LineStringCollection
 {
-    public function is3d()
-    {
-        if (count($this->linestrings) === 0) return false;
-        return $this->linestrings[0]->is3d();
-    }
-
     public function toWKT()
     {
         $wktType = 'POLYGON';
@@ -24,7 +18,7 @@ public function toWKT()
      *
      * @return \GeoJson\Geometry\Polygon
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): \GeoJson\Geometry\Polygon
     {
         $linearrings = [];
         foreach ($this->linestrings as $linestring) {