Skip to content

EspoCRM – Open Source CRM Application

valid usage

Yuri Kuznetsovd036df059e0e
diff --git a/application/Espo/Core/Formula/ArgumentList.php b/application/Espo/Core/Formula/ArgumentList.php
index 0f7fc2abed..c1c0caf914 100644
--- a/application/Espo/Core/Formula/ArgumentList.php
+++ b/application/Espo/Core/Formula/ArgumentList.php
@@ -94,6 +94,10 @@ class ArgumentList implements Evaluatable, Iterator, Countable, ArrayAccess, See
#[\ReturnTypeWillChange]
public function current()
{
+ if (!$this->valid()) {
+ return null;
+ }
+
return $this->getArgumentByIndex($this->position);
}
diff --git a/application/Espo/Core/Formula/EvaluatedArgumentList.php b/application/Espo/Core/Formula/EvaluatedArgumentList.php
index 9c4bd75093..955848973b 100644
--- a/application/Espo/Core/Formula/EvaluatedArgumentList.php
+++ b/application/Espo/Core/Formula/EvaluatedArgumentList.php
@@ -94,6 +94,10 @@ class EvaluatedArgumentList implements Iterator, Countable, ArrayAccess, Seekabl
#[\ReturnTypeWillChange]
public function current()
{
+ if (!$this->valid()) {
+ return null;
+ }
+
return $this->getArgumentByIndex($this->position);
}