diff --git a/src/Base/AbstractCollection.php b/src/Base/AbstractCollection.php index f191d77..cfd99a4 100644 --- a/src/Base/AbstractCollection.php +++ b/src/Base/AbstractCollection.php @@ -101,7 +101,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat */ public function getIterator(): Traversable|CollectionIterator|ArrayIterator { - return new CollectionIterator($this->model, $this->query, $this->_item); + return new CollectionIterator($this->model, $this->_item); } diff --git a/src/Base/CollectionIterator.php b/src/Base/CollectionIterator.php index 36a1c26..9e43792 100644 --- a/src/Base/CollectionIterator.php +++ b/src/Base/CollectionIterator.php @@ -20,31 +20,17 @@ class CollectionIterator extends \ArrayIterator private ModelInterface|string $model; - /** @var ActiveQuery */ - private ActiveQuery $query; - - - private ?ModelInterface $_clone = null; - - - public function clean() - { - unset($this->query); - } - /** * CollectionIterator constructor. * @param $model - * @param $query * @param array $array * @param int $flags * @throws Exception */ - public function __construct($model, $query, array $array = [], int $flags = 0) + public function __construct($model, array $array = [], int $flags = 0) { $this->model = $model; - $this->query = $query; parent::__construct($array, $flags); }