变更

Base/AbstractCollection.php

@@ -27,20 +27,28 @@ use Traversable;
 abstract class AbstractCollection extends Component implements \IteratorAggregate, \ArrayAccess, ToArray
 {
 
-    /**
-     * @var ModelInterface[]
-     */
-    protected array $_item = [];
-
-    protected ModelInterface|string|null $model;
-
-    protected ActiveQuery $query;
+	/**
+	 * @var ModelInterface[]
+	 */
+	protected array $_item = [];
 
 
-    public function clean()
-    {
-        unset($this->query, $this->model, $this->_item);
-    }
+	/**
+	 * @var ModelInterface|string|null
+	 */
+	protected ModelInterface|string|null $model;
+
+
+	/**
+	 * @var ActiveQuery
+	 */
+	protected ActiveQuery $query;
+
+
+	public function clean()
+	{
+		unset($this->query, $this->model, $this->_item);
+	}
 
 
 	/**
@@ -51,112 +59,121 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
 	 * @param ModelInterface|null $model
 	 * @throws Exception
 	 */
-    public function __construct($query, array $array = [], ModelInterface $model = null)
-    {
-        $this->_item = $array;
-        $this->query = $query;
-        $this->model = $model;
+	public function __construct($query, array $array = [], ModelInterface $model = null)
+	{
+		$this->_item = $array;
+		$this->query = $query;
+		$this->model = $model;
 
-        parent::__construct([]);
-    }
+		parent::__construct([]);
+	}
 
 
-    /**
-     * @return int
-     */
-    #[Pure] public function getLength(): int
-    {
-        return count($this->_item);
-    }
+	/**
+	 * @return int
+	 */
+	#[Pure] public function getLength(): int
+	{
+		return count($this->_item);
+	}
 
 
-    /**
-     * @param $item
-     */
-    public function setItems($item)
-    {
-        $this->_item = $item;
-    }
+	/**
+	 * @param $item
+	 */
+	public function setItems($item)
+	{
+		$this->_item = $item;
+	}
 
 
-    /**
-     * @param $model
-     */
-    public function setModel($model)
-    {
-        $this->model = $model;
-    }
+	/**
+	 * @param $model
+	 */
+	public function setModel($model)
+	{
+		$this->model = $model;
+	}
 
-    /**
-     * @param $item
-     */
-    public function addItem($item)
-    {
-        $this->_item[] = $item;
-    }
+	/**
+	 * @param $item
+	 */
+	public function addItem($item)
+	{
+		$this->_item[] = $item;
+	}
 
-    /**
-     * @return Traversable|CollectionIterator|ArrayIterator
-     * @throws Exception
-     */
-    public function getIterator(): Traversable|CollectionIterator|ArrayIterator
-    {
-        return new CollectionIterator($this->model, $this->_item);
-    }
+	/**
+	 * @return Traversable|CollectionIterator|ArrayIterator
+	 * @throws Exception
+	 */
+	public function getIterator(): Traversable|CollectionIterator|ArrayIterator
+	{
+		return new CollectionIterator($this->model, $this->_item);
+	}
 
 
-    /**
-     * @return mixed
-     * @throws Exception
-     */
-    public function getModel(): ModelInterface
-    {
-        return $this->model;
-    }
+	/**
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function getModel(): ModelInterface
+	{
+		return $this->model;
+	}
 
 
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists(mixed $offset): bool
-    {
-        return !empty($this->_item) && isset($this->_item[$offset]);
-    }
-
-    /**
-     * @param mixed $offset
-     * @return ModelInterface|null
-     * @throws Exception
-     */
-    public function offsetGet(mixed $offset): ?ModelInterface
-    {
-        if (!$this->offsetExists($offset)) {
-            return NULL;
-        }
-        if (!($this->_item[$offset] instanceof ModelInterface)) {
-            return $this->model->populates($this->_item[$offset]);
-        }
-        return $this->_item[$offset];
-    }
-
-    /**
-     * @param mixed $offset
-     * @param mixed $value
-     */
-    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value)
-    {
-        $this->_item[$offset] = $value;
-    }
+	/**
+	 * @return ActiveQuery
+	 */
+	public function makeNewQuery(): ActiveQuery
+	{
+		return $this->model::query();
+	}
 
 
-    /**
-     * @param mixed $offset
-     */
-    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset)
-    {
-        if ($this->offsetExists($offset)) {
-            unset($this->_item[$offset]);
-        }
-    }
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists(mixed $offset): bool
+	{
+		return !empty($this->_item) && isset($this->_item[$offset]);
+	}
+
+	/**
+	 * @param mixed $offset
+	 * @return ModelInterface|null
+	 * @throws Exception
+	 */
+	public function offsetGet(mixed $offset): ?ModelInterface
+	{
+		if (!$this->offsetExists($offset)) {
+			return NULL;
+		}
+		if (!($this->_item[$offset] instanceof ModelInterface)) {
+			return $this->model->populates($this->_item[$offset]);
+		}
+		return $this->_item[$offset];
+	}
+
+	/**
+	 * @param mixed $offset
+	 * @param mixed $value
+	 */
+	#[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value)
+	{
+		$this->_item[$offset] = $value;
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 */
+	#[ReturnTypeWillChange] public function offsetUnset(mixed $offset)
+	{
+		if ($this->offsetExists($offset)) {
+			unset($this->_item[$offset]);
+		}
+	}
 }