改名

Database/Base/AbstractCollection.php

@@ -5,11 +5,12 @@
  * Date: 2018/4/9 0009
  * Time: 9:44
  */
-
+declare(strict_types=1);
 namespace Database\Base;
 
 
 use ArrayIterator;
+use Database\ActiveQuery;
 use Exception;
 use Snowflake\Abstracts\Component;
 use Database\ActiveRecord;
@@ -25,12 +26,11 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
 	/**
 	 * @var ActiveRecord[]
 	 */
-	protected $_item = [];
+	protected array $_item = [];
 
-	/** @var ActiveRecord */
-	protected $model;
+	protected ?ActiveRecord $model;
 
-	protected $query;
+	protected ActiveQuery $query;
 
 	/**
 	 * Collection constructor.

Database/Base/BaseActiveRecord.php

@@ -5,7 +5,7 @@
  * Date: 2018/3/30 0030
  * Time: 14:39
  */
-
+declare(strict_types=1);
 namespace Database\Base;
 
 
@@ -38,23 +38,23 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess
 {
 
 	/** @var array */
-	protected $_attributes = [];
+	protected array $_attributes = [];
 
 	/** @var array */
-	protected $_oldAttributes = [];
+	protected array $_oldAttributes = [];
 
 	/** @var array */
-	protected $_relate = [];
+	protected array $_relate = [];
 
 	/** @var null|string */
-	protected $primary = NULL;
+	protected ?string $primary = NULL;
 
 	/**
 	 * @var bool
 	 */
-	protected $isNewExample = TRUE;
+	protected bool $isNewExample = TRUE;
 
-	protected $actions = [];
+	protected array $actions = [];
 
 	/** @var Relation */
 	protected $_relation = [];

Database/Base/CollectionIterator.php

@@ -1,6 +1,6 @@
 <?php
 
-
+declare(strict_types=1);
 namespace Database\Base;
 
 
@@ -18,12 +18,11 @@ use Snowflake\Snowflake;
 class CollectionIterator extends \ArrayIterator
 {
 
-	/** @var ActiveRecord */
-	private $model;
+	private ActiveRecord $model;
 
 
 	/** @var ActiveQuery */
-	private $query;
+	private ActiveQuery $query;
 
 
 	/**

Database/Base/ConditionClassMap.php

@@ -1,6 +1,6 @@
 <?php
 
-
+declare(strict_types=1);
 namespace Database\Base;
 
 
@@ -21,8 +21,7 @@ use Database\Condition\RLikeCondition;
 class ConditionClassMap
 {
 
-	/** @var array */
-	public static $conditionMap = [
+	public static array $conditionMap = [
 		'IN'          => [
 			'class' => InCondition::class
 		],