1
This commit is contained in:
@@ -134,7 +134,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (!($this->_item[$offset] instanceof ModelInterface)) {
|
if (!($this->_item[$offset] instanceof ModelInterface)) {
|
||||||
return $this->model::populate($this->_item[$offset]);
|
return $this->model->setAttributes($this->_item[$offset]);
|
||||||
}
|
}
|
||||||
return $this->_item[$offset];
|
return $this->_item[$offset];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ use Exception;
|
|||||||
class CollectionIterator extends \ArrayIterator
|
class CollectionIterator extends \ArrayIterator
|
||||||
{
|
{
|
||||||
|
|
||||||
private \Database\Model|string $model;
|
private ModelInterface|string $model;
|
||||||
|
|
||||||
|
|
||||||
/** @var ActiveQuery */
|
/** @var ActiveQuery */
|
||||||
@@ -56,7 +56,7 @@ class CollectionIterator extends \ArrayIterator
|
|||||||
*/
|
*/
|
||||||
protected function newModel($current): ModelInterface
|
protected function newModel($current): ModelInterface
|
||||||
{
|
{
|
||||||
return $this->model::populate($current);
|
return $this->model->setAttributes($current);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -32,10 +32,11 @@ interface ModelInterface
|
|||||||
public static function find(string|int $param): mixed;
|
public static function find(string|int $param): mixed;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @param array $data
|
||||||
*/
|
* @return static
|
||||||
public static function className(): string;
|
*/
|
||||||
|
public static function populate(array $data): static;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user