This commit is contained in:
Yuri Kuznetsov
2023-02-24 15:25:59 +02:00
parent 79f5a7a94b
commit 4f53038578
7 changed files with 18 additions and 29 deletions
@@ -65,10 +65,7 @@ class Expression implements WhereItem
return $this->expression . ':';
}
/**
* @return mixed
*/
public function getRawValue()
public function getRawValue(): mixed
{
return null;
}
@@ -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
@@ -79,10 +79,7 @@ class Comparison implements WhereItem
return $this->rawKey;
}
/**
* @return mixed
*/
public function getRawValue()
public function getRawValue(): mixed
{
return $this->rawValue;
}
@@ -55,7 +55,7 @@ class Exists implements WhereItem
/**
* @return array<string, mixed>
*/
public function getRawValue()
public function getRawValue(): array
{
return $this->rawValue;
}
@@ -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
{
@@ -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
{
@@ -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;
}