Merge remote-tracking branch 'origin/issue-95-point-collection-min-items' into issue-95-point-collection-min-items

grimzy · grimzy · commit 52ba5743f966 · 2020-03-02T01:17:52.000-05:00
diff --git a/src/Types/GeometryCollection.php b/src/Types/GeometryCollection.php
@@ -150,27 +150,32 @@ public function jsonSerialize()
     }
 
     /**
-     * Checks
+     * Checks.
+     *
      * @param array $items
      */
-    protected function validateItems(array $items) {
+    protected function validateItems(array $items)
+    {
         $this->validateItemCount($items);
 
         foreach ($items as $item) {
             $this->validateItemType($item);
         }
     }
 
-    protected function validateItemCount(array $items) {
+    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
             ));
         }
     }
 
-    protected function validateItemType($item) {
+    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
diff --git a/src/Types/MultiLineString.php b/src/Types/MultiLineString.php
@@ -5,7 +5,6 @@
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiLineString as GeoJsonMultiLineString;
 use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
-use InvalidArgumentException;
 
 class MultiLineString extends GeometryCollection
 {
diff --git a/src/Types/MultiPolygon.php b/src/Types/MultiPolygon.php
@@ -5,7 +5,6 @@
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiPolygon as GeoJsonMultiPolygon;
 use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
-use InvalidArgumentException;
 
 class MultiPolygon extends GeometryCollection
 {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`use GeoJson\GeoJson;`
`6`	`6`	`use GeoJson\Geometry\MultiLineString as GeoJsonMultiLineString;`
`7`	`7`	`use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;`
`8`		`-use InvalidArgumentException;`
`9`	`8`
`10`	`9`	`class MultiLineString extends GeometryCollection`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`use GeoJson\GeoJson;`
`6`	`6`	`use GeoJson\Geometry\MultiPolygon as GeoJsonMultiPolygon;`
`7`	`7`	`use Grimzy\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;`
`8`		`-use InvalidArgumentException;`
`9`	`8`
`10`	`9`	`class MultiPolygon extends GeometryCollection`
`11`	`10`	`{`