Revert "改名"

This reverts commit fdf58326

ActiveQuery.php

@@ -135,7 +135,7 @@ class ActiveQuery extends Component implements ISqlBuilder
             $name = explode(',', $name);
         }
         foreach ($name as $val) {
-            array_push($this->with, $val);
+	        $this->with[] = $val;
         }
         return $this;
     }

Condition/Condition.php

@@ -18,7 +18,7 @@ abstract class Condition extends Component
 	protected string $opera = '=';
 
 	/** @var array|mixed */
-	protected $value;
+	protected mixed $value;
 
 	const INT_TYPE = ['bit', 'bool', 'tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'float', 'double', 'decimal', 'timestamp'];
 

HasCount.php

@@ -17,9 +17,9 @@ class HasCount extends HasBase
 	 * @param $name
 	 * @param $arguments
 	 * @return ActiveQuery
-	 * @throws Exception
+	 * @throws ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
 		if (method_exists($this, $name)) {
 			return call_user_func([$this, $name], ...$arguments);

HasMany.php

@@ -23,9 +23,9 @@ class HasMany extends HasBase
 	/**
 	 * @param $name
 	 * @param $arguments
-	 * @return ActiveQuery
+	 * @return ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
 		if (method_exists($this, $name)) {
 			return call_user_func([$this, $name], ...$arguments);

HasOne.php

@@ -9,8 +9,8 @@ declare(strict_types=1);
 
 namespace Database;
 
-use Exception;
 use Database\Traits\HasBase;
+use Exception;
 
 /**
  * Class HasOne
@@ -23,9 +23,9 @@ class HasOne extends HasBase
 	/**
 	 * @param $name
 	 * @param $arguments
-	 * @return ActiveQuery
+	 * @return ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
 		if (method_exists($this, $name)) {
 			return call_user_func([$this, $name], ...$arguments);

Mysql/PDO.php

@@ -39,9 +39,6 @@ class PDO implements StopHeartbeatCheck
 	public int $read_timeout;
 
 
-	private EventProvider $eventProvider;
-
-
 	public array $attributes = [];
 
 
@@ -67,8 +64,8 @@ class PDO implements StopHeartbeatCheck
 	public function init(): void
 	{
 		$this->heartbeat_check();
-		$this->eventProvider = Kiri::getDi()->get(EventProvider::class);
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
+		$eventProvider = Kiri::getDi()->get(EventProvider::class);
+		$eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
 	}