increase phpstan level to 7

Author: limenet

phpstan-baseline.neon

@@ -32,7 +32,7 @@ parameters:
 
 		-
 			message: "#^Unsafe usage of new static\\(\\)\\.$#"
-			count: 2
+			count: 3
 			path: src/Types/GeometryCollection.php
 
 		-

phpstan.neon.dist

@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 6
+    level: 7
     paths:
         - src
     tmpDir: build/phpstan

src/Exceptions/UnknownWKBException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Limenet\LaravelMysqlSpatial\Exceptions;
+
+class UnknownWKBException extends \RuntimeException
+{
+}

src/Types/Geometry.php

@@ -6,6 +6,7 @@
 use GeoJson\Feature\Feature;
 use GeoJson\GeoJson;
 use Illuminate\Contracts\Support\Jsonable;
+use Limenet\LaravelMysqlSpatial\Exceptions\UnknownWKBException;
 use Limenet\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
 
 abstract class Geometry implements GeometryInterface, Jsonable, \JsonSerializable
@@ -45,10 +46,15 @@ public static function getWKTArgument(string $value): string
         return substr($value, $left + 1, $right - $left - 1);
     }
 
-    /** @return class-string */
+    /** @return class-string<Geometry> */
     public static function getWKTClass(string $value): string
     {
         $left = strpos($value, '(');
+
+        if ($left === false) {
+            throw new UnknownWKTTypeException('Could not parse '.$value);
+        }
+
         $type = trim(substr($value, 0, $left));
 
         return match (strtoupper($type)) {
@@ -66,7 +72,13 @@ public static function getWKTClass(string $value): string
     public static function fromWKB(string $wkb): Geometry
     {
         $srid = substr($wkb, 0, 4);
-        $srid = unpack('L', $srid)[1];
+        $unpacked = unpack('L', $srid);
+
+        if ($unpacked === false) {
+            throw new UnknownWKBException($wkb);
+        }
+
+        $srid = $unpacked[1];
 
         $wkb = substr($wkb, 4);
         $parser = new Parser(new Factory());
@@ -110,6 +122,6 @@ public static function fromJson(string|GeoJson $geoJson): self
 
     public function toJson($options = 0)
     {
-        return json_encode($this, $options);
+        return json_encode($this, $options | JSON_THROW_ON_ERROR);
     }
 }

src/Types/GeometryCollection.php

@@ -13,7 +13,7 @@
 use Limenet\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 
 /**
- * @template G
+ * @template GeoType of GeometryInterface
  *
  * @implements GeometryInterface<FeatureCollection>
  */
@@ -32,12 +32,12 @@ class GeometryCollection extends Geometry implements IteratorAggregate, ArrayAcc
     /**
      * The items contained in the spatial collection.
      *
-     * @var G[]
+     * @var GeoType[]
      */
     protected array $items = [];
 
     /**
-     * @param  GeometryInterface[]  $geometries
+     * @param  GeoType[]  $geometries
      *
      * @throws InvalidArgumentException
      */
@@ -51,7 +51,7 @@ public function __construct(array $geometries, ?int $srid = 0)
     }
 
     /**
-     * @return G[]
+     * @return GeoType[]
      */
     public function getGeometries(): array
     {
@@ -75,12 +75,11 @@ public static function fromString(string $wktArgument, int $srid = 0): static
         }
 
         $geometry_strings = preg_split('/,\s*(?=[A-Za-z])/', $wktArgument);
+        if ($geometry_strings === false) {
+            return new static([]);
+        }
 
-        return new static(array_map(function ($geometry_string) {
-            $klass = Geometry::getWKTClass($geometry_string);
-
-            return call_user_func($klass.'::fromWKT', $geometry_string);
-        }, $geometry_strings), $srid);
+        return new static(array_map(fn ($geometry_string) => call_user_func([Geometry::getWKTClass($geometry_string), 'fromWKT'], $geometry_string), $geometry_strings), $srid);
     }
 
     public function toArray()
@@ -159,6 +158,8 @@ public function jsonSerialize()
 
     /**
      * Checks whether the items are valid to create this collection.
+     *
+     * @param  GeoType[]  $items
      */
     protected function validateItems(array $items): void
     {
@@ -172,7 +173,7 @@ protected function validateItems(array $items): void
     /**
      * Checks whether the array has enough items to generate a valid WKT.
      *
-     * @param  GeometryInterface[]  $items
+     * @param  GeoType[]  $items
      *
      * @see $minimumCollectionItems
      */

src/Types/GeometryInterface.php

@@ -5,7 +5,7 @@
 use GeoJson\GeoJson;
 
 /**
- * @template T
+ * @template GeoType
  */
 interface GeometryInterface
 {
@@ -20,7 +20,7 @@ public static function fromString(string $wktArgument, int $srid = 0): self;
     public static function fromJson(string|GeoJson $geoJson): self;
 
     /**
-     * @return T
+     * @return GeoType
      */
     #[\ReturnTypeWillChange]
     public function jsonSerialize();

src/Types/MultiLineString.php

@@ -5,6 +5,7 @@
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiLineString as GeoJsonMultiLineString;
 use Limenet\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use RuntimeException;
 
 /**
  * @implements GeometryInterface<LineString>
@@ -36,6 +37,11 @@ public function toWKT(): string
     public static function fromString(string $wktArgument, int $srid = 0): static
     {
         $str = preg_split('/\)\s*,\s*\(/', substr(trim($wktArgument), 1, -1));
+
+        if ($str === false) {
+            throw new RuntimeException();
+        }
+
         $lineStrings = array_map(fn ($data) => LineString::fromString($data), $str);
 
         return new static($lineStrings, $srid);

src/Types/MultiPolygon.php

@@ -5,6 +5,7 @@
 use GeoJson\GeoJson;
 use GeoJson\Geometry\MultiPolygon as GeoJsonMultiPolygon;
 use Limenet\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
+use RuntimeException;
 
 /**
  * @implements GeometryInterface<MultiPolygon>
@@ -36,6 +37,11 @@ public function __toString()
     public static function fromString(string $wktArgument, int $srid = 0): static
     {
         $parts = preg_split('/(\)\s*\)\s*,\s*\(\s*\()/', $wktArgument, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        if ($parts === false) {
+            throw new RuntimeException();
+        }
+
         $polygons = static::assembleParts($parts);
 
         return new static(array_map(fn ($polygonString) => Polygon::fromString($polygonString), $polygons), $srid);