From 4f53038578e607ef86e110df631fa324868ac652 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 24 Feb 2023 15:25:59 +0200
Subject: [PATCH] ref

---
 application/Espo/ORM/Query/Part/Expression.php       |  5 +----
 application/Espo/ORM/Query/Part/Where/AndGroup.php   | 12 +++++-------
 application/Espo/ORM/Query/Part/Where/Comparison.php |  5 +----
 application/Espo/ORM/Query/Part/Where/Exists.php     |  2 +-
 application/Espo/ORM/Query/Part/Where/Not.php        |  8 ++++----
 application/Espo/ORM/Query/Part/Where/OrGroup.php    |  8 ++++----
 application/Espo/ORM/Query/Part/WhereItem.php        |  7 ++-----
 7 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/application/Espo/ORM/Query/Part/Expression.php b/application/Espo/ORM/Query/Part/Expression.php
index 38814e3b57..cd2cdaffb2 100644
--- a/application/Espo/ORM/Query/Part/Expression.php
+++ b/application/Espo/ORM/Query/Part/Expression.php
@@ -65,10 +65,7 @@ class Expression implements WhereItem
         return $this->expression . ':';
     }
 
-    /**
-     * @return mixed
-     */
-    public function getRawValue()
+    public function getRawValue(): mixed
     {
         return null;
     }
diff --git a/application/Espo/ORM/Query/Part/Where/AndGroup.php b/application/Espo/ORM/Query/Part/Where/AndGroup.php
index 91990128ac..9fc09e7fce 100644
--- a/application/Espo/ORM/Query/Part/Where/AndGroup.php
+++ b/application/Espo/ORM/Query/Part/Where/AndGroup.php
@@ -41,13 +41,11 @@ use Espo\ORM\Query\Part\{
  */
 class AndGroup implements WhereItem
 {
-    /**
-     * @var array<mixed,mixed>
-     */
+    /** @var array<string|int, mixed> */
     private $rawValue = [];
 
     /**
-     * @return array<mixed,mixed>
+     * @return array<string|int, mixed>
      */
     public function getRaw(): array
     {
@@ -60,9 +58,9 @@ class AndGroup implements WhereItem
     }
 
     /**
-     * @return array<mixed,mixed>
+     * @return array<string|int, mixed>
      */
-    public function getRawValue()
+    public function getRawValue(): array
     {
         return $this->rawValue;
     }
@@ -76,7 +74,7 @@ class AndGroup implements WhereItem
     }
 
     /**
-     * @param array<mixed,mixed> $whereClause
+     * @param array<string|int, mixed> $whereClause
      * @return self
      */
     public static function fromRaw(array $whereClause): self
diff --git a/application/Espo/ORM/Query/Part/Where/Comparison.php b/application/Espo/ORM/Query/Part/Where/Comparison.php
index f640b8f86c..1d42e63316 100644
--- a/application/Espo/ORM/Query/Part/Where/Comparison.php
+++ b/application/Espo/ORM/Query/Part/Where/Comparison.php
@@ -79,10 +79,7 @@ class Comparison implements WhereItem
         return $this->rawKey;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getRawValue()
+    public function getRawValue(): mixed
     {
         return $this->rawValue;
     }
diff --git a/application/Espo/ORM/Query/Part/Where/Exists.php b/application/Espo/ORM/Query/Part/Where/Exists.php
index e8b8b35b2f..04159e5bc0 100644
--- a/application/Espo/ORM/Query/Part/Where/Exists.php
+++ b/application/Espo/ORM/Query/Part/Where/Exists.php
@@ -55,7 +55,7 @@ class Exists implements WhereItem
     /**
      * @return array<string, mixed>
      */
-    public function getRawValue()
+    public function getRawValue(): array
     {
         return $this->rawValue;
     }
diff --git a/application/Espo/ORM/Query/Part/Where/Not.php b/application/Espo/ORM/Query/Part/Where/Not.php
index cb89c991d4..518a682111 100644
--- a/application/Espo/ORM/Query/Part/Where/Not.php
+++ b/application/Espo/ORM/Query/Part/Where/Not.php
@@ -38,7 +38,7 @@ use Espo\ORM\Query\Part\WhereItem;
  */
 class Not implements WhereItem
 {
-    /** @var array<mixed,mixed> */
+    /** @var array<string|int, mixed> */
     private $rawValue = [];
 
     public function getRaw(): array
@@ -52,15 +52,15 @@ class Not implements WhereItem
     }
 
     /**
-     * @return array<mixed,mixed>
+     * @return array<string|int, mixed>
      */
-    public function getRawValue()
+    public function getRawValue(): array
     {
         return $this->rawValue;
     }
 
     /**
-     * @param array<mixed,mixed> $whereClause
+     * @param array<string|int, mixed> $whereClause
      */
     public static function fromRaw(array $whereClause): self
     {
diff --git a/application/Espo/ORM/Query/Part/Where/OrGroup.php b/application/Espo/ORM/Query/Part/Where/OrGroup.php
index b5907a7aa5..8b7e2809a6 100644
--- a/application/Espo/ORM/Query/Part/Where/OrGroup.php
+++ b/application/Espo/ORM/Query/Part/Where/OrGroup.php
@@ -39,7 +39,7 @@ use Espo\ORM\Query\Part\WhereItem;
 class OrGroup implements WhereItem
 {
 
-    /** @var array<mixed,mixed> */
+    /** @var array<string|int, mixed> */
     private $rawValue = [];
 
     public function __construct()
@@ -57,9 +57,9 @@ class OrGroup implements WhereItem
     }
 
     /**
-     * @return array<mixed,mixed>
+     * @return array<string|int, mixed>
      */
-    public function getRawValue()
+    public function getRawValue(): array
     {
         return $this->rawValue;
     }
@@ -73,7 +73,7 @@ class OrGroup implements WhereItem
     }
 
     /**
-     * @param array<mixed,mixed> $whereClause
+     * @param array<string|int, mixed> $whereClause
      */
     public static function fromRaw(array $whereClause): self
     {
diff --git a/application/Espo/ORM/Query/Part/WhereItem.php b/application/Espo/ORM/Query/Part/WhereItem.php
index 9b63772c5d..d840812748 100644
--- a/application/Espo/ORM/Query/Part/WhereItem.php
+++ b/application/Espo/ORM/Query/Part/WhereItem.php
@@ -35,14 +35,11 @@ namespace Espo\ORM\Query\Part;
 interface WhereItem
 {
     /**
-     * @return array<mixed,mixed>
+     * @return array<string|int, mixed>
      */
     public function getRaw(): array;
 
     public function getRawKey(): string;
 
-    /**
-     * @return mixed
-     */
-    public function getRawValue();
+    public function getRawValue(): mixed;
 }