Revert "改名"

This reverts commit fdf58326

src/ActiveQuery.php

@@ -11,6 +11,7 @@ namespace Database;
 
 use Database\Traits\QueryTrait;
 use Exception;
+use JetBrains\PhpStorm\ArrayShape;
 use Kiri\Abstracts\Component;
 
 /**
@@ -63,8 +64,8 @@ class ActiveQuery extends Component implements ISqlBuilder
      */
     public function clear()
     {
-		$this->db = null;
-		$this->useCache = false;
+        $this->db = NULL;
+        $this->useCache = FALSE;
         $this->with = [];
     }
 
@@ -79,6 +80,36 @@ class ActiveQuery extends Component implements ISqlBuilder
         return $this;
     }
 
+
+    /**
+     * @param int $size
+     * @param int $page
+     * @return array
+     * @throws Exception
+     */
+    #[ArrayShape(['code' => "int", 'message' => "string", 'size' => "mixed", 'page' => "mixed", 'count' => "int", 'next' => "mixed", 'prev' => "mixed", 'param' => "array"])]
+    public function pagination(int $size = 20, int $page = 1): array
+    {
+        $page = max(1, $page);
+        $size = max(1, $size);
+
+        $offset = ($page - 1) * $size;
+
+        $count = $this->count();
+        $lists = $this->limit($offset, $size)->get()->toArray();
+        return [
+            'code'   => 0,
+            'message'   => 'ok',
+            'size'   => $size,
+            'page'   => $page,
+            'count'  => $count,
+            'next'   => max($page + 1, 1),
+            'prev'   => max($page - 1, 1),
+            'param' => $lists,
+        ];
+    }
+
+
     /**
      * @param array $values
      * @return $this
@@ -198,7 +229,7 @@ class ActiveQuery extends Component implements ISqlBuilder
     public function all(): Collection|array
     {
         $data = $this->execute($this->builder->all())->all();
-		if (!empty($this->with)){
+        if (!empty($this->with)) {
             $this->getWith($this->modelClass);
         }
         $collect = new Collection($this, $data, $this->modelClass);
@@ -266,7 +297,7 @@ class ActiveQuery extends Component implements ISqlBuilder
      */
     public function batchInsert(array $data): bool
     {
-		[$sql, $params] = $this->builder->insert($data, true);
+        [$sql, $params] = $this->builder->insert($data, TRUE);
 
 
         return $this->execute($sql, $params)->exec();
@@ -280,7 +311,7 @@ class ActiveQuery extends Component implements ISqlBuilder
      */
     public function value($filed)
     {
-		return $this->first()[$filed] ?? null;
+        return $this->first()[$filed] ?? NULL;
     }
 
     /**
@@ -298,10 +329,10 @@ class ActiveQuery extends Component implements ISqlBuilder
      * @return int|bool|string|null
      * @throws Exception
      */
-	public function delete(bool $getSql = false): int|bool|string|null
+    public function delete(bool $getSql = FALSE): int|bool|string|null
     {
         $sql = $this->builder->delete();
-		if ($getSql === false) {
+        if ($getSql === FALSE) {
             return $this->execute($sql)->delete();
         }
         return $sql;

src/Base/AbstractCollection.php

@@ -17,6 +17,7 @@ use Kiri\ToArray;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
+use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -91,7 +92,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
      */
     public function addItem($item)
     {
-        array_push($this->_item, $item);
+        $this->_item[] = $item;
     }
 
     /**
@@ -100,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);
     }
 
 
@@ -143,7 +144,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
      * @param mixed $offset
      * @param mixed $value
      */
-    public function offsetSet(mixed $offset, mixed $value)
+    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value)
     {
         $this->_item[$offset] = $value;
     }
@@ -152,7 +153,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
     /**
      * @param mixed $offset
      */
-    public function offsetUnset(mixed $offset)
+    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset)
     {
         if ($this->offsetExists($offset)) {
             unset($this->_item[$offset]);

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/Base/Model.php

@@ -33,6 +33,7 @@ use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
 use Kiri\ToArray;
 use ReflectionException;
+use ReturnTypeWillChange;
 use validator\Validator;
 
 /**
@@ -40,7 +41,7 @@ use validator\Validator;
  *
  * @package Kiri\Abstracts
  *
- * @property bool $isCreate
+ * @property bool $isNowExample
  * @property Application $container
  * @property EventDispatch $eventDispatch
  * @property array $attributes
@@ -229,7 +230,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     /**
      * @return bool
      */
-	public function getIsCreate(): bool
+    public function getIsNowExample(): bool
     {
         return $this->isNewExample === TRUE;
     }
@@ -239,7 +240,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      * @param bool $bool
      * @return $this
      */
-	public function setIsCreate(bool $bool = FALSE): static
+    public function setIsNowExample(bool $bool = FALSE): static
     {
         $this->isNewExample = $bool;
         return $this;
@@ -263,13 +264,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     public function hasPrimary(): bool
     {
         if ($this->primary !== NULL) {
-			return true;
+            return TRUE;
         }
         $primary = $this->getColumns()->getPrimaryKeys();
         if (!empty($primary)) {
             return $this->primary = is_array($primary) ? current($primary) : $primary;
         }
-		return false;
+        return FALSE;
     }
 
 
@@ -278,7 +279,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      */
     public function isAutoIncrement(): bool
     {
-		return $this->getAutoIncrement() !== null;
+        return $this->getAutoIncrement() !== NULL;
     }
 
     /**
@@ -296,7 +297,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     public function getPrimary(): ?string
     {
         if (!$this->hasPrimary()) {
-			return null;
+            return NULL;
         }
         return $this->primary;
     }
@@ -308,7 +309,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     public function getPrimaryValue(): ?int
     {
         if (!$this->hasPrimary()) {
-			return null;
+            return NULL;
         }
         return $this->getAttribute($this->primary);
     }
@@ -324,7 +325,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     public static function findOne($param, $db = NULL): static|null
     {
         if (is_bool($param)) {
-			return null;
+            return NULL;
         }
         if (is_numeric($param)) {
             $param = static::getPrimaryCondition($param);
@@ -357,7 +358,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      * @throws Exception
      * @throws Exception
      */
-	public static function max($field = null): ?ModelInterface
+    public static function max($field = NULL): ?ModelInterface
     {
         $columns = static::makeNewInstance()->getColumns();
         if (empty($field)) {
@@ -365,11 +366,11 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
         }
         $columns = $columns->get_fields();
         if (!isset($columns[$field])) {
-			return null;
+            return NULL;
         }
         $first = static::query()->max($field)->first();
         if (empty($first)) {
-			return null;
+            return NULL;
         }
         return $first[$field];
     }
@@ -441,11 +442,11 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      * @return bool
      * @throws Exception
      */
-	protected static function deleteByCondition($condition = NULL, array $attributes = [], bool $if_condition_is_null = false): bool
+    protected static function deleteByCondition($condition = NULL, array $attributes = [], bool $if_condition_is_null = FALSE): bool
     {
         if (empty($condition)) {
             if (!$if_condition_is_null) {
-				return false;
+                return FALSE;
             }
             return (bool)static::query()->delete();
         }
@@ -539,7 +540,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
         [$sql, $param] = SqlBuilder::builder(static::query())->insert($param);
         $dbConnection = $this->getConnection()->createCommand($sql, $param);
 
-		$lastId = $dbConnection->save(true);
+        $lastId = $dbConnection->save(TRUE);
 
         $lastId = $this->setPrimary((int)$lastId, $param);
 
@@ -584,7 +585,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     private function updateInternal($fields, $condition, $param): bool|static
     {
         if (empty($param)) {
-			return true;
+            return TRUE;
         }
         if ($this->hasPrimary()) {
             $condition = [$this->getPrimary() => $this->getPrimaryValue()];
@@ -594,10 +595,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
             return $generate;
         }
         $command = $this->getConnection()->createCommand($generate[0], $generate[1]);
-		if ($command->save(false, $this)) {
+        if ($command->save(FALSE, $this)) {
             return $this->refresh()->afterSave($fields, $param);
         }
-		return false;
+        return FALSE;
     }
 
     /**
@@ -611,14 +612,15 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
             $this->_attributes = merge($this->_attributes, $data);
         }
         if (!$this->validator($this->rules()) || !$this->beforeSave($this)) {
-			return false;
+            return FALSE;
         }
         [$change, $condition, $fields] = $this->separation();
-		if (!$this->isNewExample) {
+        if (!empty($this->_oldAttributes)) {
             return $this->updateInternal($fields, $condition, $change);
-		}
+        } else {
             return $this->insert($change, $fields);
         }
+    }
 
 
     /**
@@ -629,7 +631,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     {
         $this->_attributes = $value;
         $this->_oldAttributes = $value;
-        $this->setIsCreate(FALSE);
+        $this->setIsNowExample(FALSE);
         return $this;
     }
 
@@ -641,10 +643,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      */
     public function validator(?array $rule): bool
     {
-		if (empty($rule)) return true;
+        if (empty($rule)) return TRUE;
         $validate = $this->resolve($rule);
         if (!$validate->validation()) {
-			return $this->addError('$validate->getError()', 'mysql');
+            return $this->addError($validate->getError(), 'mysql');
         } else {
             return TRUE;
         }
@@ -680,7 +682,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
         if ($this->hasNote($name)) {
             return $this->runNote($name, $this->_attributes[$name]);
         }
-		return $this->_attributes[$name] ?? null;
+        return $this->_attributes[$name] ?? NULL;
     }
 
 
@@ -705,7 +707,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
         $_tmp = [];
         $condition = [];
         foreach ($this->_attributes as $key => $val) {
-			$oldValue = $this->_oldAttributes[$key] ?? null;
+            $oldValue = $this->_oldAttributes[$key] ?? NULL;
             if ($val === $oldValue) {
                 $condition[$key] = $val;
             } else {
@@ -833,7 +835,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      */
     public function afterSave($attributes, $changeAttributes): bool
     {
-		return true;
+        return TRUE;
     }
 
 
@@ -843,7 +845,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      */
     public function beforeSave($model): bool
     {
-		return true;
+        return TRUE;
     }
 
 
@@ -882,7 +884,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
         if (method_exists($this, $method)) {
             return $this->{$method}();
         }
-		$value = $this->_attributes[$name] ?? null;
+        $value = $this->_attributes[$name] ?? NULL;
 
         return $this->_getter($name, $value);
     }
@@ -932,7 +934,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     protected function hasNote($name, string $type = self::GET): bool
     {
         if (!isset($this->_annotations[$type])) {
-			return false;
+            return FALSE;
         }
         return isset($this->_annotations[$type][$name]);
     }
@@ -999,7 +1001,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      * @param mixed $value
      * @throws Exception
      */
-	public function offsetSet(mixed $offset, mixed $value)
+    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value)
     {
         $this->__set($offset, $value);
     }
@@ -1008,7 +1010,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
      * @param mixed $offset
      * @throws Exception
      */
-	public function offsetUnset(mixed $offset)
+    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset)
     {
         if (!isset($this->_attributes[$offset])
             && !isset($this->_oldAttributes[$offset])) {
@@ -1058,7 +1060,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
         $model = duplicate(static::class);
         $model->_attributes = $data;
         $model->_oldAttributes = $data;
-		$model->setIsCreate(false);
+        $model->setIsNowExample(FALSE);
         return $model;
     }
 

src/Connection.php

@@ -75,13 +75,6 @@ class Connection extends Component
 	public Schema $_schema;
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * execute by __construct
 	 * @throws Exception

src/DatabasesProviders.php

@@ -11,7 +11,6 @@ use Kiri\Application;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
 use Server\Events\OnWorkerStart;
 
 /**
@@ -24,13 +23,6 @@ class DatabasesProviders extends Providers
 	private array $_pooLength = ['min' => 0, 'max' => 1];
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * @param Application $application
 	 * @throws Exception

src/Model.php

@@ -117,6 +117,7 @@ class Model extends Base\Model
 		if (empty($select)) {
 			$select = duplicate(static::class);
 			$select->attributes = $attributes;
+			$select->setIsNowExample(true);
 			if (!$select->save()) {
 				Db::rollback();
 				return $logger->addError($select->getLastError(), 'mysql');