upgrade code using rector

limenet · limenet · commit 357d4d1dd235 · 2023-07-07T09:36:29.000+02:00
diff --git a/composer.json b/composer.json
@@ -8,7 +8,8 @@
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage",
         "format": "vendor/bin/pint",
-        "post-update-cmd": "@composer bump -D"
+        "post-update-cmd": "@composer bump -D",
+        "rector": "./vendor/bin/rector process"
     },
     "type": "library",
     "license": "MIT",
@@ -34,17 +35,19 @@
     },
     "conflict": {},
     "require-dev": {
-        "laravel/pint": "^1.10.3",
-        "laravel/laravel": "^10.2.4",
+        "driftingly/rector-laravel": "^0.21.0",
         "laravel/browser-kit-testing": "^7.0",
+        "laravel/laravel": "^10.2.4",
+        "laravel/pint": "^1.10.3",
         "mockery/mockery": "^1.6.2",
         "nunomaduro/collision": "^7.7.0",
         "nunomaduro/larastan": "^2.6.3",
         "orchestra/testbench": "^8.5.9",
         "phpstan/extension-installer": "^1.3.1",
         "phpstan/phpstan-deprecation-rules": "^1.1.3",
         "phpstan/phpstan-phpunit": "^1.3.13",
-        "phpunit/phpunit": "^10.2.3"
+        "phpunit/phpunit": "^10.2.3",
+        "rector/rector": "^0.17.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/rector.php b/rector.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
+use RectorLaravel\Set\LaravelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+    ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_81,
+        LaravelSetList::LARAVEL_100,
+        SetList::CODE_QUALITY,
+    ]);
+};
diff --git a/src/Doctrine/Geometry.php b/src/Doctrine/Geometry.php
@@ -7,7 +7,7 @@
 
 class Geometry extends Type
 {
-    const GEOMETRY = 'geometry';
+    final public const GEOMETRY = 'geometry';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Doctrine/GeometryCollection.php b/src/Doctrine/GeometryCollection.php
@@ -7,7 +7,7 @@
 
 class GeometryCollection extends Type
 {
-    const GEOMETRYCOLLECTION = 'geometrycollection';
+    final public const GEOMETRYCOLLECTION = 'geometrycollection';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Doctrine/LineString.php b/src/Doctrine/LineString.php
@@ -7,7 +7,7 @@
 
 class LineString extends Type
 {
-    const LINESTRING = 'linestring';
+    final public const LINESTRING = 'linestring';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Doctrine/MultiLineString.php b/src/Doctrine/MultiLineString.php
@@ -7,7 +7,7 @@
 
 class MultiLineString extends Type
 {
-    const MULTILINESTRING = 'multilinestring';
+    final public const MULTILINESTRING = 'multilinestring';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Doctrine/MultiPoint.php b/src/Doctrine/MultiPoint.php
@@ -7,7 +7,7 @@
 
 class MultiPoint extends Type
 {
-    const MULTIPOINT = 'multipoint';
+    final public const MULTIPOINT = 'multipoint';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Doctrine/MultiPolygon.php b/src/Doctrine/MultiPolygon.php
@@ -7,7 +7,7 @@
 
 class MultiPolygon extends Type
 {
-    const MULTIPOLYGON = 'multipolygon';
+    final public const MULTIPOLYGON = 'multipolygon';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Doctrine/Point.php b/src/Doctrine/Point.php
@@ -7,7 +7,7 @@
 
 class Point extends Type
 {
-    const POINT = 'point';
+    final public const POINT = 'point';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Doctrine/Polygon.php b/src/Doctrine/Polygon.php
@@ -7,7 +7,7 @@
 
 class Polygon extends Type
 {
-    const POLYGON = 'polygon';
+    final public const POLYGON = 'polygon';
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
diff --git a/src/Eloquent/SpatialExpression.php b/src/Eloquent/SpatialExpression.php
@@ -9,18 +9,12 @@
 
 class SpatialExpression extends Expression
 {
-    /**
-     * @var Geometry|GeometryInterface
-     */
-    protected $value;
-
     /**
      * @param  Geometry|GeometryInterface  $value
      * @return void
      */
-    public function __construct($value)
+    public function __construct(protected $value)
     {
-        $this->value = $value;
     }
 
     public function getValue(Grammar $grammar)
diff --git a/src/Eloquent/SpatialTrait.php b/src/Eloquent/SpatialTrait.php
@@ -116,11 +116,11 @@ public function getSpatialFields()
         if (property_exists($this, 'spatialFields')) {
             return $this->spatialFields;
         } else {
-            throw new SpatialFieldsNotDefinedException(__CLASS__.' has to define $spatialFields');
+            throw new SpatialFieldsNotDefinedException(self::class.' has to define $spatialFields');
         }
     }
 
-    public function isColumnAllowed($geometryColumn)
+    public function isColumnAllowed($geometryColumn): bool
     {
         if (! in_array($geometryColumn, $this->getSpatialFields())) {
             throw new SpatialFieldsNotDefinedException();
diff --git a/src/Exceptions/InvalidGeoJsonException.php b/src/Exceptions/InvalidGeoJsonException.php
@@ -4,4 +4,14 @@
 
 class InvalidGeoJsonException extends \RuntimeException
 {
+    /**
+     * @param  class-string  $expected
+     * @param  class-string  $actual
+     */
+    public function __construct(string $expected, string $actual)
+    {
+        parent::__construct(
+            sprintf('Expected %s, got %s', $expected, $actual)
+        );
+    }
 }
diff --git a/src/Schema/Blueprint.php b/src/Schema/Blueprint.php
@@ -11,7 +11,7 @@ class Blueprint extends IlluminateBlueprint
      */
     public function geometry($column, ?int $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('geometry', $column, compact('srid'));
+        return $this->addColumn('geometry', $column, ['srid' => $srid]);
     }
 
     /**
@@ -21,55 +21,55 @@ public function geometry($column, ?int $srid = null): \Illuminate\Support\Fluent
      */
     public function point($column, $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('point', $column, compact('srid'));
+        return $this->addColumn('point', $column, ['srid' => $srid]);
     }
 
     /**
      * Add a linestring column on the table.
      */
     public function lineString($column, ?int $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('linestring', $column, compact('srid'));
+        return $this->addColumn('linestring', $column, ['srid' => $srid]);
     }
 
     /**
      * Add a polygon column on the table.
      */
     public function polygon($column, ?int $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('polygon', $column, compact('srid'));
+        return $this->addColumn('polygon', $column, ['srid' => $srid]);
     }
 
     /**
      * Add a multipoint column on the table.
      */
     public function multiPoint($column, ?int $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('multipoint', $column, compact('srid'));
+        return $this->addColumn('multipoint', $column, ['srid' => $srid]);
     }
 
     /**
      * Add a multilinestring column on the table.
      */
     public function multiLineString($column, ?int $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('multilinestring', $column, compact('srid'));
+        return $this->addColumn('multilinestring', $column, ['srid' => $srid]);
     }
 
     /**
      * Add a multipolygon column on the table.
      */
     public function multiPolygon($column, ?int $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('multipolygon', $column, compact('srid'));
+        return $this->addColumn('multipolygon', $column, ['srid' => $srid]);
     }
 
     /**
      * Add a geometrycollection column on the table.
      */
     public function geometryCollection($column, ?int $srid = null): \Illuminate\Support\Fluent
     {
-        return $this->addColumn('geometrycollection', $column, compact('srid'));
+        return $this->addColumn('geometrycollection', $column, ['srid' => $srid]);
     }
 
     /**
diff --git a/src/Schema/Grammars/MySqlGrammar.php b/src/Schema/Grammars/MySqlGrammar.php
@@ -8,7 +8,7 @@
 
 class MySqlGrammar extends IlluminateMySqlGrammar
 {
-    const COLUMN_MODIFIER_SRID = 'Srid';
+    final public const COLUMN_MODIFIER_SRID = 'Srid';
 
     public function __construct()
     {
diff --git a/src/Types/Geometry.php b/src/Types/Geometry.php
@@ -21,11 +21,8 @@ abstract class Geometry implements GeometryInterface, Jsonable, \JsonSerializabl
         7 => GeometryCollection::class,
     ];
 
-    protected int $srid;
-
-    public function __construct(int $srid = 0)
+    public function __construct(protected int $srid = 0)
     {
-        $this->srid = $srid;
     }
 
     public function getSrid(): int
@@ -103,7 +100,7 @@ public static function fromWKT(string $wkt, int $srid = 0): static
     public static function fromJson(string|GeoJson $geoJson): self
     {
         if (is_string($geoJson)) {
-            $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
+            $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson, flags: JSON_THROW_ON_ERROR));
         }
 
         if ($geoJson->getType() === 'FeatureCollection') {
diff --git a/src/Types/GeometryCollection.php b/src/Types/GeometryCollection.php
@@ -17,7 +17,7 @@
  *
  * @implements GeometryInterface<FeatureCollection>
  */
-class GeometryCollection extends Geometry implements IteratorAggregate, ArrayAccess, Arrayable, Countable, GeometryInterface
+class GeometryCollection extends Geometry implements IteratorAggregate, ArrayAccess, Arrayable, Countable, GeometryInterface, \Stringable
 {
     /**
      * The minimum number of items required to create this collection.
@@ -63,14 +63,14 @@ public function toWKT(): string
         return sprintf('GEOMETRYCOLLECTION(%s)', (string) $this);
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return implode(',', array_map(fn (GeometryInterface $geometry) => $geometry->toWKT(), $this->items));
     }
 
     public static function fromString(string $wktArgument, int $srid = 0): static
     {
-        if (empty($wktArgument)) {
+        if ($wktArgument === '') {
             return new static([]);
         }
 
@@ -127,11 +127,11 @@ public function count(): int
     public static function fromJson(string|GeoJson $geoJson): self
     {
         if (is_string($geoJson)) {
-            $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
+            $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson, flags: JSON_THROW_ON_ERROR));
         }
 
-        if (! is_a($geoJson, FeatureCollection::class)) {
-            throw new InvalidGeoJsonException('Expected '.FeatureCollection::class.', got '.get_class($geoJson));
+        if (! $geoJson instanceof FeatureCollection) {
+            throw new InvalidGeoJsonException(FeatureCollection::class, $geoJson::class);
         }
 
         $set = [];
@@ -184,7 +184,7 @@ protected function validateItemCount(array $items): void
 
             throw new InvalidArgumentException(sprintf(
                 '%s must contain at least %d %s',
-                get_class($this),
+                static::class,
                 $this->minimumCollectionItems,
                 $entries
             ));
@@ -202,7 +202,7 @@ protected function validateItemType(mixed $item): void
         if (! $item instanceof $this->collectionItemType) {
             throw new InvalidArgumentException(sprintf(
                 '%s must be a collection of %s',
-                get_class($this),
+                static::class,
                 $this->collectionItemType
             ));
         }
diff --git a/src/Types/LineString.php b/src/Types/LineString.php
@@ -6,7 +6,7 @@
 use GeoJson\Geometry\LineString as GeoJsonLineString;
 use Limenet\LaravelMysqlSpatial\Exceptions\InvalidGeoJsonException;
 
-class LineString extends PointCollection
+class LineString extends PointCollection implements \Stringable
 {
     /**
      * The minimum number of items required to create this collection.
@@ -33,19 +33,19 @@ public static function fromString(string $wktArgument, int $srid = 0): static
         return new static($points, $srid);
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->toPairList();
     }
 
     public static function fromJson(string|GeoJson $geoJson): self
     {
         if (is_string($geoJson)) {
-            $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson));
+            $geoJson = GeoJson::jsonUnserialize(json_decode($geoJson, null, 512, JSON_THROW_ON_ERROR));
         }
 
-        if (! is_a($geoJson, GeoJsonLineString::class)) {
-            throw new InvalidGeoJsonException('Expected '.GeoJsonLineString::class.', got '.get_class($geoJson));
+        if (! $geoJson instanceof GeoJsonLineString) {
+            throw new InvalidGeoJsonException(GeoJsonLineString::class, $geoJson::class);
         }
 
         $set = [];
diff --git a/src/Types/MultiLineString.php b/src/Types/MultiLineString.php
diff --git a/src/Types/MultiPoint.php b/src/Types/MultiPoint.php
diff --git a/src/Types/MultiPolygon.php b/src/Types/MultiPolygon.php
diff --git a/src/Types/Point.php b/src/Types/Point.php
diff --git a/src/Types/Polygon.php b/src/Types/Polygon.php

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class Geometry extends Type`
`9`	`9`	`{`
`10`		`- const GEOMETRY = 'geometry';`
	`10`	`+ final public const GEOMETRY = 'geometry';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class GeometryCollection extends Type`
`9`	`9`	`{`
`10`		`- const GEOMETRYCOLLECTION = 'geometrycollection';`
	`10`	`+ final public const GEOMETRYCOLLECTION = 'geometrycollection';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class LineString extends Type`
`9`	`9`	`{`
`10`		`- const LINESTRING = 'linestring';`
	`10`	`+ final public const LINESTRING = 'linestring';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class MultiLineString extends Type`
`9`	`9`	`{`
`10`		`- const MULTILINESTRING = 'multilinestring';`
	`10`	`+ final public const MULTILINESTRING = 'multilinestring';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class MultiPoint extends Type`
`9`	`9`	`{`
`10`		`- const MULTIPOINT = 'multipoint';`
	`10`	`+ final public const MULTIPOINT = 'multipoint';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class MultiPolygon extends Type`
`9`	`9`	`{`
`10`		`- const MULTIPOLYGON = 'multipolygon';`
	`10`	`+ final public const MULTIPOLYGON = 'multipolygon';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class Point extends Type`
`9`	`9`	`{`
`10`		`- const POINT = 'point';`
	`10`	`+ final public const POINT = 'point';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class Polygon extends Type`
`9`	`9`	`{`
`10`		`- const POLYGON = 'polygon';`
	`10`	`+ final public const POLYGON = 'polygon';`
`11`	`11`
`12`	`12`	`public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)`
`13`	`13`	`{`