From 4909b1fb9be1d1ed82b092426728d3c5827df3d1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 26 Jun 2021 14:38:08 +0200 Subject: [PATCH] fix phpstan/phpcs --- Admin/Install/Media.install.json | 4 ++-- Models/EmployeeMapper.php | 2 +- composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Admin/Install/Media.install.json b/Admin/Install/Media.install.json index b8a5466..6ce9cc3 100755 --- a/Admin/Install/Media.install.json +++ b/Admin/Install/Media.install.json @@ -1,7 +1,7 @@ [ { - "type": "collection", - "create_directory": true, + "type": "collection", + "create_directory": true, "name": "HumanResourceManagement", "virtualPath": "/Modules", "user": 1 diff --git a/Models/EmployeeMapper.php b/Models/EmployeeMapper.php index affdfd0..9fed026 100755 --- a/Models/EmployeeMapper.php +++ b/Models/EmployeeMapper.php @@ -133,7 +133,7 @@ final class EmployeeMapper extends DataMapperAbstract $query = new Builder(self::$db); $query = self::getQuery($query) ->innerJoin(ProfileMapper::getTable()) - ->on(self::$table . '_' . $depth . '.hr_staff_profile', '=', ProfileMapper::getTable() . '.' . ProfileMapper::getPrimaryField()) + ->on(self::$table . '_d' . $depth . '.hr_staff_profile', '=', ProfileMapper::getTable() . '.' . ProfileMapper::getPrimaryField()) ->innerJoin(AccountMapper::getTable()) ->on(ProfileMapper::getTable() . '.profile_account_account', '=', AccountMapper::getTable() . '.' . AccountMapper::getPrimaryField()) ->where(AccountMapper::getTable() . '.' . AccountMapper::getPrimaryField(), '=', $account) 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",