From 0b3f3e67dd3448c194c46edd2b2ac77e77ec42e1 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Thu, 4 Nov 2021 17:14:41 +0200
Subject: [PATCH] fixes

---
 application/Espo/Tools/Export/Export.php                    | 2 +-
 application/Espo/Tools/Import/Params.php                    | 6 ++----
 application/Espo/Tools/Import/Service.php                   | 4 ++--
 application/Espo/Tools/Kanban/Kanban.php                    | 2 +-
 application/Espo/Tools/LeadCapture/LeadCapture.php          | 4 ++--
 .../Espo/Tools/Notification/NoteMentionHookProcessor.php    | 2 +-
 application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php                  | 2 ++
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/Espo/Tools/Export/Export.php b/application/Espo/Tools/Export/Export.php
index 5b13825ebe..3f6f2603c1 100644
--- a/application/Espo/Tools/Export/Export.php
+++ b/application/Espo/Tools/Export/Export.php
@@ -59,7 +59,7 @@ use RuntimeException;
 class Export
 {
     /**
-     * @var Params
+     * @var ?Params
      */
     private $params;
 
diff --git a/application/Espo/Tools/Import/Params.php b/application/Espo/Tools/Import/Params.php
index 08ce737feb..7fc07b1496 100644
--- a/application/Espo/Tools/Import/Params.php
+++ b/application/Espo/Tools/Import/Params.php
@@ -270,6 +270,8 @@ class Params
             $defaultValues = (object) [];
         }
 
+        /** @var object|scalar $defaultValues */
+
         if (!is_object($defaultValues)) {
             throw new TypeError();
         }
@@ -329,10 +331,6 @@ class Params
             $params = (object) [];
         }
 
-        if (is_array($params) && is_object($params)) {
-            throw new TypeError();
-        }
-
         $raw = (object) $params;
 
         $obj = self::create()
diff --git a/application/Espo/Tools/Import/Service.php b/application/Espo/Tools/Import/Service.php
index 7c76e2521d..9b57f8140b 100644
--- a/application/Espo/Tools/Import/Service.php
+++ b/application/Espo/Tools/Import/Service.php
@@ -108,7 +108,7 @@ class Service
             throw new Error("Contents is empty.");
         }
 
-        /** @var ImportEntity $source */
+        /** @var ?ImportEntity $source */
         $source = $this->entityManager->getEntity(ImportEntity::ENTITY_TYPE, $importParamsId);
 
         if (!$source) {
@@ -129,7 +129,7 @@ class Service
 
     public function importById(string $id, bool $startFromLastIndex = false, bool $forceResume = false): Result
     {
-        /** @var ImportEntity $import */
+        /** @var ?ImportEntity $import */
         $import = $this->entityManager->getEntity(ImportEntity::ENTITY_TYPE, $id);
 
         if (!$import) {
diff --git a/application/Espo/Tools/Kanban/Kanban.php b/application/Espo/Tools/Kanban/Kanban.php
index a26cb09fc1..36c69a292b 100644
--- a/application/Espo/Tools/Kanban/Kanban.php
+++ b/application/Espo/Tools/Kanban/Kanban.php
@@ -56,7 +56,7 @@ class Kanban
     protected $orderDisabled = false;
 
     /**
-     * @var SearchParams
+     * @var ?SearchParams
      */
     protected $searchParams = null;
 
diff --git a/application/Espo/Tools/LeadCapture/LeadCapture.php b/application/Espo/Tools/LeadCapture/LeadCapture.php
index da41591a93..7a3b8f9f4f 100644
--- a/application/Espo/Tools/LeadCapture/LeadCapture.php
+++ b/application/Espo/Tools/LeadCapture/LeadCapture.php
@@ -386,7 +386,7 @@ class LeadCapture
 
     public function confirmOptIn(string $id): stdClass
     {
-        /** @var UniqueId $uniqueId */
+        /** @var ?UniqueId $uniqueId */
         $uniqueId = $this->entityManager
             ->getRDBRepository('UniqueId')
             ->where([
@@ -448,7 +448,7 @@ class LeadCapture
 
     public function sendOptInConfirmation(string $id)
     {
-        /** @var UniqueId $uniqueId */
+        /** @var ?UniqueId $uniqueId */
         $uniqueId = $this->entityManager
             ->getRDBRepository('UniqueId')
             ->where([
diff --git a/application/Espo/Tools/Notification/NoteMentionHookProcessor.php b/application/Espo/Tools/Notification/NoteMentionHookProcessor.php
index 77f37dc4f9..02df57c700 100644
--- a/application/Espo/Tools/Notification/NoteMentionHookProcessor.php
+++ b/application/Espo/Tools/Notification/NoteMentionHookProcessor.php
@@ -129,7 +129,7 @@ class NoteMentionHookProcessor
         foreach ($matchList as $item) {
             $userName = substr($item, 1);
 
-            /** @var User $user */
+            /** @var ?User $user */
             $user = $this->entityManager
                 ->getRDBRepository(User::ENTITY_TYPE)
                 ->where([
diff --git a/application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php b/application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php
index 4673909bb5..dd8ce05174 100644
--- a/application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php
+++ b/application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php
@@ -96,6 +96,7 @@ class Tcpdf extends TcpdfOriginal
             $html = str_replace('{pageAbsoluteNumber}', '{{:pnp:}}', $html);
         }
 
+        /** @phpstan-ignore-next-line */
         if ($this->isUnicodeFont()) {
             $html = str_replace('{totalPageNumber}', '{{:ptp:}}', $html);
         } else {
@@ -124,6 +125,7 @@ class Tcpdf extends TcpdfOriginal
             $html = str_replace('{pageAbsoluteNumber}', '{{:pnp:}}', $html);
         }
 
+        /** @phpstan-ignore-next-line */
         if ($this->isUnicodeFont()) {
             $html = str_replace('{totalPageNumber}', '{{:ptp:}}', $html);
         } else {