Revert "改名"

This reverts commit fdf58326
This commit is contained in:
2022-01-04 17:27:37 +08:00
parent 2a52172af6
commit cf2f26ec21
2 changed files with 2 additions and 16 deletions
+1 -1
View File
@@ -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);
}
+1 -15
View File
@@ -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);
}