Revert "改名"

This reverts commit fdf58326

src/Base/AbstractCollection.php

@@ -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);
     }
 
 

src/Base/CollectionIterator.php

@@ -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);
 	}
 

src/Connection.php

@@ -81,12 +81,11 @@ class Connection extends Component
 	 */
 	public function init()
 	{
-		$eventProvider = Kiri::getDi()->get(EventProvider::class);
-		$eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
-		$eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
-		$eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-		$eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-		$eventProvider->on(Commit::class, [$this, 'commit'], 0);
+		$this->eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
+		$this->eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
+		$this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+		$this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+		$this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
 
 		if (Db::transactionsActive()) {
 			$this->beginTransaction();