composer update and fixes

Author: MatanYadaev

.gitignore

@@ -1,5 +1,5 @@
 .idea
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 build
 composer.lock

.php_cs renamed to .php-cs-fixer.php

@@ -16,8 +16,8 @@
         "phayes/geophp": "^1.2"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.17",
-        "matt-allan/laravel-code-style": "^0.6.0",
+        "friendsofphp/php-cs-fixer": "^3.0.0",
+        "matt-allan/laravel-code-style": "dev-main",
         "nunomaduro/larastan": "^0.7.0",
         "nunomaduro/phpinsights": "dev-master",
         "orchestra/testbench": "^6.0",

composer.json

@@ -4,14 +4,12 @@
 
 use NunoMaduro\PhpInsights\Domain\Insights\CyclomaticComplexityIsHigh;
 use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses;
-use ObjectCalisthenics\Sniffs\Files\ClassTraitAndInterfaceLengthSniff;
-use ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff;
-use ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff;
-use ObjectCalisthenics\Sniffs\Metrics\MethodPerClassLimitSniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UselessOverridingMethodSniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff;
+use SlevomatCodingStandard\Sniffs\Classes\ForbiddenPublicPropertySniff;
 use SlevomatCodingStandard\Sniffs\Classes\SuperfluousExceptionNamingSniff;
 use SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff;
+use SlevomatCodingStandard\Sniffs\Functions\FunctionLengthSniff;
 use SlevomatCodingStandard\Sniffs\Functions\UnusedParameterSniff;
 use SlevomatCodingStandard\Sniffs\TypeHints\DisallowMixedTypeHintSniff;
 use SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff;
@@ -90,9 +88,9 @@
             'absoluteLineLimit' => 150,
             'ignoreComments' => false,
         ],
-        MaxNestingLevelSniff::class => [
-            'maxNestingLevel' => 3,
-        ],
+        //        MaxNestingLevelSniff::class => [
+        //            'maxNestingLevel' => 3,
+        //        ],
         InlineDocCommentDeclarationSniff::class => [
             'exclude' => [
                 'src/Factory.php',
@@ -105,21 +103,14 @@
                 'src/GeometryCast.php',
             ],
         ],
-        MethodPerClassLimitSniff::class => [
-            'exclude' => [
-                'src/SpatialBuilder.php',
-                'src/Objects/Geometry.php',
-                'src/Objects/GeometryCollection.php',
-            ],
-        ],
-        ClassTraitAndInterfaceLengthSniff::class => [
+        FunctionLengthSniff::class => [
             'exclude' => [
-                'src/SpatialBuilder.php',
+                'src/Factory.php',
             ],
         ],
-        FunctionLengthSniff::class => [
+        ForbiddenPublicPropertySniff::class => [
             'exclude' => [
-                'src/Factory.php',
+                'src/Objects/Point.php',
             ],
         ],
         CyclomaticComplexityIsHigh::class => [

phpinsights.php

@@ -7,6 +7,9 @@ parameters:
     level: max
     ignoreErrors:
         - '#Method MatanYadaev\\EloquentSpatial\\Objects\\(Geometry|GeometryCollection)::(toJson|toFeatureCollectionJson)\(\) should return string but returns string\|false\.#'
+        -
+            message: '#Call to private method .+\(\) of parent class Illuminate\\Database\\Eloquent\\Builder\<Illuminate\\Database\\Eloquent\\Model\>.#'
+            path: ./src/SpatialBuilder.php
     excludePaths:
         - ./src/Factory.php
     checkMissingIterableValueType: true

phpstan.neon

@@ -54,10 +54,8 @@ public function it_throws_exception_when_deserializing_invalid_geometry_object()
     {
         $this->expectException(InvalidArgumentException::class);
 
-        TestPlace::insert([
-            array_merge(TestPlace::factory()->definition(), [
-                'point_with_line_string_cast' => DB::raw('POINT(0, 180)'),
-            ]),
+        TestPlace::factory()->create([
+            'point_with_line_string_cast' => DB::raw('POINT(0, 180)'),
         ]);
 
         /** @var TestPlace $testPlace */