Merge remote-tracking branch 'origin/master' into srid

# Conflicts:
#	composer.json
#	src/Types/GeometryCollection.php
#	src/Types/MultiLineString.php
#	src/Types/MultiPolygon.php
#	src/Types/PointCollection.php

Author: grimzy

README.md

@@ -140,6 +140,7 @@ class Place extends Model
 ```php
 use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Grimzy\LaravelMysqlSpatial\Types\Polygon;
+use Grimzy\LaravelMysqlSpatial\Types\LineString;
 
 $place1 = new Place();
 $place1->name = 'Empire State Building';

composer.json

@@ -18,14 +18,14 @@
         "php": ">=5.5.9",
         "ext-pdo": "*",
         "ext-json": "*",
-        "illuminate/database": "^5.2||^6.0",
+        "illuminate/database": "^5.2|^6.0|^7.0",
         "geo-io/wkb-parser": "^1.0",
         "jmikola/geojson": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8||~5.7",
+        "phpunit/phpunit": "~4.8|~5.7",
         "mockery/mockery": "^0.9.9",
-        "laravel/laravel": "^5.2||^6.0",
+        "laravel/laravel": "^5.2|^6.0|^7.0",
         "doctrine/dbal": "^2.5",
         "laravel/browser-kit-testing": "^2.0",
         "php-coveralls/php-coveralls": "^2.0"

src/Eloquent/SpatialTrait.php

@@ -75,7 +75,9 @@ protected function newBaseQueryBuilder()
         $connection = $this->getConnection();
 
         return new BaseBuilder(
-            $connection, $connection->getQueryGrammar(), $connection->getPostProcessor()
+            $connection,
+            $connection->getQueryGrammar(),
+            $connection->getPostProcessor()
         );
     }
 
@@ -102,7 +104,7 @@ public function setRawAttributes(array $attributes, $sync = false)
         $spatial_fields = $this->getSpatialFields();
 
         foreach ($attributes as $attribute => &$value) {
-            if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 15) {
+            if (in_array($attribute, $spatial_fields) && is_string($value) && strlen($value) >= 13) {
                 $value = Geometry::fromWKB($value);
             }
         }

src/Types/GeometryCollection.php

@@ -14,6 +14,20 @@
 
 class GeometryCollection extends Geometry implements IteratorAggregate, ArrayAccess, Arrayable, Countable
 {
+    /**
+     * The minimum number of items required to create this collection.
+     *
+     * @var int
+     */
+    protected $minimumCollectionItems = 0;
+
+    /**
+     * The class of the items in the collection.
+     *
+     * @var string
+     */
+    protected $collectionItemType = GeometryInterface::class;
+
     /**
      * The items contained in the spatial collection.
      *
@@ -31,13 +45,7 @@ public function __construct(array $geometries, $srid = 0)
     {
         parent::__construct($srid);
 
-        $validated = array_filter($geometries, function ($value) {
-            return $value instanceof GeometryInterface;
-        });
-
-        if (count($geometries) !== count($validated)) {
-            throw new InvalidArgumentException('$geometries must be an array of Geometry objects');
-        }
+        $this->validateItems($geometries);
 
         $this->items = $geometries;
     }
@@ -61,6 +69,10 @@ public function __toString()
 
     public static function fromString($wktArgument, $srid = 0)
     {
+        if (empty($wktArgument)) {
+            return new static([]);
+        }
+
         $geometry_strings = preg_split('/,\s*(?=[A-Za-z])/', $wktArgument);
 
         return new static(array_map(function ($geometry_string) {
@@ -92,9 +104,7 @@ public function offsetGet($offset)
 
     public function offsetSet($offset, $value)
     {
-        if (!($value instanceof GeometryInterface)) {
-            throw new InvalidArgumentException('$value must be an instance of GeometryInterface');
-        }
+        $this->validateItemType($value);
 
         if (is_null($offset)) {
             $this->items[] = $value;
@@ -145,4 +155,57 @@ public function jsonSerialize()
 
         return new \GeoJson\Geometry\GeometryCollection($geometries);
     }
+
+    /**
+     * Checks whether the items are valid to create this collection.
+     *
+     * @param array $items
+     */
+    protected function validateItems(array $items)
+    {
+        $this->validateItemCount($items);
+
+        foreach ($items as $item) {
+            $this->validateItemType($item);
+        }
+    }
+
+    /**
+     * Checks whether the array has enough items to generate a valid WKT.
+     *
+     * @param array $items
+     *
+     * @see $minimumCollectionItems
+     */
+    protected function validateItemCount(array $items)
+    {
+        if (count($items) < $this->minimumCollectionItems) {
+            $entries = $this->minimumCollectionItems === 1 ? 'entry' : 'entries';
+
+            throw new InvalidArgumentException(sprintf(
+                '%s must contain at least %d %s',
+                get_class($this),
+                $this->minimumCollectionItems,
+                $entries
+            ));
+        }
+    }
+
+    /**
+     * Checks the type of the items in the array.
+     *
+     * @param $item
+     *
+     * @see $collectionItemType
+     */
+    protected function validateItemType($item)
+    {
+        if (!$item instanceof $this->collectionItemType) {
+            throw new InvalidArgumentException(sprintf(
+                '%s must be a collection of %s',
+                get_class($this),
+                $this->collectionItemType
+            ));
+        }
+    }
 }

src/Types/LineString.php

@@ -8,6 +8,13 @@
 
 class LineString extends PointCollection
 {
+    /**
+     * The minimum number of items required to create this collection.
+     *
+     * @var int
+     */
+    protected $minimumCollectionItems = 2;
+
     public function toWKT()
     {
         return sprintf('LINESTRING(%s)', $this->toPairList());

src/Types/MultiLineString.php

@@ -5,30 +5,22 @@
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiLineString as GeoJsonMultiLineString;
 use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
-use InvalidArgumentException;
 
 class MultiLineString extends GeometryCollection
 {
     /**
-     * @param LineString[] $lineStrings
-     * @param int          $srid
+     * The minimum number of items required to create this collection.
+     *
+     * @var int
      */
-    public function __construct(array $lineStrings, $srid = 0)
-    {
-        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 LineString');
-        }
+    protected $minimumCollectionItems = 1;
 
-        parent::__construct($lineStrings, $srid);
-    }
+    /**
+     * The class of the items in the collection.
+     *
+     * @var string
+     */
+    protected $collectionItemType = LineString::class;
 
     public function getLineStrings()
     {
@@ -59,9 +51,7 @@ public function __toString()
 
     public function offsetSet($offset, $value)
     {
-        if (!($value instanceof LineString)) {
-            throw new InvalidArgumentException('$value must be an instance of LineString');
-        }
+        $this->validateItemType($value);
 
         parent::offsetSet($offset, $value);
     }

src/Types/MultiPoint.php

@@ -8,6 +8,13 @@
 
 class MultiPoint extends PointCollection
 {
+    /**
+     * The minimum number of items required to create this collection.
+     *
+     * @var int
+     */
+    protected $minimumCollectionItems = 1;
+
     public function toWKT()
     {
         return sprintf('MULTIPOINT(%s)', (string) $this);

src/Types/MultiPolygon.php

@@ -5,25 +5,22 @@
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiPolygon as GeoJsonMultiPolygon;
 use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
-use InvalidArgumentException;
 
 class MultiPolygon extends GeometryCollection
 {
     /**
-     * @param Polygon[] $polygons
-     * @param int       $srid
+     * The minimum number of items required to create this collection.
+     *
+     * @var int
      */
-    public function __construct(array $polygons, $srid = 0)
-    {
-        $validated = array_filter($polygons, function ($value) {
-            return $value instanceof Polygon;
-        });
+    protected $minimumCollectionItems = 1;
 
-        if (count($polygons) !== count($validated)) {
-            throw new InvalidArgumentException('$polygons must be an array of Polygon');
-        }
-        parent::__construct($polygons, $srid);
-    }
+    /**
+     * The class of the items in the collection.
+     *
+     * @var string
+     */
+    protected $collectionItemType = Polygon::class;
 
     public function toWKT()
     {
@@ -94,9 +91,7 @@ protected static function assembleParts(array $parts)
 
     public function offsetSet($offset, $value)
     {
-        if (!($value instanceof Polygon)) {
-            throw new InvalidArgumentException('$value must be an instance of Polygon');
-        }
+        $this->validateItemType($value);
 
         parent::offsetSet($offset, $value);
     }

src/Types/PointCollection.php

@@ -8,25 +8,11 @@
 abstract class PointCollection extends GeometryCollection
 {
     /**
-     * @param Point[] $points
-     * @param int     $srid
+     * The class of the items in the collection.
+     *
+     * @var string
      */
-    public function __construct(array $points, $srid = 0)
-    {
-        if (count($points) < 2) {
-            throw new InvalidArgumentException('$points must contain at least two entries');
-        }
-
-        $validated = array_filter($points, function ($value) {
-            return $value instanceof Point;
-        });
-
-        if (count($points) !== count($validated)) {
-            throw new InvalidArgumentException('$points must be an array of Points');
-        }
-
-        parent::__construct($points, $srid);
-    }
+    protected $collectionItemType = Point::class;
 
     public function toPairList()
     {
@@ -37,9 +23,7 @@ public function toPairList()
 
     public function offsetSet($offset, $value)
     {
-        if (!($value instanceof Point)) {
-            throw new InvalidArgumentException('$value must be an instance of Point');
-        }
+        $this->validateItemType($value);
 
         parent::offsetSet($offset, $value);
     }

tests/Integration/Models/GeometryModel.php

@@ -17,5 +17,5 @@ class GeometryModel extends Model
 
     protected $table = 'geometry';
 
-    protected $spatialFields = ['location', 'line'];
+    protected $spatialFields = ['location', 'line', 'multi_geometries'];
 }