From 3aa31a830c469f0ccb07ecc4fbaa5f44aab80036 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 5 Nov 2021 12:12:39 +0200
Subject: [PATCH] type fixes

---
 application/Espo/Core/Repositories/Database.php               | 2 +-
 application/Espo/Core/Repositories/Event.php                  | 3 +++
 application/Espo/Core/Select/Applier/Appliers/Order.php       | 2 +-
 .../Espo/Core/Select/Order/ItemConverters/EnumType.php        | 2 +-
 application/Espo/Core/Select/SelectBuilder.php                | 2 +-
 .../Espo/Core/Select/Where/DateTimeItemTransformer.php        | 4 ----
 application/Espo/Repositories/Import.php                      | 4 ++--
 application/Espo/Repositories/ScheduledJob.php                | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/application/Espo/Core/Repositories/Database.php b/application/Espo/Core/Repositories/Database.php
index 0af4389f66..6554f63acf 100644
--- a/application/Espo/Core/Repositories/Database.php
+++ b/application/Espo/Core/Repositories/Database.php
@@ -50,7 +50,7 @@ use Espo\Core\{
 };
 
 /**
- * @template T of \Espo\Core\ORM\Entity
+ * @template T of \Espo\ORM\Entity
  * @extends RDBRepository<T>
  */
 class Database extends RDBRepository
diff --git a/application/Espo/Core/Repositories/Event.php b/application/Espo/Core/Repositories/Event.php
index f8966f2fea..468b5be2f4 100644
--- a/application/Espo/Core/Repositories/Event.php
+++ b/application/Espo/Core/Repositories/Event.php
@@ -40,6 +40,9 @@ use DateTime;
 use DateTimeZone;
 use Exception;
 
+/**
+ * @extends Database<\Espo\Core\ORM\Entity>
+ */
 class Event extends Database implements
 
     Di\DateTimeAware,
diff --git a/application/Espo/Core/Select/Applier/Appliers/Order.php b/application/Espo/Core/Select/Applier/Appliers/Order.php
index b33f3cdb6a..94cd11323e 100644
--- a/application/Espo/Core/Select/Applier/Appliers/Order.php
+++ b/application/Espo/Core/Select/Applier/Appliers/Order.php
@@ -118,7 +118,7 @@ class Order
             else if ($order === false || strtolower($order) === 'asc') {
                 $order = SearchParams::ORDER_ASC;
             }
-            else if (!$order === null) {
+            else if ($order !== null) {
                 throw new Error("Bad default order.");
             }
         }
diff --git a/application/Espo/Core/Select/Order/ItemConverters/EnumType.php b/application/Espo/Core/Select/Order/ItemConverters/EnumType.php
index 9fab7e4fa3..ed04316ea2 100644
--- a/application/Espo/Core/Select/Order/ItemConverters/EnumType.php
+++ b/application/Espo/Core/Select/Order/ItemConverters/EnumType.php
@@ -63,7 +63,7 @@ class EnumType implements ItemConverter
             'entityDefs', $this->entityType, 'fields', $orderBy, 'options'
         ]);
 
-        if (!$list || !is_array($list) || !count($list)) {
+        if (!is_array($list) || !count($list)) {
             return OrderList::create([
                 Order::fromString($orderBy)->withDirection($order)
             ]);
diff --git a/application/Espo/Core/Select/SelectBuilder.php b/application/Espo/Core/Select/SelectBuilder.php
index f1c48dbb28..f003b1de60 100644
--- a/application/Espo/Core/Select/SelectBuilder.php
+++ b/application/Espo/Core/Select/SelectBuilder.php
@@ -67,7 +67,7 @@ class SelectBuilder
     private $sourceQuery = null;
 
     /**
-     * @var SearchParams
+     * @var SearchParams|null
      */
     private $searchParams = null;
 
diff --git a/application/Espo/Core/Select/Where/DateTimeItemTransformer.php b/application/Espo/Core/Select/Where/DateTimeItemTransformer.php
index 913f11c63a..3c7b27233b 100644
--- a/application/Espo/Core/Select/Where/DateTimeItemTransformer.php
+++ b/application/Espo/Core/Select/Where/DateTimeItemTransformer.php
@@ -67,10 +67,6 @@ class DateTimeItemTransformer
             throw new Error("Bad where item.");
         }
 
-        if ($attribute && !is_string($attribute)) {
-            throw new Error("Bad 'attribute' in where item.");
-        }
-
         if (!$attribute) {
             throw new Error("Bad datetime where item. Empty 'attribute'.");
         }
diff --git a/application/Espo/Repositories/Import.php b/application/Espo/Repositories/Import.php
index 1d33f5bb8f..80caa02d2b 100644
--- a/application/Espo/Repositories/Import.php
+++ b/application/Espo/Repositories/Import.php
@@ -87,7 +87,7 @@ class Import extends Database
             'ImportEntity',
             'importEntity',
             [
-                'importEntity.importId' => $entity->id,
+                'importEntity.importId' => $entity->getId(),
                 'importEntity.entityType' => $entityType,
                 'importEntity.entityId:' => 'id',
                 'importEntity.' . $param => true,
@@ -131,7 +131,7 @@ class Import extends Database
             ->delete()
             ->from('ImportEntity')
             ->where([
-                'importId' => $entity->id,
+                'importId' => $entity->getId(),
             ])
             ->build();
 
diff --git a/application/Espo/Repositories/ScheduledJob.php b/application/Espo/Repositories/ScheduledJob.php
index 2e90173a5a..6354cc1e6e 100644
--- a/application/Espo/Repositories/ScheduledJob.php
+++ b/application/Espo/Repositories/ScheduledJob.php
@@ -45,7 +45,7 @@ class ScheduledJob extends \Espo\Core\Repositories\Database
             $jobList = $this->entityManager
                 ->getRDBRepository('Job')
                 ->where([
-                    'scheduledJobId' => $entity->id,
+                    'scheduledJobId' => $entity->getId(),
                     'status' => Status::PENDING,
                 ])
                 ->find();