Revert "改名"
This reverts commit fdf58326
This commit is contained in:
@@ -101,7 +101,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
|
|||||||
*/
|
*/
|
||||||
public function getIterator(): Traversable|CollectionIterator|ArrayIterator
|
public function getIterator(): Traversable|CollectionIterator|ArrayIterator
|
||||||
{
|
{
|
||||||
return new CollectionIterator($this->model, $this->query, $this->_item);
|
return new CollectionIterator($this->model, $this->_item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -20,31 +20,17 @@ class CollectionIterator extends \ArrayIterator
|
|||||||
private ModelInterface|string $model;
|
private ModelInterface|string $model;
|
||||||
|
|
||||||
|
|
||||||
/** @var ActiveQuery */
|
|
||||||
private ActiveQuery $query;
|
|
||||||
|
|
||||||
|
|
||||||
private ?ModelInterface $_clone = null;
|
|
||||||
|
|
||||||
|
|
||||||
public function clean()
|
|
||||||
{
|
|
||||||
unset($this->query);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CollectionIterator constructor.
|
* CollectionIterator constructor.
|
||||||
* @param $model
|
* @param $model
|
||||||
* @param $query
|
|
||||||
* @param array $array
|
* @param array $array
|
||||||
* @param int $flags
|
* @param int $flags
|
||||||
* @throws Exception
|
* @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->model = $model;
|
||||||
$this->query = $query;
|
|
||||||
parent::__construct($array, $flags);
|
parent::__construct($array, $flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user