Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-16 04:28:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix phpstan/phpcs

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-06-26 14:38:07 +02:00
parent 3dc169e935
commit 62fb162556
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiController.php
View File

@ -453,7 +453,7 @@ final class ApiController extends Controller
if (!empty($uploadedFiles)) { if (!empty($uploadedFiles)) {
$upload = new UploadFile(); $upload = new UploadFile();
$upload->preserveFileName = false; $upload->preserveFileName = false;
$upload->soutputDir = __DIR__ . '/../../../Web/Backend/img'; $upload->outputDir = __DIR__ . '/../../../Web/Backend/img';
$status = $upload->upload($uploadedFiles, 'logo.png', true); $status = $upload->upload($uploadedFiles, 'logo.png', true);
} }

13
Models/GroupMapper.php
View File

@ -104,15 +104,24 @@ final class GroupMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(GroupPermissionMapper::getTable()) $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); ->where(GroupPermissionMapper::getTable() . '.group_permission_module', '=', $module);
return self::getAllByQuery($query, RelationType::ALL, $depth); 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 public static function countMembers(int $group = 0) : array
{ {
$query = new Builder(self::$db); $query = new Builder(self::$db);
$query->select(self::$hasMany['accounts']['self']) $query->select(self::$hasMany['accounts']['self'])
->select('COUNT(' . self::$hasMany['accounts']['external'] . ')') ->select('COUNT(' . self::$hasMany['accounts']['external'] . ')')
->from(self::$hasMany['accounts']['table']) ->from(self::$hasMany['accounts']['table'])

2
composer.json
View File

@ -9,7 +9,7 @@
], ],
"require-dev": { "require-dev": {
"phpunit/phpunit": ">=9.4", "phpunit/phpunit": ">=9.4",
"friendsofphp/php-cs-fixer": ">=2.18", "friendsofphp/php-cs-fixer": ">=3.0",
"squizlabs/php_codesniffer": ">=3.5", "squizlabs/php_codesniffer": ">=3.5",
"phpmd/phpmd": ">=2.9", "phpmd/phpmd": ">=2.9",
"phpstan/phpstan": ">=0.12.58", "phpstan/phpstan": ">=0.12.58",