wip

Author: MatanYadaev

.php_cs.dist

@@ -3,8 +3,7 @@
 return (new MattAllan\LaravelCodeStyle\Config())
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in('src')
-            ->in('tests')
+            ->in('**.php')
     )
     ->setRules([
         '@Laravel' => true,

composer.json

@@ -33,22 +33,20 @@
         "psr-4": {
             "MatanYadaev\\EloquentSpatial\\": "src",
             "MatanYadaev\\EloquentSpatial\\Database\\Factories\\": "database/factories"
-        },
-        "files": [
-            "src/helpers.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
             "MatanYadaev\\EloquentSpatial\\Tests\\": "tests"
         }
     },
     "scripts": {
-        "style-fix": "./vendor/bin/php-cs-fixer fix --allow-risky=yes",
+        "php-cs-fixer": "./vendor/bin/php-cs-fixer fix --allow-risky=yes",
         "phpstan": "./vendor/bin/phpstan analyse --memory-limit=2G",
         "phpunit": "./vendor/bin/phpunit --colors=always",
         "phpunit-coverage": "./vendor/bin/phpunit --coverage-html coverage",
-        "phpinsights": "./vendor/bin/phpinsights"
+        "phpinsights": "./vendor/bin/phpinsights",
+        "phpinsights-fix": "./vendor/bin/phpinsights fix"
     },
     "config": {
         "sort-packages": true

phpinsights.php

@@ -2,6 +2,14 @@
 
 declare(strict_types=1);
 
+use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses;
+use ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff;
+use ObjectCalisthenics\Sniffs\Metrics\MethodPerClassLimitSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UselessOverridingMethodSniff;
+use SlevomatCodingStandard\Sniffs\Classes\SuperfluousExceptionNamingSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff;
+use SlevomatCodingStandard\Sniffs\Functions\UnusedParameterSniff;
+use SlevomatCodingStandard\Sniffs\TypeHints\DisallowMixedTypeHintSniff;
 use SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff;
 use SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff;
 
@@ -66,12 +74,34 @@
     'remove' => [
         ParameterTypeHintSniff::class,
         ReturnTypeHintSniff::class,
+        UselessOverridingMethodSniff::class,
+        DisallowMixedTypeHintSniff::class,
+        ForbiddenNormalClasses::class,
+        SuperfluousExceptionNamingSniff::class,
     ],
 
     'config' => [
-        //  ExampleInsight::class => [
-        //      'key' => 'value',
-        //  ],
+        MaxNestingLevelSniff::class => [
+            'exclude' => [
+                'src/Objects/Geometry.php',
+            ]
+        ],
+        UnusedParameterSniff::class => [
+            'exclude' => [
+                'src/Objects/Geometry.php',
+            ]
+        ],
+        MethodPerClassLimitSniff::class => [
+            'exclude' => [
+                'src/Builders/SpatialBuilder.php',
+                'src/Objects/Geometry.php',
+            ]
+        ],
+        LineLengthSniff::class => [
+            'lineLimit' => 110,
+            'absoluteLineLimit' => 150,
+            'ignoreComments' => false,
+        ]
     ],
 
     /*

src/Builders/SpatialBuilder.php

@@ -59,8 +59,11 @@ public function whereDistanceSphere(string $column, Geometry | string $geometryO
         return $this->whereRaw("ST_DISTANCE_SPHERE(`{$column}`, {$geometryOrColumn}) {$operator} {$distance}");
     }
 
-    public function orderByDistanceSphere(string $column, Geometry | string $geometryOrColumn, string $direction = 'asc'): self
-    {
+    public function orderByDistanceSphere(
+        string $column,
+        Geometry | string $geometryOrColumn,
+        string $direction = 'asc'
+    ): self {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 
         return $this->orderByRaw("ST_DISTANCE_SPHERE(`{$column}`, {$geometryOrColumn}) {$direction}");

src/Factory.php

@@ -27,7 +27,9 @@ class Factory
 {
     public static function parse(string $value): Geometry
     {
-        if (! is_json($value)) {
+        $isJson = (bool) is_object(json_decode($value));
+
+        if (! $isJson) {
             // MySQL adds 4 NULL bytes at the start of the WKB
             $value = substr($value, 4);
         }
@@ -41,11 +43,12 @@ public static function parse(string $value): Geometry
     protected static function create(geoPHPGeometry $geometry): Geometry
     {
         if ($geometry instanceof geoPHPGeometryCollection) {
-            $components = collect($geometry->components)->map(static function (geoPHPGeometry $geometryComponent): Geometry {
-                return self::create($geometryComponent);
-            });
+            $components = collect($geometry->components)
+                ->map(static function (geoPHPGeometry $geometryComponent): Geometry {
+                    return self::create($geometryComponent);
+                });
 
-            $className = get_class($geometry);
+            $className = $geometry::class;
 
             if ($className === geoPHPMultiPoint::class) {
                 return self::createMultiPoint($components);

src/Objects/GeometryCollection.php

@@ -87,7 +87,10 @@ protected function validateGeometriesCount(): void
         if ($geometriesCount < $this->minimumGeometries) {
             $className = self::class;
 
-            throw new InvalidArgumentException("{$className} must contain at least {$this->minimumGeometries} ".Str::plural('entries', $geometriesCount));
+            throw new InvalidArgumentException(
+                "{$className} must contain at least {$this->minimumGeometries} "
+                .Str::plural('entries', $geometriesCount)
+            );
         }
     }
 
@@ -100,7 +103,9 @@ protected function validateGeometriesType(): void
             if (! ($geometry instanceof $this->collectionOf)) {
                 $className = self::class;
 
-                throw new InvalidArgumentException("{$className} must be a collection of {$this->collectionOf}");
+                throw new InvalidArgumentException(
+                    "{$className} must be a collection of {$this->collectionOf}"
+                );
             }
         });
     }
@@ -109,7 +114,7 @@ protected function toCollectionWkt(): Expression
     {
         $wkb = $this->geometries
             ->map(static function (Geometry $geometry): string {
-                return $geometry->toWkt();
+                return (string) $geometry->toWkt();
             })
             ->join(',');