From 62fb1625561242b7ee41746b0e793d1615fb26a7 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 26 Jun 2021 14:38:07 +0200
Subject: [PATCH] fix phpstan/phpcs

---
 Controller/ApiController.php |  2 +-
 Models/GroupMapper.php       | 13 +++++++++++--
 composer.json                |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 2eb4e52..c4e6cb2 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -453,7 +453,7 @@ final class ApiController extends Controller
         if (!empty($uploadedFiles)) {
             $upload                   = new UploadFile();
             $upload->preserveFileName = false;
-            $upload->soutputDir       = __DIR__ . '/../../../Web/Backend/img';
+            $upload->outputDir        = __DIR__ . '/../../../Web/Backend/img';
 
             $status = $upload->upload($uploadedFiles, 'logo.png', true);
         }
diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php
index 548d7d9..8a16bc4 100755
--- a/Models/GroupMapper.php
+++ b/Models/GroupMapper.php
@@ -104,15 +104,24 @@ final class GroupMapper extends DataMapperAbstract
         $depth = 3;
         $query = self::getQuery();
         $query->innerJoin(GroupPermissionMapper::getTable())
-            ->on(self::$table . '_' . $depth . '.group_id', '=', GroupPermissionMapper::getTable() . '.group_permission_group')
+            ->on(self::$table . '_d' . $depth . '.group_id', '=', GroupPermissionMapper::getTable() . '.group_permission_group')
             ->where(GroupPermissionMapper::getTable() . '.group_permission_module', '=', $module);
 
         return self::getAllByQuery($query, RelationType::ALL, $depth);
     }
 
+    /**
+     * Count the number of group members
+     *
+     * @param int $group Group to inspect (0 = all groups)
+     *
+     * @return array<string, int>
+     *
+     * @since 1.0.0
+     */
     public static function countMembers(int $group = 0) : array
     {
-        $query  = new Builder(self::$db);
+        $query = new Builder(self::$db);
         $query->select(self::$hasMany['accounts']['self'])
             ->select('COUNT(' . self::$hasMany['accounts']['external'] . ')')
             ->from(self::$hasMany['accounts']['table'])
diff --git a/composer.json b/composer.json
index 8f2fb6d..7ad134b 100755
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     ],
     "require-dev": {
         "phpunit/phpunit": ">=9.4",
-        "friendsofphp/php-cs-fixer": ">=2.18",
+        "friendsofphp/php-cs-fixer": ">=3.0",
         "squizlabs/php_codesniffer": ">=3.5",
         "phpmd/phpmd": ">=2.9",
         "phpstan/phpstan": ">=0.12.58",