From 95f9206880413b4ca85cfaef46dcf5bd1b4d53e9 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Mon, 8 Nov 2021 15:48:16 +0200
Subject: [PATCH] type fixes

---
 application/Espo/ORM/Repository/RDBRelationSelectBuilder.php | 1 +
 application/Espo/ORM/Repository/RDBRepository.php            | 2 ++
 application/Espo/ORM/Repository/RDBSelectBuilder.php         | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php b/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
index 70456e34f8..08047b36bd 100644
--- a/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
+++ b/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
@@ -204,6 +204,7 @@ class RDBRelationSelectBuilder
     {
         $query = $this->builder->build();
 
+        /** @var (iterable<Entity>&\Espo\ORM\SthCollection)|Entity */
         $related = $this->getMapper()->selectRelated($this->entity, $this->relationName, $query);
 
         if ($related instanceof Collection) {
diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php
index afc2a0579c..d2507fe09d 100644
--- a/application/Espo/ORM/Repository/RDBRepository.php
+++ b/application/Espo/ORM/Repository/RDBRepository.php
@@ -472,6 +472,8 @@ class RDBRepository implements Repository
             }
         }
 
+        /** @phpstan-var TEntity $entity */
+
         $relation = $this->getRelation($entity, $relationName);
 
         if ($foreign instanceof Entity) {
diff --git a/application/Espo/ORM/Repository/RDBSelectBuilder.php b/application/Espo/ORM/Repository/RDBSelectBuilder.php
index 13bfc22b6a..01cf4e5c4b 100644
--- a/application/Espo/ORM/Repository/RDBSelectBuilder.php
+++ b/application/Espo/ORM/Repository/RDBSelectBuilder.php
@@ -100,7 +100,7 @@ class RDBSelectBuilder
     {
         $query = $this->getMergedParams($params);
 
-        /** @var iterable<TEntity>&Collection $collection */
+        /** @var iterable<TEntity>&SthCollection $collection */
         $collection = $this->getMapper()->select($query);
 
         return $this->handleReturnCollection($collection);