Fix indentation (#43)

* Set indent size config to 2 spaces

* Fix indentations

* make GeometryCollection@toArray more readable

* remove unnecessary tests

Co-authored-by: Matan Yadaev <[email protected]>

Author: MatanYadaev

.editorconfig

@@ -2,14 +2,11 @@ root = true
 
 [*]
 charset = utf-8
-indent_size = 4
+indent_size = 2
 indent_style = space
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2

.github/workflows/php-cs-fixer.yml

@@ -1,6 +1,6 @@
 name: Lint
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   php-cs-fixer:

.github/workflows/phpinsights.yml

@@ -1,6 +1,6 @@
 name: Code quality analysis
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   phpstan:

.github/workflows/phpstan.yml

@@ -1,6 +1,6 @@
 name: Static code analysis
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   phpstan:
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.0]
+        php: [ 8.1, 8.0 ]
 
     steps:
       - name: Checkout code

.github/workflows/phpunit.yml

@@ -1,6 +1,6 @@
 name: Tests
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   test:
@@ -11,10 +11,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.0]
-        laravel: [9.*, 8.*]
+        php: [ 8.1, 8.0 ]
+        laravel: [ 9.*, 8.* ]
         # dependency-version: [prefer-lowest, prefer-stable]
-        dependency-version: [prefer-stable]
+        dependency-version: [ prefer-stable ]
         include:
           - laravel: 8.*
             testbench: ^6.23

.github/workflows/update-changelog.yml

@@ -2,7 +2,7 @@ name: Update Changelog
 
 on:
   release:
-    types: [released]
+    types: [ released ]
 
 jobs:
   update:
@@ -25,4 +25,4 @@ jobs:
         with:
           branch: master
           commit_message: Update CHANGELOG
-          file_pattern: CHANGELOG.md
+          file_pattern: CHANGELOG.md

.php-cs-fixer.php

@@ -1,12 +1,13 @@
 <?php
 
 return (new Jubeki\LaravelCodeStyle\Config())
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__)
-    )
-    ->setRules([
-        '@Laravel' => true,
-        '@Laravel:risky' => true,
-    ])
-    ->setRiskyAllowed(true);
+  ->setFinder(
+    PhpCsFixer\Finder::create()
+      ->in(__DIR__)
+  )
+  ->setIndent('  ')
+  ->setRules([
+    '@Laravel' => true,
+    '@Laravel:risky' => true,
+  ])
+  ->setRiskyAllowed(true);

composer.json

@@ -1,53 +1,53 @@
 {
-    "name": "matanyadaev/laravel-eloquent-spatial",
-    "description": "Spatial library for Laravel",
-    "homepage": "https://github.com/matanyadaev/laravel-eloquent-spatial",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Matan Yadaev",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": "^8.0",
-        "ext-json": "*",
-        "laravel/framework": "^8.0|^9.0",
-        "phayes/geophp": "^1.2"
-    },
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.0",
-        "jubeki/laravel-code-style": "^1.0",
-        "nunomaduro/phpinsights": "^1.0|^2.0",
-        "nunomaduro/larastan": "^1.0|^2.0",
-        "orchestra/testbench": "^6.23|^7.0",
-        "phpunit/phpunit": "^9.3"
-    },
-    "autoload": {
-        "psr-4": {
-            "MatanYadaev\\EloquentSpatial\\": "src",
-            "MatanYadaev\\EloquentSpatial\\Database\\Factories\\": "database/factories"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "MatanYadaev\\EloquentSpatial\\Tests\\": "tests"
-        }
-    },
-    "scripts": {
-        "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": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html coverage",
-        "phpinsights": "./vendor/bin/phpinsights",
-        "phpinsights-fix": "./vendor/bin/phpinsights fix"
-    },
-    "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": false
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+  "name": "matanyadaev/laravel-eloquent-spatial",
+  "description": "Spatial library for Laravel",
+  "homepage": "https://github.com/matanyadaev/laravel-eloquent-spatial",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Matan Yadaev",
+      "email": "[email protected]"
+    }
+  ],
+  "require": {
+    "php": "^8.0",
+    "ext-json": "*",
+    "laravel/framework": "^8.0|^9.0",
+    "phayes/geophp": "^1.2"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3.0",
+    "jubeki/laravel-code-style": "^1.0",
+    "nunomaduro/phpinsights": "^1.0|^2.0",
+    "nunomaduro/larastan": "^1.0|^2.0",
+    "orchestra/testbench": "^6.23|^7.0",
+    "phpunit/phpunit": "^9.3"
+  },
+  "autoload": {
+    "psr-4": {
+      "MatanYadaev\\EloquentSpatial\\": "src",
+      "MatanYadaev\\EloquentSpatial\\Database\\Factories\\": "database/factories"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "MatanYadaev\\EloquentSpatial\\Tests\\": "tests"
+    }
+  },
+  "scripts": {
+    "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": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html coverage",
+    "phpinsights": "./vendor/bin/phpinsights",
+    "phpinsights-fix": "./vendor/bin/phpinsights fix"
+  },
+  "config": {
+    "sort-packages": true,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": false
+    }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }