diff --git a/application/Espo/Core/Utils/Acl/UserAclManagerProvider.php b/application/Espo/Core/Utils/Acl/UserAclManagerProvider.php index f572ead9fd..b6d97134d7 100644 --- a/application/Espo/Core/Utils/Acl/UserAclManagerProvider.php +++ b/application/Espo/Core/Utils/Acl/UserAclManagerProvider.php @@ -30,6 +30,7 @@ namespace Espo\Core\Utils\Acl; use Espo\Entities\User; +use Espo\Entities\Portal; use Espo\ORM\EntityManager; use Espo\Core\AclManager; use Espo\Core\Portal\AclManagerContainer as PortalAclManagerContainer; @@ -78,6 +79,7 @@ class UserAclManagerProvider $aclManager = $this->aclManager; if ($user->isPortal() && !$this->user->isPortal()) { + /** @var ?Portal */ $portal = $this->entityManager ->getRDBRepository(User::ENTITY_TYPE) ->getRelation($user, 'portals') diff --git a/application/Espo/Core/Utils/File/Manager.php b/application/Espo/Core/Utils/File/Manager.php index ef47d02f7b..4c93925380 100644 --- a/application/Espo/Core/Utils/File/Manager.php +++ b/application/Espo/Core/Utils/File/Manager.php @@ -94,7 +94,7 @@ class Manager * If TRUE - returns only file list, if FALSE - only directory list. * @param bool $returnSingleArray Return a single array. * - * @return array|array + * @return array|array */ public function getFileList( string $path, @@ -267,7 +267,7 @@ class Manager return $data; } - usleep(self::GET_SAFE_CONTENTS_RETRY_INTERVAL * 1000000); + usleep((int) (self::GET_SAFE_CONTENTS_RETRY_INTERVAL * 1000000)); $counter ++; } @@ -370,7 +370,7 @@ class Manager return true; } - usleep(self::RENAME_RETRY_INTERVAL * 1000000); + usleep((int) (self::RENAME_RETRY_INTERVAL * 1000000)); $counter++; } diff --git a/application/Espo/Core/Utils/File/Permission.php b/application/Espo/Core/Utils/File/Permission.php index 8f85c847a0..8e67073fb4 100644 --- a/application/Espo/Core/Utils/File/Permission.php +++ b/application/Espo/Core/Utils/File/Permission.php @@ -163,7 +163,7 @@ class Permission $fileInfo = stat($filePath); - return substr(base_convert($fileInfo['mode'], 10, 8), -4); + return substr(base_convert((string) $fileInfo['mode'], 10, 8), -4); } /** diff --git a/application/Espo/Core/Utils/Util.php b/application/Espo/Core/Utils/Util.php index 493ca4e1dc..5676ce1bf9 100644 --- a/application/Espo/Core/Utils/Util.php +++ b/application/Espo/Core/Utils/Util.php @@ -247,7 +247,7 @@ class Util * Get a full path of the file. * * @param string|array $folderPath - * @param string $filePath + * @param string|null $filePath * * @return string */