diff --git a/core/ormlinkset.class.inc.php b/core/ormlinkset.class.inc.php index f39863755..937d65ba0 100644 --- a/core/ormlinkset.class.inc.php +++ b/core/ormlinkset.class.inc.php @@ -374,7 +374,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator * @throws \MySQLException * @throws \MySQLHasGoneAwayException */ - public function current() + public function current(): mixed { $this->LoadOriginalIds(); @@ -409,7 +409,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator * @throws \CoreUnexpectedValue * @throws \MySQLException */ - public function next() + public function next(): void { $this->LoadOriginalIds(); @@ -439,7 +439,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator * @link http://php.net/manual/en/iterator.key.php * @return mixed scalar on success, or null on failure. */ - public function key() + public function key(): mixed { return $this->iCursor; } @@ -454,7 +454,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator * @throws \CoreUnexpectedValue * @throws \MySQLException */ - public function valid() + public function valid(): bool { $this->LoadOriginalIds(); @@ -472,7 +472,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator * @throws \CoreUnexpectedValue * @throws \MySQLException */ - public function rewind() + public function rewind(): void { $this->LoadOriginalIds(); diff --git a/core/simplegraph.class.inc.php b/core/simplegraph.class.inc.php index 979992efb..1c5304d1a 100644 --- a/core/simplegraph.class.inc.php +++ b/core/simplegraph.class.inc.php @@ -745,27 +745,27 @@ class RelationTypeIterator implements Iterator } } - public function rewind() + public function rewind(): void { $this->iCurrentIdx = 0; } - public function valid() + public function valid(): bool { return array_key_exists($this->iCurrentIdx, $this->aList); } - public function next() + public function next(): void { $this->iCurrentIdx++; } - public function current() + public function current(): mixed { return $this->aList[$this->iCurrentIdx]; } - public function key() + public function key(): mixed { return $this->iCurrentIdx; }