wip

Author: MatanYadaev

phpinsights.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses;
+use ObjectCalisthenics\Sniffs\Files\ClassTraitAndInterfaceLengthSniff;
 use ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff;
 use ObjectCalisthenics\Sniffs\Metrics\MethodPerClassLimitSniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UselessOverridingMethodSniff;
@@ -81,14 +82,19 @@
     ],
 
     'config' => [
+        LineLengthSniff::class => [
+            'lineLimit' => 110,
+            'absoluteLineLimit' => 150,
+            'ignoreComments' => false,
+        ],
         MaxNestingLevelSniff::class => [
             'exclude' => [
                 'src/Objects/Geometry.php',
             ],
         ],
         UnusedParameterSniff::class => [
             'exclude' => [
-                'src/Objects/Geometry.php',
+                'src/Objects/GeometryCast.php',
             ],
         ],
         MethodPerClassLimitSniff::class => [
@@ -97,10 +103,10 @@
                 'src/Objects/Geometry.php',
             ],
         ],
-        LineLengthSniff::class => [
-            'lineLimit' => 110,
-            'absoluteLineLimit' => 150,
-            'ignoreComments' => false,
+        ClassTraitAndInterfaceLengthSniff::class => [
+            'exclude' => [
+                'src/Builders/SpatialBuilder.php',
+            ],
         ],
     ],
 

src/Builders/SpatialBuilder.php

@@ -10,8 +10,11 @@
 
 class SpatialBuilder extends Builder
 {
-    public function withDistance(string $column, Geometry | string $geometryOrColumn, string $alias = 'distance'): self
-    {
+    public function withDistance(
+        string $column,
+        Geometry | string $geometryOrColumn,
+        string $alias = 'distance'
+    ): self {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 
         if (! $this->getQuery()->columns) {
@@ -28,8 +31,12 @@ public function withDistance(string $column, Geometry | string $geometryOrColumn
         );
     }
 
-    public function whereDistance(string $column, Geometry | string $geometryOrColumn, string $operator, int | float $distance): self
-    {
+    public function whereDistance(
+        string $column,
+        Geometry | string $geometryOrColumn,
+        string $operator,
+        int | float $distance
+    ): self {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 
         return $this->whereRaw(
@@ -43,8 +50,11 @@ public function whereDistance(string $column, Geometry | string $geometryOrColum
         );
     }
 
-    public function orderByDistance(string $column, Geometry | string $geometryOrColumn, string $direction = 'asc'): self
-    {
+    public function orderByDistance(
+        string $column,
+        Geometry | string $geometryOrColumn,
+        string $direction = 'asc'
+    ): self {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 
         return $this->orderByRaw(

src/Objects/Geometry.php

@@ -8,7 +8,6 @@
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Expression;
 use JsonSerializable;
 use MatanYadaev\EloquentSpatial\Exceptions\InvalidTypeException;
@@ -91,53 +90,6 @@ abstract public function getCoordinates(): array;
      */
     public static function castUsing(array $arguments): CastsAttributes
     {
-        $className = static::class;
-
-        return new class($className) implements CastsAttributes {
-            private string $className;
-
-            public function __construct(string $className)
-            {
-                $this->className = $className;
-            }
-
-            /**
-             * @param Model $model
-             * @param string $key
-             * @param string|null $wkt
-             * @param array<string, mixed> $attributes
-             *
-             * @return Geometry|null
-             */
-            public function get($model, string $key, $wkt, array $attributes): ?Geometry
-            {
-                if (! $wkt) {
-                    return null;
-                }
-
-                return $this->className::fromWkt($wkt);
-            }
-
-            /**
-             * @param Model $model
-             * @param string $key
-             * @param Geometry|null $geometry
-             * @param array<string, mixed> $attributes
-             *
-             * @return Expression|string|null
-             */
-            public function set($model, string $key, $geometry, array $attributes): Expression | string | null
-            {
-                if (! $geometry) {
-                    return null;
-                }
-
-                if (! ($geometry instanceof $this->className)) {
-                    throw new InvalidTypeException($this->className, $geometry);
-                }
-
-                return $geometry->toWkt();
-            }
-        };
+        return new GeometryCast(static::class);
     }
 }

src/Objects/GeometryCast.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace MatanYadaev\EloquentSpatial\Objects;
+
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Expression;
+use MatanYadaev\EloquentSpatial\Exceptions\InvalidTypeException;
+
+class GeometryCast implements CastsAttributes
+{
+    private string $className;
+
+    public function __construct(string $className)
+    {
+        $this->className = $className;
+    }
+
+    /**
+     * @param Model $model
+     * @param string $key
+     * @param string|null $wkt
+     * @param array<string, mixed> $attributes
+     *
+     * @return Geometry|null
+     */
+    public function get($model, string $key, $wkt, array $attributes): ?Geometry
+    {
+        if (! $wkt) {
+            return null;
+        }
+
+        return $this->className::fromWkt($wkt, false);
+    }
+
+    /**
+     * @param Model $model
+     * @param string $key
+     * @param Geometry|null $geometry
+     * @param array<string, mixed> $attributes
+     *
+     * @return Expression|string|null
+     * @throws InvalidTypeException
+     */
+    public function set($model, string $key, $geometry, array $attributes): Expression | string | null
+    {
+        if (! $geometry) {
+            return null;
+        }
+
+        if (! ($geometry instanceof $this->className)) {
+            throw new InvalidTypeException($this->className, $geometry);
+        }
+
+        return $geometry->toWkt();
+    }
+}