From bb2259232e2068492842991fe1e67a6dc08951d5 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Mon, 14 Mar 2022 13:20:13 +0200
Subject: [PATCH] type fixes

---
 application/Espo/Repositories/Email.php       | 1 +
 application/Espo/Repositories/Import.php      | 1 +
 application/Espo/Repositories/Preferences.php | 2 ++
 application/Espo/Repositories/User.php        | 5 +++--
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/Espo/Repositories/Email.php b/application/Espo/Repositories/Email.php
index 4c593c883f..e453393313 100644
--- a/application/Espo/Repositories/Email.php
+++ b/application/Espo/Repositories/Email.php
@@ -457,6 +457,7 @@ class Email extends Database implements
                 $entity->get('parentId') &&
                 $entity->isAttributeChanged('parentId')
             ) {
+                /** @var \Espo\ORM\Collection<EmailEntity> */
                 $replyList = $this->findRelated($entity, 'replies');
 
                 foreach ($replyList as $reply) {
diff --git a/application/Espo/Repositories/Import.php b/application/Espo/Repositories/Import.php
index b9e2dd00cb..89a7f483b4 100644
--- a/application/Espo/Repositories/Import.php
+++ b/application/Espo/Repositories/Import.php
@@ -85,6 +85,7 @@ class Import extends Database
                 return $query;
         }
 
+        /** @var \Espo\ORM\Query\SelectBuilder */
         $builder = $this->entityManager->getQueryBuilder()->clone($query);
 
         $builder->join(
diff --git a/application/Espo/Repositories/Preferences.php b/application/Espo/Repositories/Preferences.php
index a407db3794..9e78087e5a 100644
--- a/application/Espo/Repositories/Preferences.php
+++ b/application/Espo/Repositories/Preferences.php
@@ -146,7 +146,9 @@ class Preferences implements Repository,
             return;
         }
 
+        /** @var array<string,array<string,mixed>> */
         $fields = $this->metadata->get('entityDefs.Preferences.fields');
+
         $defaults = [];
 
         $dashboardLayout = $this->config->get('dashboardLayout');
diff --git a/application/Espo/Repositories/User.php b/application/Espo/Repositories/User.php
index 64b436c688..66bcb86174 100644
--- a/application/Espo/Repositories/User.php
+++ b/application/Espo/Repositories/User.php
@@ -34,6 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\Exceptions\Error;
 use Espo\Core\Exceptions\Conflict;
 use Espo\Core\Repositories\Database;
+use Espo\Core\Utils\Json;
 
 use Espo\Repositories\UserData as UserDataRepository;
 use Espo\Entities\UserData;
@@ -104,7 +105,7 @@ class User extends Database
             if ($user) {
                 $this->entityManager->getLocker()->rollback();
 
-                throw new Conflict(json_encode(['reason' => 'userNameExists']));
+                throw new Conflict(Json::encode(['reason' => 'userNameExists']));
             }
         } else {
             if ($entity->isAttributeChanged('userName')) {
@@ -127,7 +128,7 @@ class User extends Database
                 if ($user) {
                     $this->entityManager->getLocker()->rollback();
 
-                    throw new Conflict(json_encode(['reason' => 'userNameExists']));
+                    throw new Conflict(Json::encode(['reason' => 'userNameExists']));
                 }
             }
         }