改名

2021-02-23 17:19:46 +08:00
parent 21bdf32fc3
commit 31d5024663
10 changed files with 41 additions and 26 deletions
@@ -181,7 +181,7 @@ class ActiveQuery extends Component
 	 */
 	public function page(int $size, callable $callback): Pagination
 	{
-		$pagination = new Pagination($this);
+		$pagination = objectPool(Pagination::class, [$this]);
 		$pagination->setOffset(0);
 		$pagination->setLimit($size);
 		$pagination->setCallback($callback);
@@ -206,9 +206,8 @@ class ActiveQuery extends Component
 	 */
 	public function all(): Collection|array
 	{
-		$collect = new Collection($this, $this->modelClass::getDb()
-			->createCommand($this->queryBuilder())
-			->all(), $this->modelClass);
+		$data = $this->modelClass::getDb()->createCommand($this->queryBuilder())->all();
+		$collect = objectPool(Collection::class, [$this, $data, $this->modelClass]);
 		if ($this->asArray) {
 			return $collect->toArray();
 		}