removed ignoreErrors from phpstan-configuration (#26)

* removed ignoreErrors from phpstan-configuration. applied corresponding changes

* applied changes from feedback

* using JSON_THROW_ON_ERROR instead of manually throwing exception

Author: eschricker

phpstan.neon

@@ -6,10 +6,6 @@ parameters:
         - tests
     level: max
     ignoreErrors:
-        - '#Method MatanYadaev\\EloquentSpatial\\Objects\\(Geometry|GeometryCollection)::(toJson|toFeatureCollectionJson)\(\) should return string but returns string\|false\.#'
-        -
-            message: '#Call to an undefined method .+#'
-            path: ./src/SpatialBuilder.php
     excludePaths:
         - ./src/Factory.php
     checkMissingIterableValueType: true

src/Objects/Geometry.php

@@ -10,6 +10,7 @@
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Database\Query\Expression;
 use InvalidArgumentException;
+use JsonException;
 use JsonSerializable;
 use MatanYadaev\EloquentSpatial\Factory;
 use MatanYadaev\EloquentSpatial\GeometryCast;
@@ -18,9 +19,16 @@ abstract class Geometry implements Castable, Arrayable, Jsonable, JsonSerializab
 {
     abstract public function toWkt(): Expression;
 
+    /**
+     * @param int $options
+     * 
+     * @return string
+     * 
+     * @throws JsonException 
+     */
     public function toJson($options = 0): string
     {
-        return json_encode($this, $options);
+        return json_encode($this, $options | JSON_THROW_ON_ERROR);
     }
 
     /**
@@ -80,10 +88,15 @@ public function toArray(): array
         ];
     }
 
+    /**
+     * @return string
+     * 
+     * @throws JsonException
+     */
     public function toFeatureCollectionJson(): string
     {
         if (static::class === GeometryCollection::class) {
-            /** @var GeometryCollection $this */
+            /** @var GeometryCollection<Geometry> $this */
             $geometries = $this->geometries;
         } else {
             $geometries = collect([$this]);
@@ -97,10 +110,13 @@ public function toFeatureCollectionJson(): string
             ];
         });
 
-        return json_encode([
+        return json_encode(
+            [
             'type' => 'FeatureCollection',
             'features' => $features,
-        ]);
+            ],
+            JSON_THROW_ON_ERROR
+        );
     }
 
     /**

src/Objects/GeometryCollection.php

@@ -13,6 +13,7 @@
 
 /**
  * @template TGeometry of Geometry
+ * @implements ArrayAccess<int, TGeometry>
  */
 class GeometryCollection extends Geometry implements ArrayAccess
 {

src/SpatialBuilder.php

@@ -11,6 +11,7 @@
 /**
  * @template TModel of \Illuminate\Database\Eloquent\Model
  * @extends Builder<TModel>
+ * @mixin \Illuminate\Database\Query\Builder
  */
 class SpatialBuilder extends Builder
 {
@@ -23,14 +24,16 @@ public function withDistance(
             $this->select('*');
         }
 
-        return $this->selectRaw(
+        $this->selectRaw(
             sprintf(
                 'ST_DISTANCE(%s, %s) AS %s',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
                 $alias,
             )
         );
+
+        return $this;
     }
 
     public function whereDistance(
@@ -39,7 +42,7 @@ public function whereDistance(
         string $operator,
         int|float $value
     ): self {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_DISTANCE(%s, %s) %s %s',
                 "`{$column}`",
@@ -48,21 +51,25 @@ public function whereDistance(
                 $value,
             )
         );
+
+        return $this;
     }
 
     public function orderByDistance(
         string $column,
         Geometry|string $geometryOrColumn,
         string $direction = 'asc'
     ): self {
-        return $this->orderByRaw(
+        $this->orderByRaw(
             sprintf(
                 'ST_DISTANCE(%s, %s) %s',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
                 $direction,
             )
         );
+
+        return $this;
     }
 
     public function withDistanceSphere(
@@ -74,14 +81,16 @@ public function withDistanceSphere(
             $this->select('*');
         }
 
-        return $this->selectRaw(
+        $this->selectRaw(
             sprintf(
                 'ST_DISTANCE_SPHERE(%s, %s) AS %s',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
                 $alias,
             )
         );
+
+        return $this;
     }
 
     public function whereDistanceSphere(
@@ -90,7 +99,7 @@ public function whereDistanceSphere(
         string $operator,
         int|float $value
     ): self {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_DISTANCE_SPHERE(%s, %s) %s %s',
                 "`{$column}`",
@@ -99,109 +108,129 @@ public function whereDistanceSphere(
                 $value
             )
         );
+
+        return $this;
     }
 
     public function orderByDistanceSphere(
         string $column,
         Geometry|string $geometryOrColumn,
         string $direction = 'asc'
     ): self {
-        return $this->orderByRaw(
+        $this->orderByRaw(
             sprintf(
                 'ST_DISTANCE_SPHERE(%s, %s) %s',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
                 $direction
             )
         );
+
+        return $this;
     }
 
     public function whereWithin(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_WITHIN(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     public function whereContains(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_CONTAINS(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     public function whereTouches(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_TOUCHES(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     public function whereIntersects(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_INTERSECTS(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     public function whereCrosses(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_CROSSES(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     public function whereDisjoint(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_DISJOINT(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     public function whereOverlaps(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_OVERLAPS(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     public function whereEquals(string $column, Geometry|string $geometryOrColumn): self
     {
-        return $this->whereRaw(
+        $this->whereRaw(
             sprintf(
                 'ST_EQUALS(%s, %s)',
                 "`{$column}`",
                 $this->toExpression($geometryOrColumn),
             )
         );
+
+        return $this;
     }
 
     protected function toExpression(Geometry|string $geometryOrColumn): Expression