Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-02-14 05:38:40 +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:08 +02:00
parent 51fd062eef
commit 2cdbd83244
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Models/TaskMapper.php
View File

@ -148,8 +148,8 @@ final class TaskMapper extends DataMapperAbstract
{ {
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->where(self::$table . '_' . $depth . '.task_created_by', '=', $user) $query->where(self::$table . '_d' . $depth . '.task_created_by', '=', $user)
->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN); ->where(self::$table . '_d' . $depth . '.task_status', '=', TaskStatus::OPEN);
return self::getAllByQuery($query); return self::getAllByQuery($query);
} }
@ -168,10 +168,10 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN) ->where(self::$table . '_d' . $depth . '.task_status', '=', TaskStatus::OPEN)
->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->andWhere(AccountRelationMapper::getTable() . '.task_account_duty', '=', DutyType::TO); ->andWhere(AccountRelationMapper::getTable() . '.task_account_duty', '=', DutyType::TO);
@ -192,10 +192,10 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN) ->where(self::$table . '_d' . $depth . '.task_status', '=', TaskStatus::OPEN)
->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user); ->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user);
return self::getAllByQuery($query); return self::getAllByQuery($query);
@ -215,10 +215,10 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(self::$table . '_' . $depth . '.task_status', '=', TaskStatus::OPEN) ->where(self::$table . '_d' . $depth . '.task_status', '=', TaskStatus::OPEN)
->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->andWhere(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->andWhere(AccountRelationMapper::getTable() . '.task_account_duty', '=', DutyType::CC); ->andWhere(AccountRelationMapper::getTable() . '.task_account_duty', '=', DutyType::CC);
@ -238,7 +238,7 @@ final class TaskMapper extends DataMapperAbstract
{ {
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->where(self::$table . '_' . $depth . '.task_created_by', '=', $user); $query->where(self::$table . '_d' . $depth . '.task_created_by', '=', $user);
return self::getAllByQuery($query); return self::getAllByQuery($query);
} }
@ -257,7 +257,7 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
@ -280,7 +280,7 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
@ -303,11 +303,11 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) ->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user) ->orWhere(self::$table . '_d' . $depth . '.task_created_by', '=', $user)
->orderBy(TaskElementMapper::getTable() . '.' . TaskElementMapper::getCreatedAt(), 'DESC'); ->orderBy(TaskElementMapper::getTable() . '.' . TaskElementMapper::getCreatedAt(), 'DESC');
return self::getAllByQuery($query); return self::getAllByQuery($query);
@ -340,16 +340,16 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$userWhere = new Where(self::$db); $userWhere = new Where(self::$db);
$userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) $userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user); ->orWhere(self::$table . '_d' . $depth . '.task_created_by', '=', $user);
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where($userWhere) ->where($userWhere)
->andWhere(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '<', $pivot) ->andWhere(static::$table . '_d' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '<', $pivot)
->orderBy(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), $order) ->orderBy(static::$table . '_d' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), $order)
->limit($limit); ->limit($limit);
return self::getAllByQuery($query); return self::getAllByQuery($query);
@ -382,16 +382,16 @@ final class TaskMapper extends DataMapperAbstract
$depth = 3; $depth = 3;
$userWhere = new Where(self::$db); $userWhere = new Where(self::$db);
$userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) $userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user); ->orWhere(self::$table . '_d' . $depth . '.task_created_by', '=', $user);
$query = self::getQuery(); $query = self::getQuery();
$query->innerJoin(TaskElementMapper::getTable()) $query->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.task_element_id', '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where($userWhere) ->where($userWhere)
->andWhere(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '>', $pivot) ->andWhere(static::$table . '_d' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '>', $pivot)
->orderBy(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), $order) ->orderBy(static::$table . '_d' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), $order)
->limit($limit); ->limit($limit);
return self::getAllByQuery($query); return self::getAllByQuery($query);
@ -412,17 +412,17 @@ final class TaskMapper extends DataMapperAbstract
$depth = 1; $depth = 1;
$userWhere = new Where(self::$db); $userWhere = new Where(self::$db);
$userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) $userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user); ->orWhere(self::$table . '_d' . $depth . '.task_created_by', '=', $user);
$query = new Builder(self::$db); $query = new Builder(self::$db);
$query->selectAs(self::$table . '_' . $depth . '.' . self::$primaryField, self::$primaryField . '_' . $depth) $query->selectAs(self::$table . '_d' . $depth . '.' . self::$primaryField, self::$primaryField . '_d' . $depth)
->fromAs(self::$table, self::$table . '_' . $depth) ->fromAs(self::$table, self::$table . '_d' . $depth)
->innerJoin(TaskElementMapper::getTable()) ->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '_' . $depth . '.' . self::$primaryField, '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '_d' . $depth . '.' . self::$primaryField, '=', TaskElementMapper::getTable() . '.task_element_task')
->innerJoin(AccountRelationMapper::getTable()) ->innerJoin(AccountRelationMapper::getTable())
->on(TaskElementMapper::getTable() . '.' . TaskElementMapper::getPrimaryField(), '=', AccountRelationMapper::getTable() . '.task_account_task_element') ->on(TaskElementMapper::getTable() . '.' . TaskElementMapper::getPrimaryField(), '=', AccountRelationMapper::getTable() . '.task_account_task_element')
->where($userWhere) ->where($userWhere)
->andWhere(self::$table . '_' . $depth . '.' . self::$primaryField, '=', $task); ->andWhere(self::$table . '_d' . $depth . '.' . self::$primaryField, '=', $task);
return !empty(self::getAllByQuery($query, RelationType::ALL, 1)); return !empty(self::getAllByQuery($query, RelationType::ALL, 1));
} }

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",