改名

2021-02-23 17:43:13 +08:00
parent 29fc384741
commit 1c0cd04fcc
6 changed files with 37 additions and 14 deletions
@@ -181,7 +181,7 @@ class ActiveQuery extends Component
 	 */
 	public function page(int $size, callable $callback): Pagination
 	{
-		$pagination = objectPool(Pagination::class, [$this]);
+		$pagination = new Pagination($this);
 		$pagination->setOffset(0);
 		$pagination->setLimit($size);
 		$pagination->setCallback($callback);
@@ -207,7 +207,7 @@ class ActiveQuery extends Component
 	public function all(): Collection|array
 	{
 		$data = $this->modelClass::getDb()->createCommand($this->queryBuilder())->all();
-		$collect = objectPool(Collection::class, [$this, $data, $this->modelClass]);
+		$collect = new Collection($this, $data, $this->modelClass);
 		if ($this->asArray) {
 			return $collect->toArray();
 		}