From 6fb8e7ab37e90dc37fdaa5a498dd80c35c5854d0 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 20 Nov 2022 14:05:53 +0200
Subject: [PATCH] type fix

---
 .../Core/Mail/Importer/DefaultParentFinder.php   |  4 ++++
 application/Espo/Core/Upgrades/Actions/Base.php  |  2 +-
 composer.lock                                    | 16 ++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/application/Espo/Core/Mail/Importer/DefaultParentFinder.php b/application/Espo/Core/Mail/Importer/DefaultParentFinder.php
index a2ce90b273..c798179fd1 100644
--- a/application/Espo/Core/Mail/Importer/DefaultParentFinder.php
+++ b/application/Espo/Core/Mail/Importer/DefaultParentFinder.php
@@ -271,6 +271,10 @@ class DefaultParentFinder implements ParentFinder
             return null;
         }
 
+        if (!is_string($parentType) || !is_string($parentId)) {
+            return null;
+        }
+
         if (!$this->entityManager->hasRepository($parentType)) {
             return null;
         }
diff --git a/application/Espo/Core/Upgrades/Actions/Base.php b/application/Espo/Core/Upgrades/Actions/Base.php
index 0c80f91529..2f646864c2 100644
--- a/application/Espo/Core/Upgrades/Actions/Base.php
+++ b/application/Espo/Core/Upgrades/Actions/Base.php
@@ -442,7 +442,7 @@ abstract class Base
         /** @var string $errorMessage */
         $errorMessage = preg_replace('/\{version\}/', $currentVersion, $errorMessage);
         /** @var string $errorMessage */
-        $errorMessage = preg_replace('/\{requiredVersion\}/', $version ?? '', $errorMessage);
+        $errorMessage = preg_replace('/\{requiredVersion\}/', $version, $errorMessage);
 
         $this->throwErrorAndRemovePackage($errorMessage);
 
diff --git a/composer.lock b/composer.lock
index f26bbcff61..406d375577 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dba43e1497c279b1fd7806e9d7fa3d9e",
+    "content-hash": "c3ea572c5bfd43307801c4d60e9cf47c",
     "packages": [
         {
             "name": "async-aws/core",
@@ -6487,16 +6487,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.9",
+            "version": "1.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2"
+                "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
-                "reference": "3a72d9d9f2528fbd50c2d8fcf155fd9f74ade3f2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d6fdf01c53978b6429f1393ba4afeca39cc68afa",
+                "reference": "d6fdf01c53978b6429f1393ba4afeca39cc68afa",
                 "shasum": ""
             },
             "require": {
@@ -6526,7 +6526,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.9"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.2"
             },
             "funding": [
                 {
@@ -6542,7 +6542,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-13T13:40:18+00:00"
+            "time": "2022-11-10T09:56:11+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -7988,7 +7988,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4.0 <8.2.0",
+        "php": ">=8.0.0 <8.3.0",
         "ext-pdo_mysql": "*",
         "ext-openssl": "*",
         "ext-json": "*",