Merge pull request #12 from IntVent/petericebear-patch-1

Updated psalm & cs fixer

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

@@ -3,27 +3,21 @@ name: Check & fix styling
 on: [push]
 
 jobs:
-    style:
-        runs-on: ubuntu-latest
+  php-cs-fixer:
+    runs-on: ubuntu-latest
 
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v1
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
 
-            -   name: Fix style
-                uses: docker://oskarstark/php-cs-fixer-ga
-                with:
-                    args: --config=.php_cs --allow-risky=yes
+      - name: Run PHP CS Fixer
+        uses: docker://oskarstark/php-cs-fixer-ga
+        with:
+          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
-            -   name: Extract branch name
-                shell: bash
-                run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-                id: extract_branch
-
-            -   name: Commit changes
-                uses: stefanzweifel/[email protected]
-                with:
-                    commit_message: Fix styling
-                    branch: ${{ steps.extract_branch.outputs.branch }}
-                env:
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Fix styling

.gitignore

@@ -6,3 +6,4 @@ coverage
 .phpunit.result.cache
 .php_cs.cache
 .idea
+/.php-cs-fixer.cache

.php_cs → .php-cs-fixer.dist.php

@@ -6,18 +6,17 @@
         __DIR__ . '/tests',
     ])
     ->name('*.php')
-    ->notName('*.blade.php')
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
-        '@PSR2' => true,
+        '@PSR12' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -26,9 +25,15 @@
         ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_var_without_name' => true,
+        'class_attributes_separation' => [
+            'elements' => [
+                'method' => 'one',
+            ],
+        ],
         'method_argument_space' => [
             'on_multiline' => 'ensure_fully_multiline',
             'keep_multiple_spaces_after_comma' => true,
-        ]
+        ],
+        'single_trait_insert_per_statement' => true,
     ])
     ->setFinder($finder);

src/Client.php

@@ -363,8 +363,10 @@ public function getSaldo(SaldoFilter $filter = null): float
     }
 
     /**
-     * @param  SaldiFilter|null  $filter
-     * @return float
+     * @param SaldiFilter|null  $filter
+     *
+     * @return array
+     *
      * @throws EboekhoudenSoapException
      */
     public function getSaldi(SaldiFilter $filter = null): array

src/Filters/RelationFilter.php

@@ -8,7 +8,6 @@ class RelationFilter
     protected string $code = '';
     protected string $keyword = '';
 
-
     /**
      * @return int
      */

src/Models/EboekhoudenArticle.php

@@ -207,7 +207,6 @@ public function setPriceExclVat(float $price_excl_vat): EboekhoudenArticle
         return $this;
     }
 
-
     /**
      * @return float
      */

src/Models/EboekhoudenBalance.php

@@ -95,7 +95,8 @@ public function getBalance(): float
     }
 
     /**
-     * @param string $balance
+     * @param float $balance
+     *
      * @return EboekhoudenBalance
      */
     public function setBalance(float $balance): EboekhoudenBalance